summaryrefslogtreecommitdiffstats
path: root/ssl/t1_lib.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2017-02-03 13:56:54 +0100
committerRichard Levitte <levitte@openssl.org>2017-02-03 20:37:23 +0100
commit21f198ec4874f7e2780a0afd0bdd3c038f69ed11 (patch)
tree4448739896b7c9a7ce0e0133c5c572c47bb42762 /ssl/t1_lib.c
parent8f85aa6bd3737547634bbbe1e141f728674fb594 (diff)
Fix "no-ec"
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2547)
Diffstat (limited to 'ssl/t1_lib.c')
-rw-r--r--ssl/t1_lib.c6
1 files changed, 6 insertions, 0 deletions
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;