Commit d0bdfdd8 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Don't disable state strings with no-ssl2 

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

PR#3295
(cherry picked from commit 0518a3e1)
parent 4b98488e

ssl/ssl_stat.c

+1 −4
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ 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;

#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;
@@ -196,7 +195,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;
@@ -340,7 +338,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;
@@ -350,7 +347,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;