ObjOpenSSL  Diff

Differences From Artifact [9dc998cc98]:

To Artifact [772a7418de]:


75
76
77
78
79
80
81




82

83
84
85
86
87
88
89
75
76
77
78
79
80
81
82
83
84
85

86
87
88
89
90
91
92
93







+
+
+
+
-
+







			sock = INVALID_SOCKET;
			@throw [OFInitializationFailedException
			    newWithClass: isa];
		}

		SSL_set_connect_state(ssl);

		if ((privateKeyFile != nil && !SSL_use_PrivateKey_file(ssl,
		    [privateKeyFile cString], SSL_FILETYPE_PEM)) ||
		    (certificateFile != nil && !SSL_use_certificate_file(ssl,
		    [certificateFile cString], SSL_FILETYPE_PEM)) ||
		if (SSL_connect(ssl) != 1) {
		    SSL_connect(ssl) != 1) {
			close(sock);
			sock = INVALID_SOCKET;
			@throw [OFInitializationFailedException
			    newWithClass: isa];
		}
	} @catch (id e) {
		[self release];
118
119
120
121
122
123
124




125

126
127
128
129
130
131
132
122
123
124
125
126
127
128
129
130
131
132

133
134
135
136
137
138
139
140







+
+
+
+
-
+







							  socket: self
							    host: host
							    port: port];
	}

	SSL_set_connect_state(ssl);

	if ((privateKeyFile != nil && !SSL_use_PrivateKey_file(ssl,
	    [privateKeyFile cString], SSL_FILETYPE_PEM)) ||
	    (certificateFile != nil && !SSL_use_certificate_file(ssl,
	    [certificateFile cString], SSL_FILETYPE_PEM)) ||
	if (SSL_connect(ssl) != 1) {
	    SSL_connect(ssl) != 1) {
		[super close];
		@throw [OFConnectionFailedException newWithClass: isa
							  socket: self
							    host: host
							    port: port];
	}
}