summaryrefslogtreecommitdiffstats
path: root/ssl/t1_lib.c
diff options
context:
space:
mode:
authorBenjamin Kaduk <bkaduk@akamai.com>2017-06-15 17:01:04 -0400
committerRich Salz <rsalz@openssl.org>2017-06-15 17:02:45 -0400
commit1316c9ffabf684302ea2059cdf3765492c3e7da4 (patch)
tree3d509ca16ba14904ff569d77cd86547c5cad0a3d /ssl/t1_lib.c
parent3ec32be78a5d39cd6d1211e61967590f17918284 (diff)
Fix no-ec
Also remove nested OPENSSL_NO_EC conditional; it was properly indented, but a no-op. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Benjamin Kaduk <kaduk@mit.edu> (Merged from https://github.com/openssl/openssl/pull/3693)
Diffstat (limited to 'ssl/t1_lib.c')
-rw-r--r--ssl/t1_lib.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index df48f5b34d..3c5e155066 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -621,7 +621,6 @@ static int tls1_check_cert_param(SSL *s, X509 *x, int check_ee_md)
return rv;
}
-# ifndef OPENSSL_NO_EC
/*
* tls1_check_ec_tmp_key - Check EC temporary key compatibility
* @s: SSL connection
@@ -658,7 +657,6 @@ int tls1_check_ec_tmp_key(SSL *s, unsigned long cid)
return 1;
return 0;
}
-# endif /* OPENSSL_NO_EC */
#else