Remove extra whitespace. Sorry.

[openssl.git] / ssl / ssl_stat.c

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index 09194888b5a12b14885c340ee3738b4395923275..8355e9b859fbe978034c4792289600760087a17e 100644 (file)
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -74,7 +74,7 @@ case SSL_ST_BEFORE|SSL_ST_CONNECT: str="before/connect initialization"; break;
 case SSL_ST_OK|SSL_ST_CONNECT: str="ok/connect SSL initialization"; break;
 case SSL_ST_BEFORE|SSL_ST_ACCEPT: str="before/accept initialization"; break;
 case SSL_ST_OK|SSL_ST_ACCEPT: str="ok/accept SSL initialization"; break;
-#ifndef NO_SSL2
+#ifndef OPENSSL_NO_SSL2
 case SSL2_ST_CLIENT_START_ENCRYPTION: str="SSLv2 client start encryption"; break;
 case SSL2_ST_SERVER_START_ENCRYPTION: str="SSLv2 server start encryption"; break;
 case SSL2_ST_SEND_CLIENT_HELLO_A: str="SSLv2 write client hello A"; break;
@@ -115,7 +115,7 @@ case SSL2_ST_X509_GET_SERVER_CERTIFICATE: str="SSLv2 X509 read server certificat
 case SSL2_ST_X509_GET_CLIENT_CERTIFICATE: str="SSLv2 X509 read client certificate"; break;
 #endif
 
-#ifndef NO_SSL3
+#ifndef OPENSSL_NO_SSL3
 /* SSLv3 additions */
 case SSL3_ST_CW_CLNT_HELLO_A:  str="SSLv3 write client hello A"; break;
 case SSL3_ST_CW_CLNT_HELLO_B:  str="SSLv3 write client hello B"; break;
@@ -182,8 +182,8 @@ 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(NO_SSL2) && !defined(NO_SSL3)
-/* SSLv2/v3 compatablitity states */
+#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;
 case SSL23_ST_CW_CLNT_HELLO_B: str="SSLv2/v3 write client hello B"; break;
@@ -223,7 +223,7 @@ case SSL_ST_BEFORE:                         str="PINIT "; break;
 case SSL_ST_ACCEPT:                            str="AINIT "; break;
 case SSL_ST_CONNECT:                           str="CINIT "; break;
 case SSL_ST_OK:                                        str="SSLOK "; break;
-#ifndef NO_SSL2
+#ifndef OPENSSL_NO_SSL2
 case SSL2_ST_CLIENT_START_ENCRYPTION:          str="2CSENC"; break;
 case SSL2_ST_SERVER_START_ENCRYPTION:          str="2SSENC"; break;
 case SSL2_ST_SEND_CLIENT_HELLO_A:              str="2SCH_A"; break;
@@ -264,7 +264,7 @@ case SSL2_ST_X509_GET_SERVER_CERTIFICATE:   str="2X9GSC"; break;
 case SSL2_ST_X509_GET_CLIENT_CERTIFICATE:      str="2X9GCC"; break;
 #endif
 
-#ifndef NO_SSL3
+#ifndef OPENSSL_NO_SSL3
 /* SSLv3 additions */
 case SSL3_ST_SW_FLUSH:
 case SSL3_ST_CW_FLUSH:                         str="3FLUSH"; break;
@@ -282,6 +282,8 @@ case SSL3_ST_CR_SRVR_DONE_A:                        str="3RSD_A"; break;
 case SSL3_ST_CR_SRVR_DONE_B:                   str="3RSD_B"; break;
 case SSL3_ST_CW_CERT_A:                                str="3WCC_A"; break;
 case SSL3_ST_CW_CERT_B:                                str="3WCC_B"; break;
+case SSL3_ST_CW_CERT_C:                                str="3WCC_C"; break;
+case SSL3_ST_CW_CERT_D:                                str="3WCC_D"; break;
 case SSL3_ST_CW_KEY_EXCH_A:                    str="3WCKEA"; break;
 case SSL3_ST_CW_KEY_EXCH_B:                    str="3WCKEB"; break;
 case SSL3_ST_CW_CERT_VRFY_A:                   str="3WCV_A"; break;
@@ -328,8 +330,8 @@ 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(NO_SSL2) && !defined(NO_SSL3)
-/* SSLv2/v3 compatablitity states */
+#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
+/* SSLv2/v3 compatibility states */
 /* client */
 case SSL23_ST_CW_CLNT_HELLO_A:                 str="23WCHA"; break;
 case SSL23_ST_CW_CLNT_HELLO_B:                 str="23WCHB"; break;
@@ -400,7 +402,7 @@ char *SSL_alert_desc_string_long(int value)
                str="close notify";
                break;
        case SSL3_AD_UNEXPECTED_MESSAGE:
-               str="unexected_message";
+               str="unexpected_message";
                break;
        case SSL3_AD_BAD_RECORD_MAC:
                str="bad record mac";
@@ -427,7 +429,7 @@ char *SSL_alert_desc_string_long(int value)
                str="certificate expired";
                break;
        case SSL3_AD_CERTIFICATE_UNKNOWN:
-               str="certifcate unknown";
+               str="certificate unknown";
                break;
        case SSL3_AD_ILLEGAL_PARAMETER:
                str="illegal parameter";