diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-11-13 13:13:01 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-11-13 13:13:01 +0000 |
| commit | 0c58d22ad99f548def13574af90087ebaa3e88f3 (patch) | |
| tree | a5719ad76a3884844c72ec120a1676db0ede032a | |
| parent | 6a828b7a8e313cc3343d266e55fd26252be15737 (diff) | |
| download | openssl-0c58d22ad99f548def13574af90087ebaa3e88f3.tar.gz | |
PR: 1794
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
| -rw-r--r-- | apps/s_cb.c | 3 | ||||
| -rw-r--r-- | doc/ssl/SSL_alert_type_string.pod | 5 | ||||
| -rw-r--r-- | ssl/ssl_stat.c | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/apps/s_cb.c b/apps/s_cb.c index 7755373d77..3cfad32593 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -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; } } } diff --git a/doc/ssl/SSL_alert_type_string.pod b/doc/ssl/SSL_alert_type_string.pod index 94e28cc307..0329c34869 100644 --- a/doc/ssl/SSL_alert_type_string.pod +++ b/doc/ssl/SSL_alert_type_string.pod @@ -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. diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c index 2f5729669d..cd2290a157 100644 --- a/ssl/ssl_stat.c +++ b/ssl/ssl_stat.c @@ -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); |