PR: 1794
authorDr. Stephen Henson <steve@openssl.org>
Sun, 13 Nov 2011 13:13:01 +0000 (13:13 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 13 Nov 2011 13:13:01 +0000 (13:13 +0000)
Submitted by: Peter Sylvester <peter.sylvester@edelweb.fr>
Reviewed by: steve

Document unknown_psk_identify alert, remove pre-RFC 5054 string from
ssl_stat.c

apps/s_cb.c
doc/ssl/SSL_alert_type_string.pod
ssl/ssl_stat.c

index 7755373..3cfad32 100644 (file)
@@ -552,6 +552,9 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                                case 114:
                                        str_details2 = " bad_certificate_hash_value";
                                        break;
+                               case 115:
+                                       str_details2 = " unknown_psk_identity";
+                                       break;
                                        }
                                }
                        }
index 94e28cc..0329c34 100644 (file)
@@ -214,6 +214,11 @@ satisfy a request; the process might receive security parameters
 difficult to communicate changes to these parameters after that
 point. This message is always a warning.
 
+=item "UP"/"unknown PSK identity"
+
+Sent by the server to indicate that it does not recognize a PSK
+identity or an SRP identity. 
+
 =item "UK"/"unknown"
 
 This indicates that no description is available for this alert type.
index 2f57296..cd2290a 100644 (file)
@@ -550,11 +550,6 @@ const char *SSL_alert_desc_string_long(int value)
        case TLS1_AD_UNKNOWN_PSK_IDENTITY:
                str="unknown PSK identity";
                break;
-#ifndef OPENSSL_NO_SRP
-       case TLS1_AD_MISSING_SRP_USERNAME:
-               str="no srp username";
-               break;
-#endif
        default: str="unknown"; break;
                }
        return(str);