Changeset 808 for openssl/trunk/ssl/ssl_stat.c

Timestamp:

Aug 7, 2014, 8:25:37 PM (11 years ago)

Author:

dmik

Message:

openssl: Merge version 1.0.0n from vendor to trunk.

Location:

openssl/trunk

Files:

• . (modified) (1 prop)
• ssl/ssl_stat.c (modified) (4 diffs)

openssl/trunk/ssl/ssl_stat.c ¶

@@ -213 +213 @@
 #endif
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 /* SSLv2/v3 compatibility states */
 /* client */
@@ -223 +222 @@
 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 */
@@ -367 +365 @@
 #endif
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 /* SSLv2/v3 compatibility states */
 /* client */
@@ -377 +374 @@
 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;