[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  4a4d4158572fd8b3dc641851b8378e791df7972d (commit)
      from  e464403d0bda2f1f74eb68582e4988e591c32433 (commit)


- Log -----------------------------------------------------------------
commit 4a4d4158572fd8b3dc641851b8378e791df7972d
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Jan 7 17:36:17 2015 +0000

    fix error discrepancy
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

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

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index aa9dcbb..ced326b 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1640,7 +1640,7 @@ int ssl3_get_key_exchange(SSL *s)
 		if (!SSL_C_IS_EXPORT(s->s3->tmp.new_cipher))
 			{
 			al=SSL_AD_UNEXPECTED_MESSAGE;
-			SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_UNEXPECTED_MESSAGE);
+			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
 			goto f_err;
 			}
 		if ((rsa=RSA_new()) == NULL)