Remove unused SSLv3 specific error codes

Also remove the SSL_TXT_SSLV3 name.

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29338)

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index 922cecbaa50d07e2360a7feaa9921bd207fa33cc..1c160cecb569a824abe859b1b5f9506e0c977911 100644 (file)
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -1298,7 +1298,6 @@ RSA_R_RANDOMNESS_SOURCE_STRENGTH_INSUFFICIENT:180:\
 RSA_R_RSA_OPERATIONS_NOT_SUPPORTED:130:rsa operations not supported
 RSA_R_SLEN_CHECK_FAILED:136:salt length check failed
 RSA_R_SLEN_RECOVERY_FAILED:135:salt length recovery failed
-RSA_R_SSLV3_ROLLBACK_ATTACK:115:sslv3 rollback attack
 RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD:116:\
        the asn1 object identifier is not known for this md
 RSA_R_UNKNOWN_ALGORITHM_TYPE:117:unknown algorithm type
@@ -1656,8 +1655,6 @@ SSL_R_TOO_MUCH_EARLY_DATA:164:too much early data
 SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS:314:unable to find ecdh parameters
 SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS:239:\
        unable to find public key parameters
-SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines
-SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES:243:unable to load ssl3 sha1 routines
 SSL_R_UNEXPECTED_CCS_MESSAGE:262:unexpected ccs message
 SSL_R_UNEXPECTED_END_OF_EARLY_DATA:178:unexpected end of early data
 SSL_R_UNEXPECTED_EOF_WHILE_READING:294:unexpected eof while reading

diff --git a/crypto/rsa/rsa_err.c b/crypto/rsa/rsa_err.c
index 8f20f68efed8321d382877d25ad8fd8d3c907895..aced712b1de16fb3a0f70cc676480593af8a57ad 100644 (file)
--- a/crypto/rsa/rsa_err.c
+++ b/crypto/rsa/rsa_err.c
@@ -127,8 +127,6 @@ static const ERR_STRING_DATA RSA_str_reasons[] = {
         "salt length check failed" },
     { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SLEN_RECOVERY_FAILED),
         "salt length recovery failed" },
-    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SSLV3_ROLLBACK_ATTACK),
-        "sslv3 rollback attack" },
     { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD),
         "the asn1 object identifier is not known for this md" },
     { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_ALGORITHM_TYPE),

diff --git a/crypto/ssl_err.c b/crypto/ssl_err.c
index 6b88675200a9c5f21cd05f41a56cc97af8bf0d99..c8963522a30ae7f7f28bdbe858b1d3c37a849f89 100644 (file)
--- a/crypto/ssl_err.c
+++ b/crypto/ssl_err.c
@@ -544,10 +544,6 @@ static const ERR_STRING_DATA SSL_str_reasons[] = {
         "unable to find ecdh parameters" },
     { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS),
         "unable to find public key parameters" },
-    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES),
-        "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" },
     { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_CCS_MESSAGE),
         "unexpected ccs message" },
     { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_END_OF_EARLY_DATA),

diff --git a/include/openssl/rsaerr.h b/include/openssl/rsaerr.h
index 8432f5f6552dd0eafdffa634c4a42c3eb60dbda7..781e333132693eaafe81d209f90e5605407a1915 100644 (file)
--- a/include/openssl/rsaerr.h
+++ b/include/openssl/rsaerr.h
@@ -88,7 +88,6 @@
 #define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED 130
 #define RSA_R_SLEN_CHECK_FAILED 136
 #define RSA_R_SLEN_RECOVERY_FAILED 135
-#define RSA_R_SSLV3_ROLLBACK_ATTACK 115
 #define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
 #define RSA_R_UNKNOWN_ALGORITHM_TYPE 117
 #define RSA_R_UNKNOWN_DIGEST 166

diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
index 6b7d8c0d1623ec40db67db4d95ded575990aa8b8..61e7ce67efbac8b632e88424c7c2f3e1f658066a 100644 (file)
--- a/include/openssl/ssl.h.in
+++ b/include/openssl/ssl.h.in
@@ -163,7 +163,6 @@ extern "C" {
 #define SSL_TXT_SHA256 "SHA256"
 #define SSL_TXT_SHA384 "SHA384"
 
-#define SSL_TXT_SSLV3 "SSLv3"
 #define SSL_TXT_TLSV1 "TLSv1"
 #define SSL_TXT_TLSV1_1 "TLSv1.1"
 #define SSL_TXT_TLSV1_2 "TLSv1.2"

diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index 6993255b199f141ef8675943ec59eb31b12107bc..3f0568f2856f390aa125f946bbf2b9e0f0da483a 100644 (file)
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@@ -330,8 +330,6 @@
 #define SSL_R_TOO_MUCH_EARLY_DATA 164
 #define SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS 314
 #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
 #define SSL_R_UNEXPECTED_CCS_MESSAGE 262
 #define SSL_R_UNEXPECTED_END_OF_EARLY_DATA 178
 #define SSL_R_UNEXPECTED_EOF_WHILE_READING 294

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index d6f1dd16dc7706edbb30a59116d42d203489b61c..5c694ca6b8aafd0bcafd7225bed1641a5e1147c5 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -254,7 +254,6 @@ static const SSL_CIPHER cipher_aliases[] = {
     { 0, SSL_TXT_GOST12, NULL, 0, 0, 0, 0, SSL_GOST12_256 },
 
     /* protocol version aliases */
-    { 0, SSL_TXT_SSLV3, NULL, 0, 0, 0, 0, 0, SSL3_VERSION },
     { 0, SSL_TXT_TLSV1, NULL, 0, 0, 0, 0, 0, TLS1_VERSION },
     { 0, "TLSv1.0", NULL, 0, 0, 0, 0, 0, TLS1_VERSION },
     { 0, SSL_TXT_TLSV1_2, NULL, 0, 0, 0, 0, 0, TLS1_2_VERSION },