Skip to content

Commit 18c8968

Browse files
krzyzanowskimkrzyzanowskim
committed
Update to OpenSSL 1.0.1f
1 parent fa6717d commit 18c8968

20 files changed

+54
-16
lines changed

‎OpenSSL.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "OpenSSL"
3-
s.version = "1.0.1e"
3+
s.version = "1.0.1f"
44
s.summary = "Pre-built OpenSSL for iOS and OSX"
55
s.description = "OpenSSL is an SSL/TLS and Crypto toolkit. Deprecated in Mac OS and gone in iOS, this spec gives your project non-deprecated OpenSSL support. Supports OSX and iOS Simulator (armv7,armv7s,arm64,i386,x86_64)."
66
s.homepage = "https://github.com/krzak/OpenSSL"

‎build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -x
77

88
# Setup paths to stuff we need
99

10-
OPENSSL_VERSION="1.0.1e"
10+
OPENSSL_VERSION="1.0.1f"
1111

1212
DEVELOPER=$(xcode-select --print-path)
1313

‎include-ios/openssl/buffer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
8888
char * BUF_strdup(const char *str);
8989
char * BUF_strndup(const char *str, size_t siz);
9090
void * BUF_memdup(const void *data, size_t siz);
91-
void BUF_reverse(unsigned char *out, unsigned char *in, size_t siz);
91+
void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
9292

9393
/* safe string functions */
9494
size_t BUF_strlcpy(char *dst,const char *src,size_t siz);

‎include-ios/openssl/opensslconf.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686

8787
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
8888
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
89-
#define ENGINESDIR "/tmp/openssl-1.0.1e-i386/lib/engines"
90-
#define OPENSSLDIR "/tmp/openssl-1.0.1e-i386"
89+
#define ENGINESDIR "/tmp/openssl-1.0.1f-i386/lib/engines"
90+
#define OPENSSLDIR "/tmp/openssl-1.0.1f-i386"
9191
#endif
9292
#endif
9393

‎include-ios/openssl/opensslv.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
2626
* major minor fix final patch/beta)
2727
*/
28-
#define OPENSSL_VERSION_NUMBER 0x1000105fL
28+
#define OPENSSL_VERSION_NUMBER 0x1000106fL
2929
#ifdef OPENSSL_FIPS
30-
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1e-fips 11 Feb 2013"
30+
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f-fips 6 Jan 2014"
3131
#else
32-
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1e 11 Feb 2013"
32+
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f 6 Jan 2014"
3333
#endif
3434
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
3535

‎include-ios/openssl/rand.h

+1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ void ERR_load_RAND_strings(void);
138138
#define RAND_F_SSLEAY_RAND_BYTES 100
139139

140140
/* Reason codes. */
141+
#define RAND_R_DUAL_EC_DRBG_DISABLED 104
141142
#define RAND_R_ERROR_INITIALISING_DRBG 102
142143
#define RAND_R_ERROR_INSTANTIATING_DRBG 103
143144
#define RAND_R_NO_FIPS_RANDOM_METHOD_SET 101

‎include-ios/openssl/ssl.h

+10-1
Original file line numberDiff line numberDiff line change
@@ -555,11 +555,14 @@ struct ssl_session_st
555555
#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L
556556
#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L
557557
#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L
558-
#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L /* no effect since 0.9.7h and 0.9.8b */
558+
#define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x00000040L
559559
#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L
560560
#define SSL_OP_TLS_D5_BUG 0x00000100L
561561
#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L
562562

563+
/* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */
564+
#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0
565+
563566
/* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
564567
* in OpenSSL 0.9.6d. Usually (depending on the application protocol)
565568
* the workaround is not needed. Unfortunately some broken SSL/TLS
@@ -641,6 +644,12 @@ struct ssl_session_st
641644
* TLS only.) "Released" buffers are put onto a free-list in the context
642645
* or just freed (depending on the context's setting for freelist_max_len). */
643646
#define SSL_MODE_RELEASE_BUFFERS 0x00000010L
647+
/* Send the current time in the Random fields of the ClientHello and
648+
* ServerHello records for compatibility with hypothetical implementations
649+
* that require it.
650+
*/
651+
#define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020L
652+
#define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040L
644653

645654
/* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value,
646655
* they cannot be used to clear bits. */

‎include-ios/openssl/ssl3.h

+9
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,15 @@ typedef struct ssl3_state_st
539539
/* Set if we saw the Next Protocol Negotiation extension from our peer. */
540540
int next_proto_neg_seen;
541541
#endif
542+
543+
#ifndef OPENSSL_NO_TLSEXT
544+
#ifndef OPENSSL_NO_EC
545+
/* This is set to true if we believe that this is a version of Safari
546+
* running on OS X 10.6 or newer. We wish to know this because Safari
547+
* on 10.8 .. 10.8.3 has broken ECDHE-ECDSA support. */
548+
char is_probably_safari;
549+
#endif /* !OPENSSL_NO_EC */
550+
#endif /* !OPENSSL_NO_TLSEXT */
542551
} SSL3_STATE;
543552

544553
#endif

‎include-osx/openssl/buffer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
8888
char * BUF_strdup(const char *str);
8989
char * BUF_strndup(const char *str, size_t siz);
9090
void * BUF_memdup(const void *data, size_t siz);
91-
void BUF_reverse(unsigned char *out, unsigned char *in, size_t siz);
91+
void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
9292

9393
/* safe string functions */
9494
size_t BUF_strlcpy(char *dst,const char *src,size_t siz);

‎include-osx/openssl/opensslconf.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888

8989
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
9090
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
91-
#define ENGINESDIR "/tmp/openssl-1.0.1e-i386/lib/engines"
92-
#define OPENSSLDIR "/tmp/openssl-1.0.1e-i386"
91+
#define ENGINESDIR "/tmp/openssl-1.0.1f-i386/lib/engines"
92+
#define OPENSSLDIR "/tmp/openssl-1.0.1f-i386"
9393
#endif
9494
#endif
9595

‎include-osx/openssl/opensslv.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
2626
* major minor fix final patch/beta)
2727
*/
28-
#define OPENSSL_VERSION_NUMBER 0x1000105fL
28+
#define OPENSSL_VERSION_NUMBER 0x1000106fL
2929
#ifdef OPENSSL_FIPS
30-
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1e-fips 11 Feb 2013"
30+
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f-fips 6 Jan 2014"
3131
#else
32-
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1e 11 Feb 2013"
32+
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f 6 Jan 2014"
3333
#endif
3434
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
3535

‎include-osx/openssl/rand.h

+1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ void ERR_load_RAND_strings(void);
138138
#define RAND_F_SSLEAY_RAND_BYTES 100
139139

140140
/* Reason codes. */
141+
#define RAND_R_DUAL_EC_DRBG_DISABLED 104
141142
#define RAND_R_ERROR_INITIALISING_DRBG 102
142143
#define RAND_R_ERROR_INSTANTIATING_DRBG 103
143144
#define RAND_R_NO_FIPS_RANDOM_METHOD_SET 101

‎include-osx/openssl/ssl.h

+10-1
Original file line numberDiff line numberDiff line change
@@ -555,11 +555,14 @@ struct ssl_session_st
555555
#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L
556556
#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L
557557
#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L
558-
#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L /* no effect since 0.9.7h and 0.9.8b */
558+
#define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x00000040L
559559
#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L
560560
#define SSL_OP_TLS_D5_BUG 0x00000100L
561561
#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L
562562

563+
/* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */
564+
#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0
565+
563566
/* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
564567
* in OpenSSL 0.9.6d. Usually (depending on the application protocol)
565568
* the workaround is not needed. Unfortunately some broken SSL/TLS
@@ -641,6 +644,12 @@ struct ssl_session_st
641644
* TLS only.) "Released" buffers are put onto a free-list in the context
642645
* or just freed (depending on the context's setting for freelist_max_len). */
643646
#define SSL_MODE_RELEASE_BUFFERS 0x00000010L
647+
/* Send the current time in the Random fields of the ClientHello and
648+
* ServerHello records for compatibility with hypothetical implementations
649+
* that require it.
650+
*/
651+
#define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020L
652+
#define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040L
644653

645654
/* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value,
646655
* they cannot be used to clear bits. */

‎include-osx/openssl/ssl3.h

+9
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,15 @@ typedef struct ssl3_state_st
539539
/* Set if we saw the Next Protocol Negotiation extension from our peer. */
540540
int next_proto_neg_seen;
541541
#endif
542+
543+
#ifndef OPENSSL_NO_TLSEXT
544+
#ifndef OPENSSL_NO_EC
545+
/* This is set to true if we believe that this is a version of Safari
546+
* running on OS X 10.6 or newer. We wish to know this because Safari
547+
* on 10.8 .. 10.8.3 has broken ECDHE-ECDSA support. */
548+
char is_probably_safari;
549+
#endif /* !OPENSSL_NO_EC */
550+
#endif /* !OPENSSL_NO_TLSEXT */
542551
} SSL3_STATE;
543552

544553
#endif

‎lib-ios/libcrypto.a

264 Bytes
Binary file not shown.

‎lib-ios/libssl.a

5.77 KB
Binary file not shown.

‎lib-osx/libcrypto.a

-1.04 KB
Binary file not shown.

‎lib-osx/libssl.a

2.45 KB
Binary file not shown.

‎openssl-1.0.1e.tar.gz

-4.25 MB
Binary file not shown.

‎openssl-1.0.1f.tar.gz

4.33 MB
Binary file not shown.

0 commit comments

Comments
 (0)