From 34e1dc6e4e1e6c0a6339bcfec8cd0af512d96a7f Mon Sep 17 00:00:00 2001 From: Felix Schulze Date: Wed, 2 May 2012 08:59:09 +0200 Subject: [PATCH] OpenSSL 1.0.1b --- .gitignore | 1 + README | 8 ++++++-- build-libssl.sh | 2 +- include/openssl/opensslconf.h | 4 ++-- include/openssl/opensslv.h | 6 +++--- include/openssl/ssl.h | 3 ++- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5e4fb01..982145d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ bin lib *.gz OpenSSL-for-iOS.xcodeproj/xcuserdata +src diff --git a/README b/README index 88c6d73..916ef11 100644 --- a/README +++ b/README @@ -1,7 +1,11 @@ From: http://www.x2on.de/2010/02/01/tutorial-iphone-app-with-compiled-openssl-library/ and http://www.x2on.de/2010/07/13/tutorial-iphone-app-with-compiled-openssl-1-0-0a-library/ -UPDATE 2012-01-28: OpemSSL 1.0.0g + Optimized build script -UPDATE 2011-10-23: OpemSSL 1.0.0e + iOS 5.0 +Changelog: + +UPDATE 2012-05-02: OpenSSL 1.0.1b +UPDATE 2012-04-01: OpenSSL 1.0.1 + Modernizes project to use ARC +UPDATE 2012-01-28: OpenSSL 1.0.0g + Optimized build script +UPDATE 2011-10-23: OpenSSL 1.0.0e + iOS 5.0 UPDATE 2011-02-08: I habe updated OpemSSL to 1.0.0d UPDATE 2010-12-16: Script for building OpenSSL UPDATE 2010-12-04: SHA256 Hash + Clean project file with iOS 4.2 as base SDK diff --git a/build-libssl.sh b/build-libssl.sh index 7cf2b4c..ea04a13 100755 --- a/build-libssl.sh +++ b/build-libssl.sh @@ -21,7 +21,7 @@ ########################################################################### # Change values here # # # -VERSION="1.0.1" # +VERSION="1.0.1b" # SDKVERSION="5.1" # # # ########################################################################### diff --git a/include/openssl/opensslconf.h b/include/openssl/opensslconf.h index 6f4aede..17cecea 100644 --- a/include/openssl/opensslconf.h +++ b/include/openssl/opensslconf.h @@ -83,8 +83,8 @@ #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define ENGINESDIR "/Users/felixschulze/dev/ios/libs/OpenSSL-for-iPhone/bin/iPhoneSimulator5.1-i386.sdk/lib/engines" -#define OPENSSLDIR "/Users/felixschulze/dev/ios/libs/OpenSSL-for-iPhone/bin/iPhoneSimulator5.1-i386.sdk" +#define ENGINESDIR "/data/home/fschulze/dev/ios/OpenSSL-for-iPhone/bin/iPhoneSimulator5.1-i386.sdk/lib/engines" +#define OPENSSLDIR "/data/home/fschulze/dev/ios/OpenSSL-for-iPhone/bin/iPhoneSimulator5.1-i386.sdk" #endif #endif diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index bf42556..9e86557 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -25,11 +25,11 @@ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -#define OPENSSL_VERSION_NUMBER 0x1000100fL +#define OPENSSL_VERSION_NUMBER 0x1000102fL #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1-fips 14 Mar 2012" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1b-fips 26 Apr 2012" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1 14 Mar 2012" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1b 26 Apr 2012" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 525602e..8b0c2a2 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -556,7 +556,6 @@ struct ssl_session_st #define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L #define SSL_OP_TLS_D5_BUG 0x00000100L #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L -#define SSL_OP_NO_TLSv1_1 0x00000400L /* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added * in OpenSSL 0.9.6d. Usually (depending on the application protocol) @@ -604,6 +603,7 @@ struct ssl_session_st #define SSL_OP_NO_SSLv3 0x02000000L #define SSL_OP_NO_TLSv1 0x04000000L #define SSL_OP_NO_TLSv1_2 0x08000000L +#define SSL_OP_NO_TLSv1_1 0x10000000L /* These next two were never actually used for anything since SSLeay * zap so we have some more flags. @@ -2058,6 +2058,7 @@ void ERR_load_SSL_strings(void); #define SSL_F_DTLS1_ACCEPT 246 #define SSL_F_DTLS1_ADD_CERT_TO_BUF 295 #define SSL_F_DTLS1_BUFFER_RECORD 247 +#define SSL_F_DTLS1_CHECK_TIMEOUT_NUM 316 #define SSL_F_DTLS1_CLIENT_HELLO 248 #define SSL_F_DTLS1_CONNECT 249 #define SSL_F_DTLS1_ENC 250