ObjOpenSSL  Check-in [def7f8346a]

Overview
Comment:Adjust to ObjFW changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: def7f8346a0eb3c62e8c674513a31700e843bdc10d8b0ce4bfa8a4c1fe1d45f4
User & Date: js on 2018-12-21 21:45:34
Other Links: manifest | tags
Context
2019-01-16
23:16
configure: Add --with-openssl=PREFIX check-in: 67a5b6b160 user: js tags: trunk
2018-12-21
21:45
Adjust to ObjFW changes check-in: def7f8346a user: js tags: trunk
2018-12-08
17:28
Adjust to ObjFW changes check-in: d7e54e7735 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/SSLSocket.m from [f2bb7cedd4] to [ff87bb468f].

︙︙
143
144
145
146
147
148
149

150

151
152
153
154
155
156
157
158
159
160

161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186


	[super dealloc];
}

-     (void)socket: (OF_KINDOF(OFTCPSocket *))sock
  didConnectToHost: (OFString *)host
	      port: (uint16_t)port

{

	@try {
		[sock SSL_startTLSWithExpectedHost: _host
					      port: _port];
	} @catch (id e) {
		[_socket setDelegate: _delegate];
		[_delegate		   socket: sock
		    didFailToConnectWithException: e
					     host: host
					     port: port];
		return;

	}

	[_socket setDelegate: _delegate];
	[_delegate    socket: sock
	    didConnectToHost: host
			port: port];
}

-		   (void)socket: (OF_KINDOF(OFTCPSocket *))sock
  didFailToConnectWithException: (id)exception
			   host: (OFString *)host
			   port: (uint16_t)port
{
	[_socket setDelegate: _delegate];

	return [_delegate	   socket: sock
	    didFailToConnectWithException: exception
				     host: host
				     port: port];
}
@end

@implementation SSLSocket
@dynamic delegate;
@synthesize certificateFile = _certificateFile;
@synthesize privateKeyFile = _privateKeyFile;








>

>
|
|
|
|
<
<
|
<
<
<
>





|
<
<
<
<
<
<
<
<
<
<
|
<
<








143
144
145
146
147
148
149
150
151
152
153
154
155
156


157



158
159
160
161
162
163
164










165


166
167
168
169
170
171
172


	[super dealloc];
}

-     (void)socket: (OF_KINDOF(OFTCPSocket *))sock
  didConnectToHost: (OFString *)host
	      port: (uint16_t)port
	 exception: (id)exception
{
	if (exception == nil) {
		@try {
			[sock SSL_startTLSWithExpectedHost: _host
						      port: _port];
		} @catch (id e) {


			exception = e;



		}
	}

	[_socket setDelegate: _delegate];
	[_delegate    socket: sock
	    didConnectToHost: host
			port: port










		   exception: exception];


}
@end

@implementation SSLSocket
@dynamic delegate;
@synthesize certificateFile = _certificateFile;
@synthesize privateKeyFile = _privateKeyFile;
︙︙