[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  59ef580a14a526f6dd8d86b632d67022976fabcd (commit)
      from  5812e6f17571345d9e8449459572e540379002d5 (commit)


- Log -----------------------------------------------------------------
commit 59ef580a14a526f6dd8d86b632d67022976fabcd
Author: mancha security <mancha1 at zoho.com>
Date:   Sat May 2 22:34:46 2015 +0000

    ssl/s3_srvr.c: Fix typo introduced via 69f682374868b.
    
    Incorrect name used for SSL_AD_INTERNAL_ERROR.
    
    Signed-off-by: mancha security <mancha1 at zoho.com>
    Signed-off-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

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

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index d2c8995..7a39967 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -2537,7 +2537,7 @@ int ssl3_get_client_key_exchange(SSL *s)
                                                         session->master_key,
                                                         pms, outl);
         if (s->session->master_key_length < 0) {
-            al = SSL_INTERNAL_ERROR;
+            al = SSL_AD_INTERNAL_ERROR;
             SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
             goto f_err;
         }