[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  21f198ec4874f7e2780a0afd0bdd3c038f69ed11 (commit)
      from  8f85aa6bd3737547634bbbe1e141f728674fb594 (commit)


- Log -----------------------------------------------------------------
commit 21f198ec4874f7e2780a0afd0bdd3c038f69ed11
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Feb 3 13:56:54 2017 +0100

    Fix "no-ec"
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2547)

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

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

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index dd1e865..1534a54 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2279,7 +2279,9 @@ int tls_choose_sigalg(SSL *s)
 {
     if (SSL_IS_TLS13(s)) {
         size_t i;
+#ifndef OPENSSL_NO_EC
         int curve = -1;
+#endif
 
         /* Look for a certificate matching shared sigaglgs */
         for (i = 0; i < s->cert->shared_sigalgslen; i++) {
@@ -2305,6 +2307,7 @@ int tls_choose_sigalg(SSL *s)
                     continue;
             }
             if (lu->sig == EVP_PKEY_EC) {
+#ifndef OPENSSL_NO_EC
                 if (curve == -1) {
                     EC_KEY *ec = EVP_PKEY_get0_EC_KEY(c->privatekey);
 
@@ -2312,6 +2315,9 @@ int tls_choose_sigalg(SSL *s)
                 }
                 if (curve != lu->curve)
                     continue;
+#else
+                continue;
+#endif
             }
             s->s3->tmp.sigalg = lu;
             s->s3->tmp.cert_idx = idx;