diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-06-28 00:54:32 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-06-28 00:54:32 +0100 |
| commit | 0518a3e19e18cfc441cab261b28441b8c8bd77bf (patch) | |
| tree | 8da045a1a2b9f9cc300635d6fd942e2c97bbfc7e /ssl/ssl_stat.c | |
| parent | d183545d4589f1e7a40190400b8b99ea3d1f7f97 (diff) | |
Don't disable state strings with no-ssl2
Some state strings were erronously not compiled when no-ssl2
was set.
PR#3295
Diffstat (limited to 'ssl/ssl_stat.c')
| -rw-r--r-- | ssl/ssl_stat.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c index aae31a9849..b09cc7d287 100644 --- 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; |