ObjXMPP  Check-in [7d9b6a0cdf]

Overview
Comment:Adjust to ObjOpenSSL changes.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 7d9b6a0cdf0f5a99fcde07b63b082ae914e25c85c24ec0e6d37da30e247a3f9d
User & Date: js on 2013-03-31 10:16:04
Other Links: manifest | tags
Context
2013-03-31
10:23
Coding style. check-in: 346032e34b user: js tags: trunk
10:16
Adjust to ObjOpenSSL changes. check-in: 7d9b6a0cdf user: js tags: trunk
2013-03-27
00:30
XMPPMulticastDelegate: Handle modifications of the delegates array check-in: 1ee9a1a87a user: florob@babelmonkeys.de tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/XMPPConnection.h from [229b6174a3] to [c4469e22bb].

︙
153
154
155
156
157
158
159

160
161
162
163
164
165
166

153
154
155
156
157
158
159
160
161
162
163
164
165
166
167








+








#endif
{
	id _socket;
	OFXMLParser *_parser, *_oldParser;
	OFXMLElementBuilder *_elementBuilder, *_oldElementBuilder;
	OFString *_username, *_password, *_server, *_resource;
	OFString *_privateKeyFile, *_certificateFile;
	const char *_privateKeyPassphrase;
	OFString *_domain, *_domainToASCII;
	XMPPJID *_JID;
	uint16_t _port;
	id <XMPPStorage> _dataStorage;
	OFString *_language;
	XMPPMulticastDelegate *_delegates;
	OFMutableDictionary *_callbacks;
︙

Modified src/XMPPConnection.m from [b48daabd06] to [004473a420].

︙
889
890
891
892
893
894
895
896

897
898




899
900
901
902
903
904
905

889
890
891
892
893
894
895

896


897
898
899
900
901
902
903
904
905
906
907








-
+
-
-
+
+
+
+








		/* FIXME: Catch errors here */
		SSLSocket *newSock;

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

		newSock = [[SSLSocket alloc] initWithSocket: _socket
		newSock = [[SSLSocket alloc] initWithSocket: _socket];
					     privateKeyFile: _privateKeyFile
					    certificateFile: _certificateFile];
		[newSock setCertificateFile: _certificateFile];
		[newSock setPrivateKeyFile: _privateKeyFile];
		[newSock setPrivateKeyPassphrase: _privateKeyPassphrase];
		[newSock startTLS];
		[_socket release];
		_socket = newSock;

		_encrypted = YES;

		[_delegates broadcastSelector: @selector(
						   connectionDidUpgradeToTLS:)
︙