Parse custom extensions after internal extensions.

[openssl.git] / ssl / ssl_stat.c

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index c20a4757d17ba4b999dd68e8919b4ee0d6ffa42a..c5a15ce548240d429ac9717ccd9fe7ed4c07e07c 100644 (file)
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -153,6 +153,8 @@ case SSL3_ST_CR_KEY_EXCH_A: str="SSLv3 read server key exchange A"; break;
 case SSL3_ST_CR_KEY_EXCH_B:    str="SSLv3 read server key exchange B"; break;
 case SSL3_ST_CR_CERT_REQ_A:    str="SSLv3 read server certificate request A"; break;
 case SSL3_ST_CR_CERT_REQ_B:    str="SSLv3 read server certificate request B"; break;
+case SSL3_ST_CR_SESSION_TICKET_A: str="SSLv3 read server session ticket A";break;
+case SSL3_ST_CR_SESSION_TICKET_B: str="SSLv3 read server session ticket B";break;
 case SSL3_ST_CR_SRVR_DONE_A:   str="SSLv3 read server done A"; break;
 case SSL3_ST_CR_SRVR_DONE_B:   str="SSLv3 read server done B"; break;
 case SSL3_ST_CW_CERT_A:                str="SSLv3 write client certificate A"; break;
@@ -198,6 +200,8 @@ case SSL3_ST_SW_KEY_EXCH_A: str="SSLv3 write key exchange A"; break;
 case SSL3_ST_SW_KEY_EXCH_B:    str="SSLv3 write key exchange B"; break;
 case SSL3_ST_SW_CERT_REQ_A:    str="SSLv3 write certificate request A"; break;
 case SSL3_ST_SW_CERT_REQ_B:    str="SSLv3 write certificate request B"; break;
+case SSL3_ST_SW_SESSION_TICKET_A: str="SSLv3 write session ticket A"; break;
+case SSL3_ST_SW_SESSION_TICKET_B: str="SSLv3 write session ticket B"; break;
 case SSL3_ST_SW_SRVR_DONE_A:   str="SSLv3 write server done A"; break;
 case SSL3_ST_SW_SRVR_DONE_B:   str="SSLv3 write server done B"; break;
 case SSL3_ST_SR_CERT_A:                str="SSLv3 read client certificate A"; break;
@@ -208,7 +212,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;
@@ -218,7 +221,12 @@ 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;
+case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B: str="DTLS1 read hello verify request B"; break;
+case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A: str="DTLS1 write hello verify request A"; break;
+case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B: str="DTLS1 write hello verify request B"; break;
 
 default:       str="unknown state"; break;
                }
@@ -356,7 +364,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;
@@ -366,7 +373,12 @@ 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;
+case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A: str="DWCHVA"; break;
+case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B: str="DWCHVB"; break;
 
 default:                                       str="UNKWN "; break;
                }