[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  7b3a4d610731929d4fde15411f9be9b883974980 (commit)
      from  af7e05c7c60b87723efccc01f6d03ebc07cdd93c (commit)


- Log -----------------------------------------------------------------
commit 7b3a4d610731929d4fde15411f9be9b883974980
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Feb 16 01:29:14 2017 +0000

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

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

Summary of changes:
 ssl/t1_lib.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 6aa4dec..787f487 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;