From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 16 Feb 2017 01:29:14 +0000 (+0000)
Subject: Fix warning
X-Git-Tag: OpenSSL_1_1_1-pre1~2384
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7b3a4d610731929d4fde15411f9be9b883974980;p=oweals%2Fopenssl.git

Fix warning

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2644)
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 6aa4decfe1..787f487e4c 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2320,7 +2320,7 @@ int ssl_security_cert_chain(SSL *s, STACK_OF(X509) *sk, X509 *x, int vfy)
  */
 int tls_choose_sigalg(SSL *s, int *al)
 {
-    int idx;
+    int idx = -1;
     const SIGALG_LOOKUP *lu = NULL;
 
     if (SSL_IS_TLS13(s)) {
@@ -2443,6 +2443,11 @@ int tls_choose_sigalg(SSL *s, int *al)
             }
         }
     }
+    if (idx == -1) {
+        *al = SSL_AD_INTERNAL_ERROR;
+        SSLerr(SSL_F_TLS_CHOOSE_SIGALG, ERR_R_INTERNAL_ERROR);
+        return 0;
+    }
     s->s3->tmp.cert = &s->cert->pkeys[idx];
     s->cert->key = s->s3->tmp.cert;
     s->s3->tmp.sigalg = lu;