X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fssl_stat.c;h=73b02509d448b3b138d73236f1c058ea832b659d;hb=ddc5f6f328755a92e7a9e99e8dd9b98b735683fc;hp=e8b4f56aae73a2e4a85373eff917d1f0d26333a4;hpb=a403188f92101512d4d3e45bc7b8e047d283d9d2;p=oweals%2Fopenssl.git

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index e8b4f56aae..73b02509d4 100644
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -59,9 +59,9 @@
 #include <stdio.h>
 #include "ssl_locl.h"
 
-char *SSL_state_string_long(SSL *s)
+const char *SSL_state_string_long(const SSL *s)
 	{
-	char *str;
+	const char *str;
 
 	switch (s->state)
 		{
@@ -127,6 +127,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;
@@ -172,6 +174,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;
@@ -199,9 +203,9 @@ default:	str="unknown state"; break;
 	return(str);
 	}
 
-char *SSL_rstate_string_long(SSL *s)
+const char *SSL_rstate_string_long(const SSL *s)
 	{
-	char *str;
+	const char *str;
 
 	switch (s->rstate)
 		{
@@ -213,9 +217,9 @@ char *SSL_rstate_string_long(SSL *s)
 	return(str);
 	}
 
-char *SSL_state_string(SSL *s)
+const char *SSL_state_string(const SSL *s)
 	{
-	char *str;
+	const char *str;
 
 	switch (s->state)
 		{
@@ -347,7 +351,7 @@ default:					str="UNKWN "; break;
 	return(str);
 	}
 
-char *SSL_alert_type_string_long(int value)
+const char *SSL_alert_type_string_long(int value)
 	{
 	value>>=8;
 	if (value == SSL3_AL_WARNING)
@@ -358,7 +362,7 @@ char *SSL_alert_type_string_long(int value)
 		return("unknown");
 	}
 
-char *SSL_alert_type_string(int value)
+const char *SSL_alert_type_string(int value)
 	{
 	value>>=8;
 	if (value == SSL3_AL_WARNING)
@@ -369,9 +373,9 @@ char *SSL_alert_type_string(int value)
 		return("U");
 	}
 
-char *SSL_alert_desc_string(int value)
+const char *SSL_alert_desc_string(int value)
 	{
-	char *str;
+	const char *str;
 
 	switch (value & 0xff)
 		{
@@ -387,26 +391,26 @@ char *SSL_alert_desc_string(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;
+	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(int value)
+const char *SSL_alert_desc_string_long(int value)
 	{
-	char *str;
+	const char *str;
 
 	switch (value & 0xff)
 		{
@@ -446,40 +450,40 @@ char *SSL_alert_desc_string_long(int value)
 	case SSL3_AD_ILLEGAL_PARAMETER:
 		str="illegal parameter";
 		break;
-	case TLS1_AD_DECRYPTION_FAILED
+	case TLS1_AD_DECRYPTION_FAILED:
 		str="decryption failed";
 		break;
-	case TLS1_AD_RECORD_OVERFLOW
+	case TLS1_AD_RECORD_OVERFLOW:
 		str="record overflow";
 		break;
-	case TLS1_AD_UNKNOWN_CA
+	case TLS1_AD_UNKNOWN_CA:
 		str="unknown CA";
 		break;
-	case TLS1_AD_ACCESS_DENIED
+	case TLS1_AD_ACCESS_DENIED:
 		str="access denied";
 		break;
-	case TLS1_AD_DECODE_ERROR
+	case TLS1_AD_DECODE_ERROR:
 		str="decode error";
 		break;
-	case TLS1_AD_DECRYPT_ERROR
+	case TLS1_AD_DECRYPT_ERROR:
 		str="decrypt error";
 		break;
-	case TLS1_AD_EXPORT_RESTRICTION
+	case TLS1_AD_EXPORT_RESTRICTION:
 		str="export restriction";
 		break;
-	case TLS1_AD_PROTOCOL_VERSION
+	case TLS1_AD_PROTOCOL_VERSION:
 		str="protocol version";
 		break;
-	case TLS1_AD_INSUFFICIENT_SECURITY
+	case TLS1_AD_INSUFFICIENT_SECURITY:
 		str="insufficient security";
 		break;
-	case TLS1_AD_INTERNAL_ERROR
+	case TLS1_AD_INTERNAL_ERROR:
 		str="internal error";
 		break;
-	case TLS1_AD_USER_CANCELLED
+	case TLS1_AD_USER_CANCELLED:
 		str="user canceled";
 		break;
-	case TLS1_AD_NO_RENEGOTIATION
+	case TLS1_AD_NO_RENEGOTIATION:
 		str="no renegotiation";
 		break;
 	default: str="unknown"; break;
@@ -487,9 +491,9 @@ char *SSL_alert_desc_string_long(int value)
 	return(str);
 	}
 
-char *SSL_rstate_string(SSL *s)
+const char *SSL_rstate_string(const SSL *s)
 	{
-	char *str;
+	const char *str;
 
 	switch (s->rstate)
 		{