[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  7bb37cb5938a0cf76c12c8421950e72634d5f61c (commit)
      from  e364c3b24e38bd60d40487e0a532261348a9bb10 (commit)


- Log -----------------------------------------------------------------
commit 7bb37cb5938a0cf76c12c8421950e72634d5f61c
Author: EasySec <Easy.Sec at free.fr>
Date:   Sat Nov 5 22:56:13 2016 +0100

    When no SRP identity is found, no error was reported server side
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1859)

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem_srvr.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 6bd16b8..89de025 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -1526,6 +1526,9 @@ WORK_STATE tls_post_process_client_hello(SSL *s, WORK_STATE wst)
             if (al != TLS1_AD_UNKNOWN_PSK_IDENTITY)
                 SSLerr(SSL_F_TLS_POST_PROCESS_CLIENT_HELLO,
                        SSL_R_CLIENTHELLO_TLSEXT);
+            else
+                SSLerr(SSL_F_TLS_POST_PROCESS_CLIENT_HELLO,
+                       SSL_R_PSK_IDENTITY_NOT_FOUND);
             goto f_err;
         }
     }