From: Matt Caswell <matt@openssl.org>
Date: Wed, 8 Feb 2017 17:27:09 +0000 (+0000)
Subject: Remove a double call to ssl3_send_alert()
X-Git-Tag: OpenSSL_1_1_1-pre1~2409
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=429ff318d613047cf94accdc17e8d7c0dc144657;p=oweals%2Fopenssl.git

Remove a double call to ssl3_send_alert()

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2341)
---

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 66743c37ad..93ba63e650 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -3638,7 +3638,7 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,
 
 static int tls_construct_hello_retry_request(SSL *s, WPACKET *pkt)
 {
-    int al;
+    int al = SSL_AD_INTERNAL_ERROR;
 
     /*
      * TODO(TLS1.3): Remove the DRAFT version before release
@@ -3647,7 +3647,6 @@ static int tls_construct_hello_retry_request(SSL *s, WPACKET *pkt)
     if (!WPACKET_put_bytes_u16(pkt, TLS1_3_VERSION_DRAFT)
             || !tls_construct_extensions(s, pkt, EXT_TLS1_3_HELLO_RETRY_REQUEST,
                                          NULL, 0, &al)) {
-        ssl3_send_alert(s, SSL3_AL_FATAL, al);
         SSLerr(SSL_F_TLS_CONSTRUCT_HELLO_RETRY_REQUEST, ERR_R_INTERNAL_ERROR);
         ssl3_send_alert(s, SSL3_AL_FATAL, al);
         return 0;