Skip to content

Commit ad78aec

Browse files
krzyzanowskimkrzyzanowskim
committed
Update openssl to 1.0.1g
1 parent f34fa44 commit ad78aec

23 files changed

+79
-15
lines changed

‎OpenSSL-Universal.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-Universal"
3-
s.version = "1.0.1.f"
3+
s.version = "1.0.1.g"
44
s.summary = "OpenSSL for iOS and OS X"
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 including Simulator (armv7,armv7s,arm64,i386,x86_64)."
66
s.homepage = "http://www.openssl.org/"

‎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.1.f"
3+
s.version = "1.0.1.g"
44
s.summary = "OpenSSL for iOS and OS X"
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 including Simulator (armv7,armv7s,arm64,i386,x86_64)."
66
s.homepage = "http://www.openssl.org/"

‎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.1f"
10+
OPENSSL_VERSION="1.0.1g"
1111

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

‎include-ios/openssl/bn.h

+11
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,8 @@ BIGNUM *BN_mod_inverse(BIGNUM *ret,
538538
BIGNUM *BN_mod_sqrt(BIGNUM *ret,
539539
const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx);
540540

541+
void BN_consttime_swap(BN_ULONG swap, BIGNUM *a, BIGNUM *b, int nwords);
542+
541543
/* Deprecated versions */
542544
#ifndef OPENSSL_NO_DEPRECATED
543545
BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe,
@@ -774,11 +776,20 @@ int RAND_pseudo_bytes(unsigned char *buf,int num);
774776

775777
#define bn_fix_top(a) bn_check_top(a)
776778

779+
#define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits+BN_BITS2-1))/BN_BITS2)
780+
#define bn_wcheck_size(bn, words) \
781+
do { \
782+
const BIGNUM *_bnum2 = (bn); \
783+
assert(words <= (_bnum2)->dmax && words >= (_bnum2)->top); \
784+
} while(0)
785+
777786
#else /* !BN_DEBUG */
778787

779788
#define bn_pollute(a)
780789
#define bn_check_top(a)
781790
#define bn_fix_top(a) bn_correct_top(a)
791+
#define bn_check_size(bn, bits)
792+
#define bn_wcheck_size(bn, words)
782793

783794
#endif
784795

‎include-ios/openssl/kssl.h

+9
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,15 @@
7070
#include <stdio.h>
7171
#include <ctype.h>
7272
#include <krb5.h>
73+
#ifdef OPENSSL_SYS_WIN32
74+
/* These can sometimes get redefined indirectly by krb5 header files
75+
* after they get undefed in ossl_typ.h
76+
*/
77+
#undef X509_NAME
78+
#undef X509_EXTENSIONS
79+
#undef OCSP_REQUEST
80+
#undef OCSP_RESPONSE
81+
#endif
7382

7483
#ifdef __cplusplus
7584
extern "C" {

‎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.1f-i386/lib/engines"
90-
#define OPENSSLDIR "/tmp/openssl-1.0.1f-i386"
89+
#define ENGINESDIR "/tmp/openssl-1.0.1g-i386/lib/engines"
90+
#define OPENSSLDIR "/tmp/openssl-1.0.1g-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 0x1000106fL
28+
#define OPENSSL_VERSION_NUMBER 0x1000107fL
2929
#ifdef OPENSSL_FIPS
30-
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f-fips 6 Jan 2014"
30+
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g-fips 7 Apr 2014"
3131
#else
32-
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f 6 Jan 2014"
32+
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g 7 Apr 2014"
3333
#endif
3434
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
3535

‎include-ios/openssl/ssl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ struct ssl_ctx_st
915915
*/
916916
unsigned int max_send_fragment;
917917

918-
#ifndef OPENSSL_ENGINE
918+
#ifndef OPENSSL_NO_ENGINE
919919
/* Engine to pass requests for client certs to
920920
*/
921921
ENGINE *client_cert_engine;

‎include-ios/openssl/symhacks.h

+6
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,12 @@
204204
#define SSL_CTX_set_next_protos_advertised_cb SSL_CTX_set_next_protos_adv_cb
205205
#undef SSL_CTX_set_next_proto_select_cb
206206
#define SSL_CTX_set_next_proto_select_cb SSL_CTX_set_next_proto_sel_cb
207+
#undef ssl3_cbc_record_digest_supported
208+
#define ssl3_cbc_record_digest_supported ssl3_cbc_record_digest_support
209+
#undef ssl_check_clienthello_tlsext_late
210+
#define ssl_check_clienthello_tlsext_late ssl_check_clihello_tlsext_late
211+
#undef ssl_check_clienthello_tlsext_early
212+
#define ssl_check_clienthello_tlsext_early ssl_check_clihello_tlsext_early
207213

208214
/* Hack some long ENGINE names */
209215
#undef ENGINE_get_default_BN_mod_exp_crt

‎include-ios/openssl/tls1.h

+6
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,12 @@ extern "C" {
230230
/* ExtensionType value from RFC5620 */
231231
#define TLSEXT_TYPE_heartbeat 15
232232

233+
/* ExtensionType value for TLS padding extension.
234+
* http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
235+
* http://tools.ietf.org/html/draft-agl-tls-padding-03
236+
*/
237+
#define TLSEXT_TYPE_padding 21
238+
233239
/* ExtensionType value from RFC4507 */
234240
#define TLSEXT_TYPE_session_ticket 35
235241

‎include-osx/openssl/bn.h

+11
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,8 @@ BIGNUM *BN_mod_inverse(BIGNUM *ret,
538538
BIGNUM *BN_mod_sqrt(BIGNUM *ret,
539539
const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx);
540540

541+
void BN_consttime_swap(BN_ULONG swap, BIGNUM *a, BIGNUM *b, int nwords);
542+
541543
/* Deprecated versions */
542544
#ifndef OPENSSL_NO_DEPRECATED
543545
BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe,
@@ -774,11 +776,20 @@ int RAND_pseudo_bytes(unsigned char *buf,int num);
774776

775777
#define bn_fix_top(a) bn_check_top(a)
776778

779+
#define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits+BN_BITS2-1))/BN_BITS2)
780+
#define bn_wcheck_size(bn, words) \
781+
do { \
782+
const BIGNUM *_bnum2 = (bn); \
783+
assert(words <= (_bnum2)->dmax && words >= (_bnum2)->top); \
784+
} while(0)
785+
777786
#else /* !BN_DEBUG */
778787

779788
#define bn_pollute(a)
780789
#define bn_check_top(a)
781790
#define bn_fix_top(a) bn_correct_top(a)
791+
#define bn_check_size(bn, bits)
792+
#define bn_wcheck_size(bn, words)
782793

783794
#endif
784795

‎include-osx/openssl/kssl.h

+9
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,15 @@
7070
#include <stdio.h>
7171
#include <ctype.h>
7272
#include <krb5.h>
73+
#ifdef OPENSSL_SYS_WIN32
74+
/* These can sometimes get redefined indirectly by krb5 header files
75+
* after they get undefed in ossl_typ.h
76+
*/
77+
#undef X509_NAME
78+
#undef X509_EXTENSIONS
79+
#undef OCSP_REQUEST
80+
#undef OCSP_RESPONSE
81+
#endif
7382

7483
#ifdef __cplusplus
7584
extern "C" {

‎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.1f-i386/lib/engines"
92-
#define OPENSSLDIR "/tmp/openssl-1.0.1f-i386"
91+
#define ENGINESDIR "/tmp/openssl-1.0.1g-i386/lib/engines"
92+
#define OPENSSLDIR "/tmp/openssl-1.0.1g-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 0x1000106fL
28+
#define OPENSSL_VERSION_NUMBER 0x1000107fL
2929
#ifdef OPENSSL_FIPS
30-
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f-fips 6 Jan 2014"
30+
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g-fips 7 Apr 2014"
3131
#else
32-
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f 6 Jan 2014"
32+
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g 7 Apr 2014"
3333
#endif
3434
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
3535

‎include-osx/openssl/ssl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ struct ssl_ctx_st
915915
*/
916916
unsigned int max_send_fragment;
917917

918-
#ifndef OPENSSL_ENGINE
918+
#ifndef OPENSSL_NO_ENGINE
919919
/* Engine to pass requests for client certs to
920920
*/
921921
ENGINE *client_cert_engine;

‎include-osx/openssl/symhacks.h

+6
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,12 @@
204204
#define SSL_CTX_set_next_protos_advertised_cb SSL_CTX_set_next_protos_adv_cb
205205
#undef SSL_CTX_set_next_proto_select_cb
206206
#define SSL_CTX_set_next_proto_select_cb SSL_CTX_set_next_proto_sel_cb
207+
#undef ssl3_cbc_record_digest_supported
208+
#define ssl3_cbc_record_digest_supported ssl3_cbc_record_digest_support
209+
#undef ssl_check_clienthello_tlsext_late
210+
#define ssl_check_clienthello_tlsext_late ssl_check_clihello_tlsext_late
211+
#undef ssl_check_clienthello_tlsext_early
212+
#define ssl_check_clienthello_tlsext_early ssl_check_clihello_tlsext_early
207213

208214
/* Hack some long ENGINE names */
209215
#undef ENGINE_get_default_BN_mod_exp_crt

‎include-osx/openssl/tls1.h

+6
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,12 @@ extern "C" {
230230
/* ExtensionType value from RFC5620 */
231231
#define TLSEXT_TYPE_heartbeat 15
232232

233+
/* ExtensionType value for TLS padding extension.
234+
* http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
235+
* http://tools.ietf.org/html/draft-agl-tls-padding-03
236+
*/
237+
#define TLSEXT_TYPE_padding 21
238+
233239
/* ExtensionType value from RFC4507 */
234240
#define TLSEXT_TYPE_session_ticket 35
235241

‎lib-ios/libcrypto.a

-3.06 MB
Binary file not shown.

‎lib-ios/libssl.a

-554 KB
Binary file not shown.

‎lib-osx/libcrypto.a

70.3 KB
Binary file not shown.

‎lib-osx/libssl.a

9.09 KB
Binary file not shown.

‎openssl-1.0.1f.tar.gz

-4.33 MB
Binary file not shown.

‎openssl-1.0.1g.tar.gz

4.3 MB
Binary file not shown.

0 commit comments

Comments
 (0)