Don't disable state strings with no-ssl2

Some state strings were erronously not compiled when no-ssl2
was set.

PR#3295

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index aae31a98499a3794cddb783cc8171b86d2a51ec3..b09cc7d2871a9b89d9e301b9342eaf5ede8e3b4f 100644 (file)
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -220,7 +220,6 @@ case SSL3_ST_SR_SUPPLEMENTAL_DATA_A: str="SSLv3 server read supplemental data A"
 case SSL3_ST_SR_SUPPLEMENTAL_DATA_B: str="SSLv3 client read supplemental data 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="SSLv2/v3 write client hello A"; break;
@@ -230,7 +229,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;
@@ -374,7 +372,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;
@@ -384,7 +381,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;