PR: 1829

[oweals/openssl.git] / ssl / ssl_stat.c

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index 8e2b874f61b113b2f6aab94ab484c93d7e5dfc64..73b02509d448b3b138d73236f1c058ea832b659d 100644 (file)
--- 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)
                {
@@ -404,9 +408,9 @@ char *SSL_alert_desc_string(int value)
        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)
                {
@@ -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)
                {