commit a497cf25162e100ad46bd08222b6e7584b2d5bee
author Dr. Stephen Henson <steve@openssl.org> Tue Feb 14 00:35:26 2017 +0000
committer Dr. Stephen Henson <steve@openssl.org> Wed Feb 15 02:23:54 2017 +0000
tree e1df2be6f03dc1a28e73220d1be5c0a464159aa7
parent f695571e10a3e63930424940acc8dafd13c6c35c

Use CERT_PKEY pointer instead of index

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

ssl/s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index ac2e858..8537e80 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3149,9 +3149,9 @@
              */
             if (cipher->algorithm_auth & (SSL_aNULL | SSL_aSRP))
                 return 2;
-            if (s->s3->tmp.cert_idx == -1)
+            if (s->s3->tmp.cert == NULL)
                 return 0;
-            s->cert->key = &s->cert->pkeys[s->s3->tmp.cert_idx];
+            s->cert->key = s->s3->tmp.cert;
             return 1;
         }
         return ssl_cert_set_current(s->cert, larg);