From 309b16bf5d7a95ec5d2422338617a41da0ed81d4 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Thu, 26 Jan 2012 12:42:05 +0100 Subject: [PATCH] Update Xcode project. --- ObjOpenSSL.xcodeproj/project.pbxproj | 24 ++++++++++++++++++------ src/SSLInvalidCertificateException.m | 3 ++- src/SSLSocket.h | 6 +++--- src/SSLSocket.m | 2 +- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ObjOpenSSL.xcodeproj/project.pbxproj b/ObjOpenSSL.xcodeproj/project.pbxproj index 999ba21..cbcc3c4 100644 --- a/ObjOpenSSL.xcodeproj/project.pbxproj +++ b/ObjOpenSSL.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 4B19F58B14D17250005D52DC /* SSLInvalidCertificateException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19F58714D17250005D52DC /* SSLInvalidCertificateException.h */; }; + 4B19F58C14D17250005D52DC /* SSLInvalidCertificateException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B19F58814D17250005D52DC /* SSLInvalidCertificateException.m */; }; + 4B19F58D14D17250005D52DC /* X509Certificate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19F58914D17250005D52DC /* X509Certificate.h */; }; + 4B19F58E14D17250005D52DC /* X509Certificate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B19F58A14D17250005D52DC /* X509Certificate.m */; }; 4B4F087813A01EEF00B60C3F /* ObjOpenSSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B4F087713A01EEF00B60C3F /* ObjOpenSSL.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4BD0AAEC1341289500445289 /* SSLSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD0AAEA1341289500445289 /* SSLSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4BD0AAED1341289500445289 /* SSLSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD0AAEB1341289500445289 /* SSLSocket.m */; }; @@ -15,6 +19,10 @@ /* Begin PBXFileReference section */ 4B1918EA1341272300D82152 /* ObjOpenSSL.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjOpenSSL.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4B19F58714D17250005D52DC /* SSLInvalidCertificateException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SSLInvalidCertificateException.h; path = src/SSLInvalidCertificateException.h; sourceTree = SOURCE_ROOT; }; + 4B19F58814D17250005D52DC /* SSLInvalidCertificateException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SSLInvalidCertificateException.m; path = src/SSLInvalidCertificateException.m; sourceTree = SOURCE_ROOT; }; + 4B19F58914D17250005D52DC /* X509Certificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = X509Certificate.h; path = src/X509Certificate.h; sourceTree = SOURCE_ROOT; }; + 4B19F58A14D17250005D52DC /* X509Certificate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = X509Certificate.m; path = src/X509Certificate.m; sourceTree = SOURCE_ROOT; }; 4B4F087713A01EEF00B60C3F /* ObjOpenSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjOpenSSL.h; path = src/ObjOpenSSL.h; sourceTree = SOURCE_ROOT; }; 4BD0AAE91341286B00445289 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; 4BD0AAEA1341289500445289 /* SSLSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SSLSocket.h; path = src/SSLSocket.h; sourceTree = SOURCE_ROOT; }; @@ -64,8 +72,12 @@ children = ( 4B1918F41341272300D82152 /* Supporting Files */, 4B4F087713A01EEF00B60C3F /* ObjOpenSSL.h */, + 4B19F58714D17250005D52DC /* SSLInvalidCertificateException.h */, + 4B19F58814D17250005D52DC /* SSLInvalidCertificateException.m */, 4BD0AAEA1341289500445289 /* SSLSocket.h */, 4BD0AAEB1341289500445289 /* SSLSocket.m */, + 4B19F58914D17250005D52DC /* X509Certificate.h */, + 4B19F58A14D17250005D52DC /* X509Certificate.m */, ); path = ObjOpenSSL; sourceTree = ""; @@ -87,6 +99,8 @@ files = ( 4B4F087813A01EEF00B60C3F /* ObjOpenSSL.h in Headers */, 4BD0AAEC1341289500445289 /* SSLSocket.h in Headers */, + 4B19F58B14D17250005D52DC /* SSLInvalidCertificateException.h in Headers */, + 4B19F58D14D17250005D52DC /* X509Certificate.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -149,6 +163,8 @@ buildActionMask = 2147483647; files = ( 4BD0AAED1341289500445289 /* SSLSocket.m in Sources */, + 4B19F58C14D17250005D52DC /* SSLInvalidCertificateException.m in Sources */, + 4B19F58E14D17250005D52DC /* X509Certificate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -163,7 +179,6 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -178,7 +193,6 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -197,7 +211,7 @@ FRAMEWORK_VERSION = A; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_VERSION = 4.2; + GCC_VERSION = com.apple.compilers.llvmgcc42; INFOPLIST_FILE = Info.plist; OTHER_CFLAGS = ( "-I/opt/local/include", @@ -212,7 +226,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; WARNING_CFLAGS = ( "-Wall", - "-Werror", "-Wshorten-64-to-32", "-Wwrite-strings", "-Wcast-align", @@ -232,7 +245,7 @@ DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_VERSION = 4.2; + GCC_VERSION = com.apple.compilers.llvmgcc42; INFOPLIST_FILE = Info.plist; OTHER_CFLAGS = ( "-I/opt/local/include", @@ -247,7 +260,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; WARNING_CFLAGS = ( "-Wall", - "-Werror", "-Wshorten-64-to-32", "-Wwrite-strings", "-Wcast-align", diff --git a/src/SSLInvalidCertificateException.m b/src/SSLInvalidCertificateException.m index cee77b3..086ed2e 100644 --- a/src/SSLInvalidCertificateException.m +++ b/src/SSLInvalidCertificateException.m @@ -21,6 +21,7 @@ */ #import "SSLInvalidCertificateException.h" + #import @implementation SSLInvalidCertificateException @@ -67,7 +68,7 @@ return description; description = [[OFString alloc] initWithFormat: - @"Invalid certificate, Reason: %@!", reason]; + @"Invalid certificate, Reason: %@!", reason]; return description; } diff --git a/src/SSLSocket.h b/src/SSLSocket.h index 4c82b72..91db7bc 100644 --- a/src/SSLSocket.h +++ b/src/SSLSocket.h @@ -39,9 +39,9 @@ #endif - initWithSocket: (OFTCPSocket*)socket; -- initWithSocket: (OFTCPSocket*)socket - privateKeyFile: (OFString*)privateKeyFile - certificateFile: (OFString*)certificateFile; +- initWithSocket: (OFTCPSocket*)socket + privateKeyFile: (OFString*)privateKeyFile + certificateFile: (OFString*)certificateFile; /* Change the return type */ - (SSLSocket*)accept; - (void)setPrivateKeyFile: (OFString*)file; diff --git a/src/SSLSocket.m b/src/SSLSocket.m index 7b0ae08..ec4a850 100644 --- a/src/SSLSocket.m +++ b/src/SSLSocket.m @@ -339,7 +339,7 @@ ssl_locking_callback(int mode, int n, const char *file, int line) - (OFDataArray*)channelBindingDataWithType: (OFString*)type { - int length; + size_t length; char buffer[64]; OFDataArray *data;