Metrowerks for Motorola tune-up.

[openssl.git] / ssl / ssl_stat.c

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index 328ccc94ff1e000e99d5b4075e19a4cf481fb493..4042c4e75ce3fba2566c0dfe78404b6d56b685e1 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,22 +59,21 @@
 #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;
+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
 case SSL2_ST_CLIENT_START_ENCRYPTION: str="SSLv2 client start encryption"; break;
 case SSL2_ST_SERVER_START_ENCRYPTION: str="SSLv2 server start encryption"; break;
@@ -132,6 +131,8 @@ 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;
@@ -160,6 +161,7 @@ case SSL3_ST_SW_FLUSH:              str="SSLv3 flush data"; break;
 case SSL3_ST_SR_CLNT_HELLO_A:  str="SSLv3 read client hello A"; break;
 case SSL3_ST_SR_CLNT_HELLO_B:  str="SSLv3 read client hello B"; break;
 case SSL3_ST_SR_CLNT_HELLO_C:  str="SSLv3 read client hello C"; break;
+case SSL3_ST_SR_MS_SGC:                str="SSLv3 read second client hello (MS SGC)"; break;
 case SSL3_ST_SW_HELLO_REQ_A:   str="SSLv3 write hello request A"; break;
 case SSL3_ST_SW_HELLO_REQ_B:   str="SSLv3 write hello request B"; break;
 case SSL3_ST_SW_HELLO_REQ_C:   str="SSLv3 write hello request C"; break;
@@ -198,8 +200,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 +208,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;
 
@@ -282,6 +283,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;
@@ -345,8 +348,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 +359,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 +370,7 @@ int value;
                return("U");
        }
 
-char *SSL_alert_desc_string(value)
-int value;
+char *SSL_alert_desc_string(int value)
        {
        char *str;
 
@@ -393,8 +393,7 @@ int value;
        return(str);
        }
 
-char *SSL_alert_desc_string_long(value)
-int value;
+char *SSL_alert_desc_string_long(int value)
        {
        char *str;
 
@@ -441,8 +440,7 @@ int value;
        return(str);
        }
 
-char *SSL_rstate_string(s)
-SSL *s;
+char *SSL_rstate_string(SSL *s)
        {
        char *str;