OpenSSL 1.0.1f
This commit is contained in:
parent
b908c56644
commit
b689d3faf2
|
@ -21,6 +21,7 @@ For iOS < 4.3 you must use iOS SDK < 6.0 and an older version of the build scrip
|
||||||
* <http://www.x2on.de/2010/07/13/tutorial-iphone-app-with-compiled-openssl-1-0-0a-library/>
|
* <http://www.x2on.de/2010/07/13/tutorial-iphone-app-with-compiled-openssl-1-0-0a-library/>
|
||||||
|
|
||||||
## Changelog
|
## Changelog
|
||||||
|
* 2014-01-07: OpenSSL 1.0.1f
|
||||||
* 2013-10-12: x86_64 support, Migrate project to iOS 7.0
|
* 2013-10-12: x86_64 support, Migrate project to iOS 7.0
|
||||||
* 2013-09-23: iOS 7.0 support
|
* 2013-09-23: iOS 7.0 support
|
||||||
* 2013-03-01: OpenSSL 1.0.1e, iOS 6.1
|
* 2013-03-01: OpenSSL 1.0.1e, iOS 6.1
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
#
|
#
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# Change values here #
|
# Change values here #
|
||||||
# #
|
#
|
||||||
VERSION="1.0.1e" #
|
VERSION="1.0.1f" #
|
||||||
SDKVERSION="7.0" #
|
SDKVERSION="7.0" #
|
||||||
# #
|
# #
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
|
@ -88,7 +88,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
|
||||||
char * BUF_strdup(const char *str);
|
char * BUF_strdup(const char *str);
|
||||||
char * BUF_strndup(const char *str, size_t siz);
|
char * BUF_strndup(const char *str, size_t siz);
|
||||||
void * BUF_memdup(const void *data, size_t siz);
|
void * BUF_memdup(const void *data, size_t siz);
|
||||||
void BUF_reverse(unsigned char *out, unsigned char *in, size_t siz);
|
void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
|
||||||
|
|
||||||
/* safe string functions */
|
/* safe string functions */
|
||||||
size_t BUF_strlcpy(char *dst,const char *src,size_t siz);
|
size_t BUF_strlcpy(char *dst,const char *src,size_t siz);
|
||||||
|
|
|
@ -25,11 +25,11 @@
|
||||||
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
|
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
|
||||||
* major minor fix final patch/beta)
|
* major minor fix final patch/beta)
|
||||||
*/
|
*/
|
||||||
#define OPENSSL_VERSION_NUMBER 0x1000105fL
|
#define OPENSSL_VERSION_NUMBER 0x1000106fL
|
||||||
#ifdef OPENSSL_FIPS
|
#ifdef OPENSSL_FIPS
|
||||||
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1e-fips 11 Feb 2013"
|
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f-fips 6 Jan 2014"
|
||||||
#else
|
#else
|
||||||
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1e 11 Feb 2013"
|
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f 6 Jan 2014"
|
||||||
#endif
|
#endif
|
||||||
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
||||||
|
|
||||||
|
|
|
@ -138,6 +138,7 @@ void ERR_load_RAND_strings(void);
|
||||||
#define RAND_F_SSLEAY_RAND_BYTES 100
|
#define RAND_F_SSLEAY_RAND_BYTES 100
|
||||||
|
|
||||||
/* Reason codes. */
|
/* Reason codes. */
|
||||||
|
#define RAND_R_DUAL_EC_DRBG_DISABLED 104
|
||||||
#define RAND_R_ERROR_INITIALISING_DRBG 102
|
#define RAND_R_ERROR_INITIALISING_DRBG 102
|
||||||
#define RAND_R_ERROR_INSTANTIATING_DRBG 103
|
#define RAND_R_ERROR_INSTANTIATING_DRBG 103
|
||||||
#define RAND_R_NO_FIPS_RANDOM_METHOD_SET 101
|
#define RAND_R_NO_FIPS_RANDOM_METHOD_SET 101
|
||||||
|
|
|
@ -555,11 +555,14 @@ struct ssl_session_st
|
||||||
#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L
|
#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L
|
||||||
#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L
|
#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L
|
||||||
#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L
|
#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L
|
||||||
#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L /* no effect since 0.9.7h and 0.9.8b */
|
#define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x00000040L
|
||||||
#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L
|
#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L
|
||||||
#define SSL_OP_TLS_D5_BUG 0x00000100L
|
#define SSL_OP_TLS_D5_BUG 0x00000100L
|
||||||
#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L
|
#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L
|
||||||
|
|
||||||
|
/* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */
|
||||||
|
#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0
|
||||||
|
|
||||||
/* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
|
/* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
|
||||||
* in OpenSSL 0.9.6d. Usually (depending on the application protocol)
|
* in OpenSSL 0.9.6d. Usually (depending on the application protocol)
|
||||||
* the workaround is not needed. Unfortunately some broken SSL/TLS
|
* the workaround is not needed. Unfortunately some broken SSL/TLS
|
||||||
|
@ -641,6 +644,12 @@ struct ssl_session_st
|
||||||
* TLS only.) "Released" buffers are put onto a free-list in the context
|
* TLS only.) "Released" buffers are put onto a free-list in the context
|
||||||
* or just freed (depending on the context's setting for freelist_max_len). */
|
* or just freed (depending on the context's setting for freelist_max_len). */
|
||||||
#define SSL_MODE_RELEASE_BUFFERS 0x00000010L
|
#define SSL_MODE_RELEASE_BUFFERS 0x00000010L
|
||||||
|
/* Send the current time in the Random fields of the ClientHello and
|
||||||
|
* ServerHello records for compatibility with hypothetical implementations
|
||||||
|
* that require it.
|
||||||
|
*/
|
||||||
|
#define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020L
|
||||||
|
#define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040L
|
||||||
|
|
||||||
/* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value,
|
/* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value,
|
||||||
* they cannot be used to clear bits. */
|
* they cannot be used to clear bits. */
|
||||||
|
|
|
@ -539,6 +539,15 @@ typedef struct ssl3_state_st
|
||||||
/* Set if we saw the Next Protocol Negotiation extension from our peer. */
|
/* Set if we saw the Next Protocol Negotiation extension from our peer. */
|
||||||
int next_proto_neg_seen;
|
int next_proto_neg_seen;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef OPENSSL_NO_TLSEXT
|
||||||
|
#ifndef OPENSSL_NO_EC
|
||||||
|
/* This is set to true if we believe that this is a version of Safari
|
||||||
|
* running on OS X 10.6 or newer. We wish to know this because Safari
|
||||||
|
* on 10.8 .. 10.8.3 has broken ECDHE-ECDSA support. */
|
||||||
|
char is_probably_safari;
|
||||||
|
#endif /* !OPENSSL_NO_EC */
|
||||||
|
#endif /* !OPENSSL_NO_TLSEXT */
|
||||||
} SSL3_STATE;
|
} SSL3_STATE;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue