ObjXMPP  Check-in [d23ac2b580]

Overview
Comment:Adjust to new ObjOpenSSL

This disables the new automatic certificate verification and still does
the manual verification.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: d23ac2b580804d06fe34147af4992ea06ffbca2d26b54da371fe79fe1220aa20
User & Date: js on 2015-05-24 19:42:13
Other Links: manifest | tags
Context
2015-11-21
19:12
Move {install-sh,config.{guess,sub}} to build-aux check-in: 209a97ac11 user: js tags: trunk
2015-05-24
19:42
Adjust to new ObjOpenSSL check-in: d23ac2b580 user: js tags: trunk
2015-01-05
21:50
Adjust to ObjFW changes check-in: 0ef261ea0e user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/XMPPConnection.m from [24f700eb94] to [cd38c39db4].

︙︙
900
901
902
903
904
905
906



907
908
909

910
911
912
913
914
915
916
917

		SSLSocket *newSock;

		[_delegates broadcastSelector: @selector(
						   connectionWillUpgradeToTLS:)
				   withObject: self];

		newSock = [[SSLSocket alloc] initWithSocket: _socket];



		[newSock setCertificateFile: _certificateFile];
		[newSock setPrivateKeyFile: _privateKeyFile];
		[newSock setPrivateKeyPassphrase: _privateKeyPassphrase];

		[newSock startTLS];
		[_socket release];
		_socket = newSock;

		_encrypted = true;

		[_delegates broadcastSelector: @selector(
						   connectionDidUpgradeToTLS:)








>
>
>



>
|








900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921

		SSLSocket *newSock;

		[_delegates broadcastSelector: @selector(
						   connectionWillUpgradeToTLS:)
				   withObject: self];

		newSock = [[SSLSocket alloc] initWithSocket: _socket];
		[newSock setCertificateVerificationEnabled: false];
#if 0
		/* FIXME: Not yet implemented by ObjOpenSSL */
		[newSock setCertificateFile: _certificateFile];
		[newSock setPrivateKeyFile: _privateKeyFile];
		[newSock setPrivateKeyPassphrase: _privateKeyPassphrase];
#endif
		[newSock startTLSWithExpectedHost: nil];
		[_socket release];
		_socket = newSock;

		_encrypted = true;

		[_delegates broadcastSelector: @selector(
						   connectionDidUpgradeToTLS:)
︙︙