Allow using -SSLv2 again when setting Protocol in the config.

[openssl.git] / ssl / ssl_stat.c

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index 2f5729669d3dce5f8cb6ba1386bb1adeef8ba151..ad44756a8f47c897414cfb67bfa15a5cdcac4c4d 100644 (file)
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -100,46 +100,6 @@ case SSL_ST_BEFORE|SSL_ST_CONNECT: str="before/connect initialization"; break;
 case SSL_ST_OK|SSL_ST_CONNECT: str="ok/connect SSL initialization"; break;
 case SSL_ST_BEFORE|SSL_ST_ACCEPT: str="before/accept initialization"; break;
 case SSL_ST_OK|SSL_ST_ACCEPT: str="ok/accept SSL initialization"; break;
-#ifndef OPENSSL_NO_SSL2
-case SSL2_ST_CLIENT_START_ENCRYPTION: str="SSLv2 client start encryption"; break;
-case SSL2_ST_SERVER_START_ENCRYPTION: str="SSLv2 server start encryption"; break;
-case SSL2_ST_SEND_CLIENT_HELLO_A: str="SSLv2 write client hello A"; break;
-case SSL2_ST_SEND_CLIENT_HELLO_B: str="SSLv2 write client hello B"; break;
-case SSL2_ST_GET_SERVER_HELLO_A: str="SSLv2 read server hello A"; break;
-case SSL2_ST_GET_SERVER_HELLO_B: str="SSLv2 read server hello B"; break;
-case SSL2_ST_SEND_CLIENT_MASTER_KEY_A: str="SSLv2 write client master key A"; break;
-case SSL2_ST_SEND_CLIENT_MASTER_KEY_B: str="SSLv2 write client master key B"; break;
-case SSL2_ST_SEND_CLIENT_FINISHED_A: str="SSLv2 write client finished A"; break;
-case SSL2_ST_SEND_CLIENT_FINISHED_B: str="SSLv2 write client finished B"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_A: str="SSLv2 write client certificate A"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_B: str="SSLv2 write client certificate B"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_C: str="SSLv2 write client certificate C"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_D: str="SSLv2 write client certificate D"; break;
-case SSL2_ST_GET_SERVER_VERIFY_A: str="SSLv2 read server verify A"; break;
-case SSL2_ST_GET_SERVER_VERIFY_B: str="SSLv2 read server verify B"; break;
-case SSL2_ST_GET_SERVER_FINISHED_A: str="SSLv2 read server finished A"; break;
-case SSL2_ST_GET_SERVER_FINISHED_B: str="SSLv2 read server finished B"; break;
-case SSL2_ST_GET_CLIENT_HELLO_A: str="SSLv2 read client hello A"; break;
-case SSL2_ST_GET_CLIENT_HELLO_B: str="SSLv2 read client hello B"; break;
-case SSL2_ST_GET_CLIENT_HELLO_C: str="SSLv2 read client hello C"; break;
-case SSL2_ST_SEND_SERVER_HELLO_A: str="SSLv2 write server hello A"; break;
-case SSL2_ST_SEND_SERVER_HELLO_B: str="SSLv2 write server hello B"; break;
-case SSL2_ST_GET_CLIENT_MASTER_KEY_A: str="SSLv2 read client master key A"; break;
-case SSL2_ST_GET_CLIENT_MASTER_KEY_B: str="SSLv2 read client master key B"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_A: str="SSLv2 write server verify A"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_B: str="SSLv2 write server verify B"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_C: str="SSLv2 write server verify C"; break;
-case SSL2_ST_GET_CLIENT_FINISHED_A: str="SSLv2 read client finished A"; break;
-case SSL2_ST_GET_CLIENT_FINISHED_B: str="SSLv2 read client finished B"; break;
-case SSL2_ST_SEND_SERVER_FINISHED_A: str="SSLv2 write server finished A"; break;
-case SSL2_ST_SEND_SERVER_FINISHED_B: str="SSLv2 write server finished B"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_A: str="SSLv2 write request certificate A"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_B: str="SSLv2 write request certificate B"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_C: str="SSLv2 write request certificate C"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_D: str="SSLv2 write request certificate D"; break;
-case SSL2_ST_X509_GET_SERVER_CERTIFICATE: str="SSLv2 X509 read server certificate"; break;
-case SSL2_ST_X509_GET_CLIENT_CERTIFICATE: str="SSLv2 X509 read client certificate"; break;
-#endif
 
 #ifndef OPENSSL_NO_SSL3
 /* SSLv3 additions */
@@ -210,12 +170,8 @@ case SSL3_ST_SR_KEY_EXCH_A:        str="SSLv3 read client key exchange A"; break;
 case SSL3_ST_SR_KEY_EXCH_B:    str="SSLv3 read client key exchange B"; break;
 case SSL3_ST_SR_CERT_VRFY_A:   str="SSLv3 read certificate verify A"; break;
 case SSL3_ST_SR_CERT_VRFY_B:   str="SSLv3 read certificate verify B"; break;
-#ifndef OPENSSL_NO_SRP
-case SSL3_ST_SR_CLNT_HELLO_SRP_USERNAME:       str="SSLv3 waiting for a SRP username"; break;
-#endif
 #endif
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 /* SSLv2/v3 compatibility states */
 /* client */
 case SSL23_ST_CW_CLNT_HELLO_A: str="SSLv2/v3 write client hello A"; break;
@@ -225,7 +181,6 @@ case SSL23_ST_CR_SRVR_HELLO_B:      str="SSLv2/v3 read server hello B"; break;
 /* server */
 case SSL23_ST_SR_CLNT_HELLO_A: str="SSLv2/v3 read client hello A"; break;
 case SSL23_ST_SR_CLNT_HELLO_B: str="SSLv2/v3 read client hello B"; break;
-#endif
 
 /* DTLS */
 case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A: str="DTLS1 read hello verify request A"; break;
@@ -262,46 +217,6 @@ case SSL_ST_BEFORE:                                str="PINIT "; break;
 case SSL_ST_ACCEPT:                            str="AINIT "; break;
 case SSL_ST_CONNECT:                           str="CINIT "; break;
 case SSL_ST_OK:                                        str="SSLOK "; break;
-#ifndef OPENSSL_NO_SSL2
-case SSL2_ST_CLIENT_START_ENCRYPTION:          str="2CSENC"; break;
-case SSL2_ST_SERVER_START_ENCRYPTION:          str="2SSENC"; break;
-case SSL2_ST_SEND_CLIENT_HELLO_A:              str="2SCH_A"; break;
-case SSL2_ST_SEND_CLIENT_HELLO_B:              str="2SCH_B"; break;
-case SSL2_ST_GET_SERVER_HELLO_A:               str="2GSH_A"; break;
-case SSL2_ST_GET_SERVER_HELLO_B:               str="2GSH_B"; break;
-case SSL2_ST_SEND_CLIENT_MASTER_KEY_A:         str="2SCMKA"; break;
-case SSL2_ST_SEND_CLIENT_MASTER_KEY_B:         str="2SCMKB"; break;
-case SSL2_ST_SEND_CLIENT_FINISHED_A:           str="2SCF_A"; break;
-case SSL2_ST_SEND_CLIENT_FINISHED_B:           str="2SCF_B"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_A:                str="2SCC_A"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_B:                str="2SCC_B"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_C:                str="2SCC_C"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_D:                str="2SCC_D"; break;
-case SSL2_ST_GET_SERVER_VERIFY_A:              str="2GSV_A"; break;
-case SSL2_ST_GET_SERVER_VERIFY_B:              str="2GSV_B"; break;
-case SSL2_ST_GET_SERVER_FINISHED_A:            str="2GSF_A"; break;
-case SSL2_ST_GET_SERVER_FINISHED_B:            str="2GSF_B"; break;
-case SSL2_ST_GET_CLIENT_HELLO_A:               str="2GCH_A"; break;
-case SSL2_ST_GET_CLIENT_HELLO_B:               str="2GCH_B"; break;
-case SSL2_ST_GET_CLIENT_HELLO_C:               str="2GCH_C"; break;
-case SSL2_ST_SEND_SERVER_HELLO_A:              str="2SSH_A"; break;
-case SSL2_ST_SEND_SERVER_HELLO_B:              str="2SSH_B"; break;
-case SSL2_ST_GET_CLIENT_MASTER_KEY_A:          str="2GCMKA"; break;
-case SSL2_ST_GET_CLIENT_MASTER_KEY_B:          str="2GCMKA"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_A:             str="2SSV_A"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_B:             str="2SSV_B"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_C:             str="2SSV_C"; break;
-case SSL2_ST_GET_CLIENT_FINISHED_A:            str="2GCF_A"; break;
-case SSL2_ST_GET_CLIENT_FINISHED_B:            str="2GCF_B"; break;
-case SSL2_ST_SEND_SERVER_FINISHED_A:           str="2SSF_A"; break;
-case SSL2_ST_SEND_SERVER_FINISHED_B:           str="2SSF_B"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_A:       str="2SRC_A"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_B:       str="2SRC_B"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_C:       str="2SRC_C"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_D:       str="2SRC_D"; break;
-case SSL2_ST_X509_GET_SERVER_CERTIFICATE:      str="2X9GSC"; break;
-case SSL2_ST_X509_GET_CLIENT_CERTIFICATE:      str="2X9GCC"; break;
-#endif
 
 #ifndef OPENSSL_NO_SSL3
 /* SSLv3 additions */
@@ -369,7 +284,6 @@ case SSL3_ST_SR_CERT_VRFY_A:                        str="3RCV_A"; break;
 case SSL3_ST_SR_CERT_VRFY_B:                   str="3RCV_B"; break;
 #endif
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 /* SSLv2/v3 compatibility states */
 /* client */
 case SSL23_ST_CW_CLNT_HELLO_A:                 str="23WCHA"; break;
@@ -379,7 +293,7 @@ case SSL23_ST_CR_SRVR_HELLO_B:                      str="23RSHA"; break;
 /* server */
 case SSL23_ST_SR_CLNT_HELLO_A:                 str="23RCHA"; break;
 case SSL23_ST_SR_CLNT_HELLO_B:                 str="23RCHB"; break;
-#endif
+
 /* DTLS */
 case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A: str="DRCHVA"; break;
 case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B: str="DRCHVB"; break;
@@ -550,11 +464,6 @@ const char *SSL_alert_desc_string_long(int value)
        case TLS1_AD_UNKNOWN_PSK_IDENTITY:
                str="unknown PSK identity";
                break;
-#ifndef OPENSSL_NO_SRP
-       case TLS1_AD_MISSING_SRP_USERNAME:
-               str="no srp username";
-               break;
-#endif
        default: str="unknown"; break;
                }
        return(str);