From 8eeb6a72d15072369cd0e4e16546494acb9dc56b Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Tue, 19 Feb 2013 00:14:41 +0100 Subject: [PATCH] Update to recent ObjFW changes. --- ObjOpenSSL.xcodeproj/project.pbxproj | 2 +- src/SSLSocket.m | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ObjOpenSSL.xcodeproj/project.pbxproj b/ObjOpenSSL.xcodeproj/project.pbxproj index 162246a..125f539 100644 --- a/ObjOpenSSL.xcodeproj/project.pbxproj +++ b/ObjOpenSSL.xcodeproj/project.pbxproj @@ -131,7 +131,7 @@ 4B1918E01341272300D82152 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0420; + LastUpgradeCheck = 0460; }; buildConfigurationList = 4B1918E31341272300D82152 /* Build configuration list for PBXProject "ObjOpenSSL" */; compatibilityVersion = "Xcode 3.2"; diff --git a/src/SSLSocket.m b/src/SSLSocket.m index 95f1ca6..ff4a78b 100644 --- a/src/SSLSocket.m +++ b/src/SSLSocket.m @@ -325,12 +325,12 @@ locking_callback(int mode, int n, const char *file, int line) requestedLength: length]; } -- (size_t)pendingBytes +- (size_t)numberOfBytesInReadBuffer { if (_SSL == NULL) - return [super pendingBytes]; + return [super numberOfBytesInReadBuffer]; - return [super pendingBytes] + SSL_pending(_SSL); + return [super numberOfBytesInReadBuffer] + SSL_pending(_SSL); } - (void)setPrivateKeyFile: (OFString*)privateKeyFile