Update pre9

openssl-equal-pre9_ciphers.patch

@@ -25,10 +25,10 @@ index 3786e9a028..8dd0d2c028 100644
  
  The following lists give the SSL or TLS cipher suites names from the
 diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
-index b2c6c1ee37..45f4cd87ff 100644
+index 9eba6d8fd5..cda966b851 100644
 --- a/include/openssl/sslerr.h
 +++ b/include/openssl/sslerr.h
-@@ -594,6 +594,8 @@ int ERR_load_SSL_strings(void);
+@@ -595,6 +595,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
@@ -37,7 +37,7 @@ index b2c6c1ee37..45f4cd87ff 100644
  # define SSL_R_NOT_ON_RECORD_BOUNDARY                     182
  # define SSL_R_NOT_REPLACING_CERTIFICATE                  289
  # define SSL_R_NOT_SERVER                                 284
-@@ -722,9 +724,11 @@ int ERR_load_SSL_strings(void);
+@@ -723,9 +725,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
@@ -825,10 +825,10 @@ index 9011e42fa8..e89d1482b2 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 03c5bf255e..3fa450d9cd 100644
+index 9ce643ae8e..b88c534495 100644
 --- a/ssl/ssl_err.c
 +++ b/ssl/ssl_err.c
-@@ -962,6 +962,9 @@ static const ERR_STRING_DATA SSL_str_reasons[] = {
+@@ -964,6 +964,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"},
@@ -838,7 +838,7 @@ index 03c5bf255e..3fa450d9cd 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),
-@@ -1192,11 +1195,14 @@ static const ERR_STRING_DATA SSL_str_reasons[] = {
+@@ -1194,11 +1197,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"},