import openssl-0.9.7-beta1

1 files changed, 85 insertions, 41 deletions

diff --git a/src/lib/libssl/ssl_stat.c b/src/lib/libssl/ssl_stat.c
index a1daf25dd4..b16d253081 100644
--- a/src/lib/libssl/ssl_stat.c
+++ b/src/lib/libssl/ssl_stat.c
@@ -59,23 +59,22 @@
 #include <stdio.h>
 #include "ssl_locl.h"
 
-char *SSL_state_string_long(s)
-SSL *s;
+const char *SSL_state_string_long(const SSL *s)
         {
-        char *str;
+        const 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,10 +199,9 @@ default:	str="unknown state"; break;
         return(str);
         }
 
-char *SSL_rstate_string_long(s)
-SSL *s;
+const char *SSL_rstate_string_long(const SSL *s)
         {
-        char *str;
+        const char *str;
 
         switch (s->rstate)
                 {
@@ -213,10 +213,9 @@ SSL *s;
         return(str);
         }
 
-char *SSL_state_string(s)
-SSL *s;
+const char *SSL_state_string(const SSL *s)
         {
-        char *str;
+        const char *str;
 
         switch (s->state)
                 {
@@ -224,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;
@@ -265,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;
@@ -283,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;
@@ -329,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;
@@ -346,8 +347,7 @@ default:					str="UNKWN "; break;
         return(str);
         }
 
-char *SSL_alert_type_string_long(value)
-int value;
+const char *SSL_alert_type_string_long(int value)
         {
         value>>=8;
         if (value == SSL3_AL_WARNING)
@@ -358,8 +358,7 @@ int value;
                 return("unknown");
         }
 
-char *SSL_alert_type_string(value)
-int value;
+const char *SSL_alert_type_string(int value)
         {
         value>>=8;
         if (value == SSL3_AL_WARNING)
@@ -370,10 +369,9 @@ int value;
                 return("U");
         }
 
-char *SSL_alert_desc_string(value)
-int value;
+const char *SSL_alert_desc_string(int value)
         {
-        char *str;
+        const char *str;
 
         switch (value & 0xff)
                 {
@@ -389,15 +387,26 @@ int value;
         case SSL3_AD_CERTIFICATE_EXPIRED:       str="CE"; break;
         case SSL3_AD_CERTIFICATE_UNKNOWN:       str="CU"; break;
         case SSL3_AD_ILLEGAL_PARAMETER:         str="IP"; break;
+        case TLS1_AD_DECRYPTION_FAILED:         str="DC"; break;
+        case TLS1_AD_RECORD_OVERFLOW:           str="RO"; break;
+        case TLS1_AD_UNKNOWN_CA:                str="CA"; break;
+        case TLS1_AD_ACCESS_DENIED:             str="AD"; break;
+        case TLS1_AD_DECODE_ERROR:              str="DE"; break;
+        case TLS1_AD_DECRYPT_ERROR:             str="CY"; break;
+        case TLS1_AD_EXPORT_RESTRICTION:        str="ER"; break;
+        case TLS1_AD_PROTOCOL_VERSION:          str="PV"; break;
+        case TLS1_AD_INSUFFICIENT_SECURITY:     str="IS"; break;
+        case TLS1_AD_INTERNAL_ERROR:            str="IE"; break;
+        case TLS1_AD_USER_CANCELLED:            str="US"; break;
+        case TLS1_AD_NO_RENEGOTIATION:          str="NR"; break;
         default:                                str="UK"; break;
                 }
         return(str);
         }
 
-char *SSL_alert_desc_string_long(value)
-int value;
+const char *SSL_alert_desc_string_long(int value)
         {
-        char *str;
+        const char *str;
 
         switch (value & 0xff)
                 {
@@ -405,7 +414,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";
@@ -432,20 +441,55 @@ 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";
                 break;
+        case TLS1_AD_DECRYPTION_FAILED:
+                str="decryption failed";
+                break;
+        case TLS1_AD_RECORD_OVERFLOW:
+                str="record overflow";
+                break;
+        case TLS1_AD_UNKNOWN_CA:
+                str="unknown CA";
+                break;
+        case TLS1_AD_ACCESS_DENIED:
+                str="access denied";
+                break;
+        case TLS1_AD_DECODE_ERROR:
+                str="decode error";
+                break;
+        case TLS1_AD_DECRYPT_ERROR:
+                str="decrypt error";
+                break;
+        case TLS1_AD_EXPORT_RESTRICTION:
+                str="export restriction";
+                break;
+        case TLS1_AD_PROTOCOL_VERSION:
+                str="protocol version";
+                break;
+        case TLS1_AD_INSUFFICIENT_SECURITY:
+                str="insufficient security";
+                break;
+        case TLS1_AD_INTERNAL_ERROR:
+                str="internal error";
+                break;
+        case TLS1_AD_USER_CANCELLED:
+                str="user canceled";
+                break;
+        case TLS1_AD_NO_RENEGOTIATION:
+                str="no renegotiation";
+                break;
         default: str="unknown"; break;
                 }
         return(str);
         }
 
-char *SSL_rstate_string(s)
-SSL *s;
+const char *SSL_rstate_string(const SSL *s)
         {
-        char *str;
+        const char *str;
 
         switch (s->rstate)
                 {