From: Richard Levitte <levitte@openssl.org>
Date: Fri, 3 Feb 2017 12:56:54 +0000 (+0100)
Subject: Fix "no-ec"
X-Git-Tag: OpenSSL_1_1_1-pre1~2478
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=21f198ec4874f7e2780a0afd0bdd3c038f69ed11;p=oweals%2Fopenssl.git

Fix "no-ec"

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

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index dd1e86573b..1534a54f39 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;