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

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 7755373d77a3a87b82c6a8570835717693e213eb..3cfad32593ac433dbcecd47f710d0cba518aa4c4 100644 (file)
--- 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 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 94e28cc3075e0910dc17a4d1b2a8ca35d1d33208..0329c348697aa8b05d83728817b4c70af895bcd6 100644 (file)
--- 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.
 
 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.
 =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 2f5729669d3dce5f8cb6ba1386bb1adeef8ba151..cd2290a157a07b8938e02abc4a93cf1482fd0fa9 100644 (file)
--- 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;
        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);
        default: str="unknown"; break;
                }
        return(str);