diff --git a/openssl-equal-pre6.patch b/openssl-equal-pre6.patch index 57bf355..f22121e 100644 --- a/openssl-equal-pre6.patch +++ b/openssl-equal-pre6.patch @@ -46,10 +46,10 @@ index 4b45ae7..7567b18 100644 /* * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h -index 5c6718f..d079e32 100644 +index 8e395cd..700d7b7 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h -@@ -590,6 +590,8 @@ int ERR_load_SSL_strings(void); +@@ -591,6 +591,8 @@ int ERR_load_SSL_strings(void); # define SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION 209 # define SSL_R_MISSING_TMP_DH_KEY 171 # define SSL_R_MISSING_TMP_ECDH_KEY 311 @@ -58,7 +58,7 @@ index 5c6718f..d079e32 100644 # define SSL_R_NOT_ON_RECORD_BOUNDARY 182 # define SSL_R_NOT_REPLACING_CERTIFICATE 289 # define SSL_R_NOT_SERVER 284 -@@ -718,9 +720,11 @@ int ERR_load_SSL_strings(void); +@@ -719,9 +721,11 @@ int ERR_load_SSL_strings(void); # define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS 239 # define SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES 242 # define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES 243 @@ -71,7 +71,7 @@ index 5c6718f..d079e32 100644 # define SSL_R_UNINITIALIZED 276 # define SSL_R_UNKNOWN_ALERT_TYPE 246 diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c -index 6193269..8c10b90 100644 +index f797497..0206266 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -4095,6 +4095,17 @@ int ssl3_put_cipher_by_char(const SSL_CIPHER *c, WPACKET *pkt, size_t *len) @@ -748,10 +748,10 @@ index 9011e42..7da2f1b 100644 char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c -index 0a86a7e..5c18b62 100644 +index bce2036..31b5599 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c -@@ -954,6 +954,9 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { +@@ -956,6 +956,9 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_TMP_DH_KEY), "missing tmp dh key"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_TMP_ECDH_KEY), "missing tmp ecdh key"}, @@ -761,7 +761,7 @@ index 0a86a7e..5c18b62 100644 {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_ON_RECORD_BOUNDARY), "not on record boundary"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_REPLACING_CERTIFICATE), -@@ -1184,11 +1187,14 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { +@@ -1186,11 +1189,14 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { "unable to load ssl3 md5 routines"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES), "unable to load ssl3 sha1 routines"},