[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  cdde7b49a4ded6ce25b348314a231b99ce884c06 (commit)
      from  05d7bf6c5b729b88992b5474c21a24aa542f6e75 (commit)


- Log -----------------------------------------------------------------
commit cdde7b49a4ded6ce25b348314a231b99ce884c06
Author: Emilia Kasper <emilia at openssl.org>
Date:   Thu Sep 10 14:47:04 2015 +0200

    Restore SSLerr on PACKET_strndup failure.
    
    Reviewed-by: Dr Stephen Henson <steve at openssl.org>

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

Summary of changes:
 ssl/s3_srvr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 16f4db9..ec09840 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -2271,6 +2271,7 @@ int ssl3_get_client_key_exchange(SSL *s)
         }
 
         if (!PACKET_strndup(&psk_identity, &s->session->psk_identity)) {
+            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
             al = SSL_AD_INTERNAL_ERROR;
             goto f_err;
         }