Fix typos (shinagawa@star.zko.dec.com)

[openssl.git] / ssl / ssl_stat.c

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index 328ccc94ff1e000e99d5b4075e19a4cf481fb493..d74e0aa7c1c043db34ea7b2a1b123df68135a058 100644 (file)
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -1,5 +1,5 @@
 /* ssl/ssl_stat.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -59,23 +59,22 @@
 #include <stdio.h>
 #include "ssl_locl.h"
 
-char *SSL_state_string_long(s)
-SSL *s;
+char *SSL_state_string_long(SSL *s)
        {
        char *str;
 
        switch (s->state)
                {
-case SSL_ST_BEFORE: str="before SSL initalisation"; break;
-case SSL_ST_ACCEPT: str="before accept initalisation"; break;
-case SSL_ST_CONNECT: str="before connect initalisation"; break;
+case SSL_ST_BEFORE: str="before SSL initialization"; break;
+case SSL_ST_ACCEPT: str="before accept initialization"; break;
+case SSL_ST_CONNECT: str="before connect initialization"; break;
 case SSL_ST_OK: str="SSL negotiation finished successfully"; break;
 case SSL_ST_RENEGOTIATE:       str="SSL renegotiate ciphers"; break;
-case SSL_ST_BEFORE|SSL_ST_CONNECT: str="before/connect initalisation"; break;
-case SSL_ST_OK|SSL_ST_CONNECT: str="ok/connect SSL initalisation"; break;
-case SSL_ST_BEFORE|SSL_ST_ACCEPT: str="before/accept initalisation"; break;
-case SSL_ST_OK|SSL_ST_ACCEPT: str="ok/accept SSL initalisation"; break;
-#ifndef NO_SSL2
+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 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;
@@ -116,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;
@@ -132,10 +131,12 @@ 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;
 case SSL3_ST_CW_CERT_B:                str="SSLv3 write client certificate B"; break;
+case SSL3_ST_CW_CERT_C:                str="SSLv3 write client certificate C"; break;
+case SSL3_ST_CW_CERT_D:                str="SSLv3 write client certificate D"; break;
 case SSL3_ST_CW_KEY_EXCH_A:    str="SSLv3 write client key exchange A"; break;
 case SSL3_ST_CW_KEY_EXCH_B:    str="SSLv3 write client key exchange B"; break;
 case SSL3_ST_CW_CERT_VRFY_A:   str="SSLv3 write certificate verify A"; break;
-case SSL3_ST_CW_CERT_VRFY_B:   str="SSLv3 write certificate verify A"; break;
+case SSL3_ST_CW_CERT_VRFY_B:   str="SSLv3 write certificate verify B"; break;
 
 case SSL3_ST_CW_CHANGE_A:
 case SSL3_ST_SW_CHANGE_A:      str="SSLv3 write change cipher spec A"; break;
@@ -144,7 +145,7 @@ case SSL3_ST_SW_CHANGE_B:   str="SSLv3 write change cipher spec B"; break;
 case SSL3_ST_CW_FINISHED_A:    
 case SSL3_ST_SW_FINISHED_A:    str="SSLv3 write finished A"; break;
 case SSL3_ST_CW_FINISHED_B:    
-case SSL3_ST_SW_FINISHED_B:    str="SSLv3 write finished A"; break;
+case SSL3_ST_SW_FINISHED_B:    str="SSLv3 write finished B"; break;
 case SSL3_ST_CR_CHANGE_A:      
 case SSL3_ST_SR_CHANGE_A:      str="SSLv3 read change cipher spec A"; break;
 case SSL3_ST_CR_CHANGE_B:      
@@ -181,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;
@@ -198,8 +199,7 @@ default:    str="unknown state"; break;
        return(str);
        }
 
-char *SSL_rstate_string_long(s)
-SSL *s;
+char *SSL_rstate_string_long(SSL *s)
        {
        char *str;
 
@@ -207,13 +207,13 @@ SSL *s;
                {
        case SSL_ST_READ_HEADER: str="read header"; break;
        case SSL_ST_READ_BODY: str="read body"; break;
+       case SSL_ST_READ_DONE: str="read done"; break;
        default: str="unknown"; break;
                }
        return(str);
        }
 
-char *SSL_state_string(s)
-SSL *s;
+char *SSL_state_string(SSL *s)
        {
        char *str;
 
@@ -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;
@@ -345,8 +347,7 @@ default:                                    str="UNKWN "; break;
        return(str);
        }
 
-char *SSL_alert_type_string_long(value)
-int value;
+char *SSL_alert_type_string_long(int value)
        {
        value>>=8;
        if (value == SSL3_AL_WARNING)
@@ -357,8 +358,7 @@ int value;
                return("unknown");
        }
 
-char *SSL_alert_type_string(value)
-int value;
+char *SSL_alert_type_string(int value)
        {
        value>>=8;
        if (value == SSL3_AL_WARNING)
@@ -369,8 +369,7 @@ int value;
                return("U");
        }
 
-char *SSL_alert_desc_string(value)
-int value;
+char *SSL_alert_desc_string(int value)
        {
        char *str;
 
@@ -393,8 +392,7 @@ int value;
        return(str);
        }
 
-char *SSL_alert_desc_string_long(value)
-int value;
+char *SSL_alert_desc_string_long(int value)
        {
        char *str;
 
@@ -404,7 +402,7 @@ 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";
@@ -431,7 +429,7 @@ 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";
@@ -441,8 +439,7 @@ int value;
        return(str);
        }
 
-char *SSL_rstate_string(s)
-SSL *s;
+char *SSL_rstate_string(SSL *s)
        {
        char *str;