Commit d17bc7f7 authored by Dapperstout's avatar Dapperstout

Update to OpenSSL 1.0.2a

parent 445c90da
......@@ -9,7 +9,7 @@ pod 'CocoaAsyncSocket', '~> 7.4', :inhibit_warnings => true
pod 'lz4', '~> 123', :inhibit_warnings => true
pod 'Base32', '~> 1.0.2'
pod 'IGDigest', '~> 1.1.0'
pod 'OpenSSL-Framework', '~> 1.0.2'
pod 'OpenSSL-Framework', '~> 1.0.201'
target 'PulseTests' do
pod 'Quick', '~> 0.2.2'
......
......@@ -4,7 +4,7 @@ PODS:
- IGDigest (1.1.2)
- lz4 (123)
- Nimble (0.3.0)
- OpenSSL-Framework (1.0.2)
- OpenSSL-Framework (1.0.201)
- Quick (0.2.2)
- SwiftBytes (0.1.0)
......@@ -14,7 +14,7 @@ DEPENDENCIES:
- IGDigest (~> 1.1.0)
- lz4 (~> 123)
- Nimble (~> 0.3.0)
- OpenSSL-Framework (~> 1.0.2)
- OpenSSL-Framework (~> 1.0.201)
- Quick (~> 0.2.2)
- SwiftBytes (~> 0.1.0)
......@@ -24,7 +24,7 @@ SPEC CHECKSUMS:
IGDigest: b9ff1800bf1f0bdc3714fb4f0f63904464b2ddb4
lz4: 316468bb1b748b046e7d4452e46ffc5c7fddccf0
Nimble: a4d9d978129e83d73e33b7d8bce57443bd556068
OpenSSL-Framework: b1654dc18ef9a08ee7670c690a5e9795b44ce28d
OpenSSL-Framework: 2d2289869dd1cfd0df0b340398bcf64094ecfe12
Quick: 7b89ff625e72ef931c2a9ef2f25ac3a9d2457763
SwiftBytes: 2f33be5dd47e9cee01aae1ccd54c126ea1ab5a6e
......
......@@ -4,7 +4,7 @@ PODS:
- IGDigest (1.1.2)
- lz4 (123)
- Nimble (0.3.0)
- OpenSSL-Framework (1.0.2)
- OpenSSL-Framework (1.0.201)
- Quick (0.2.2)
- SwiftBytes (0.1.0)
......@@ -14,7 +14,7 @@ DEPENDENCIES:
- IGDigest (~> 1.1.0)
- lz4 (~> 123)
- Nimble (~> 0.3.0)
- OpenSSL-Framework (~> 1.0.2)
- OpenSSL-Framework (~> 1.0.201)
- Quick (~> 0.2.2)
- SwiftBytes (~> 0.1.0)
......@@ -24,7 +24,7 @@ SPEC CHECKSUMS:
IGDigest: b9ff1800bf1f0bdc3714fb4f0f63904464b2ddb4
lz4: 316468bb1b748b046e7d4452e46ffc5c7fddccf0
Nimble: a4d9d978129e83d73e33b7d8bce57443bd556068
OpenSSL-Framework: b1654dc18ef9a08ee7670c690a5e9795b44ce28d
OpenSSL-Framework: 2d2289869dd1cfd0df0b340398bcf64094ecfe12
Quick: 7b89ff625e72ef931c2a9ef2f25ac3a9d2457763
SwiftBytes: 2f33be5dd47e9cee01aae1ccd54c126ea1ab5a6e
......
......@@ -23,6 +23,7 @@ If you have problems building for arm64 please uninstall MacPorts (see #28).
* <http://www.x2on.de/2010/07/13/tutorial-iphone-app-with-compiled-openssl-1-0-0a-library/>
## Changelog
* 2015-03-19: OpenSSL 1.0.2a
* 2015-01-28: OpenSSL 1.0.2
* 2015-01-10: OpenSSL 1.0.1k
* 2014-10-15: OpenSSL 1.0.1j
......
......@@ -795,6 +795,7 @@ DECLARE_ASN1_SET_OF(ASN1_OBJECT)
ASN1_STRING *ASN1_STRING_new(void);
void ASN1_STRING_free(ASN1_STRING *a);
void ASN1_STRING_clear_free(ASN1_STRING *a);
int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);
ASN1_STRING *ASN1_STRING_dup(const ASN1_STRING *a);
ASN1_STRING *ASN1_STRING_type_new(int type);
......
......@@ -833,6 +833,7 @@ void ERR_load_BIO_strings(void);
# define BIO_F_CONN_CTRL 127
# define BIO_F_CONN_STATE 115
# define BIO_F_DGRAM_SCTP_READ 132
# define BIO_F_DGRAM_SCTP_WRITE 133
# define BIO_F_FILE_CTRL 116
# define BIO_F_FILE_READ 130
# define BIO_F_LINEBUFFER_CTRL 129
......
......@@ -86,6 +86,7 @@ extern "C" {
# define DTLS1_VERSION 0xFEFF
# define DTLS1_2_VERSION 0xFEFD
# define DTLS_MAX_VERSION DTLS1_2_VERSION
# define DTLS1_VERSION_MAJOR 0xFE
# define DTLS1_BAD_VER 0x0100
......
......@@ -107,8 +107,8 @@ extern "C" {
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/Users/nlv22930/Development/pulse-swift/Pods/OpenSSL-Framework/bin/iPhoneSimulator8.1-i386.sdk/lib/engines"
#define OPENSSLDIR "/Users/nlv22930/Development/pulse-swift/Pods/OpenSSL-Framework/bin/iPhoneSimulator8.1-i386.sdk"
#define ENGINESDIR "/Users/nlv22930/Development/pulse-swift/Pods/OpenSSL-Framework/bin/iPhoneSimulator8.2-i386.sdk/lib/engines"
#define OPENSSLDIR "/Users/nlv22930/Development/pulse-swift/Pods/OpenSSL-Framework/bin/iPhoneSimulator8.2-i386.sdk"
#endif
#endif
......
......@@ -30,11 +30,11 @@ extern "C" {
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
# define OPENSSL_VERSION_NUMBER 0x1000200fL
# define OPENSSL_VERSION_NUMBER 0x1000201fL
# ifdef OPENSSL_FIPS
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2-fips 22 Jan 2015"
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2a-fips 19 Mar 2015"
# else
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2 22 Jan 2015"
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2a 19 Mar 2015"
# endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
......
......@@ -338,7 +338,7 @@ extern "C" {
* The following cipher list is used by default. It also is substituted when
* an application-defined cipher list string starts with 'DEFAULT'.
*/
# define SSL_DEFAULT_CIPHER_LIST "ALL:!aNULL:!eNULL:!SSLv2"
# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!aNULL:!eNULL:!SSLv2"
/*
* As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
* starts with a reasonable order, and all we have to do for DEFAULT is
......
This diff is collapsed.
......@@ -34,7 +34,7 @@
#define COCOAPODS_POD_AVAILABLE_OpenSSL_Framework
#define COCOAPODS_VERSION_MAJOR_OpenSSL_Framework 1
#define COCOAPODS_VERSION_MINOR_OpenSSL_Framework 0
#define COCOAPODS_VERSION_PATCH_OpenSSL_Framework 2
#define COCOAPODS_VERSION_PATCH_OpenSSL_Framework 201
// Quick
#define COCOAPODS_POD_AVAILABLE_Quick
......
......@@ -34,7 +34,7 @@
#define COCOAPODS_POD_AVAILABLE_OpenSSL_Framework
#define COCOAPODS_VERSION_MAJOR_OpenSSL_Framework 1
#define COCOAPODS_VERSION_MINOR_OpenSSL_Framework 0
#define COCOAPODS_VERSION_PATCH_OpenSSL_Framework 2
#define COCOAPODS_VERSION_PATCH_OpenSSL_Framework 201
// Quick
#define COCOAPODS_POD_AVAILABLE_Quick
......
......@@ -28,7 +28,7 @@
#define COCOAPODS_POD_AVAILABLE_OpenSSL_Framework
#define COCOAPODS_VERSION_MAJOR_OpenSSL_Framework 1
#define COCOAPODS_VERSION_MINOR_OpenSSL_Framework 0
#define COCOAPODS_VERSION_PATCH_OpenSSL_Framework 2
#define COCOAPODS_VERSION_PATCH_OpenSSL_Framework 201
// SwiftBytes
#define COCOAPODS_POD_AVAILABLE_SwiftBytes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment