From f3b8b34a882a09ff73facc4c6ce7cdcad59b8656 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Wed, 13 Feb 2013 22:15:56 +0000 Subject: Import OpenSSL 1.0.1e. Approved by: secteam (delphij, simon), benl (silence) --- ssl/s3_clnt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ssl/s3_clnt.c') diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index b80d052e1f5f..344e2eb1af8c 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -459,7 +459,6 @@ int ssl3_connect(SSL *s) SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B); if (ret <= 0) goto end; - #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) s->state=SSL3_ST_CW_FINISHED_A; #else @@ -987,7 +986,10 @@ int ssl3_get_server_hello(SSL *s) * client authentication. */ if (TLS1_get_version(s) < TLS1_2_VERSION && !ssl3_digest_cached_records(s)) + { + al = SSL_AD_INTERNAL_ERROR; goto f_err; + } /* lets get the compression algorithm */ /* COMPRESSION */ #ifdef OPENSSL_NO_COMP -- cgit v1.2.3