ObjFW/ObjXMPP
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust to ObjOpenSSL changes.

Browse source
This commit is contained in:
Jonathan Schleifer 2013-03-31 12:08:46 +02:00
parent 61654304ed
commit 2889711e69
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/XMPPConnection.h
View file

@ -157,6 +157,7 @@
OFXMLElementBuilder *_elementBuilder, *_oldElementBuilder; OFXMLElementBuilder *_elementBuilder, *_oldElementBuilder;
OFString *_username, *_password, *_server, *_resource; OFString *_username, *_password, *_server, *_resource;
OFString *_privateKeyFile, *_certificateFile; OFString *_privateKeyFile, *_certificateFile;
const char *_privateKeyPassphrase;
OFString *_domain, *_domainToASCII; OFString *_domain, *_domainToASCII;
XMPPJID *_JID; XMPPJID *_JID;
uint16_t _port; uint16_t _port;

8
src/XMPPConnection.m
View file

@ -893,9 +893,11 @@
connectionWillUpgradeToTLS:) connectionWillUpgradeToTLS:)
withObject: self]; withObject: self];
newSock = [[SSLSocket alloc] initWithSocket: _socket newSock = [[SSLSocket alloc] initWithSocket: _socket];
privateKeyFile: _privateKeyFile [newSock setCertificateFile: _certificateFile];
certificateFile: _certificateFile]; [newSock setPrivateKeyFile: _privateKeyFile];
[newSock setPrivateKeyPassphrase: _privateKeyPassphrase];
[newSock startTLS];
[_socket release]; [_socket release];
_socket = newSock; _socket = newSock;