From efbb7ee432c14397c1894214235cb0d038df4d25 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 13 Nov 2011 13:13:14 +0000 Subject: [PATCH] PR: 1794 Submitted by: Peter Sylvester Reviewed by: steve Document unknown_psk_identify alert, remove pre-RFC 5054 string from ssl_stat.c --- apps/s_cb.c | 3 +++ doc/ssl/SSL_alert_type_string.pod | 5 +++++ 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 865c418143..7eafe72653 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -549,6 +549,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); -- 2.25.1