diff options
author | jsing <> | 2014-05-31 10:53:39 +0000 |
---|---|---|
committer | jsing <> | 2014-05-31 10:53:39 +0000 |
commit | f6e83696cca45f0d0392ebe733e48b8bd94ebb47 (patch) | |
tree | cea4d337f9a4c116882a3406ccc08e588dd003fb /src/lib/libssl/s3_both.c | |
parent | cc0b160e462358c219bef48df27be2e816b65194 (diff) | |
download | openbsd-f6e83696cca45f0d0392ebe733e48b8bd94ebb47.tar.gz openbsd-f6e83696cca45f0d0392ebe733e48b8bd94ebb47.tar.bz2 openbsd-f6e83696cca45f0d0392ebe733e48b8bd94ebb47.zip |
ECDH and ECDSA will not work overly well if there is no EC, so unifdef
OPENSSL_NO_EC.
ok tedu@
Diffstat (limited to 'src/lib/libssl/s3_both.c')
-rw-r--r-- | src/lib/libssl/s3_both.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c index 54b73451eb..2a96c19914 100644 --- a/src/lib/libssl/s3_both.c +++ b/src/lib/libssl/s3_both.c | |||
@@ -550,11 +550,9 @@ ssl_cert_type(X509 *x, EVP_PKEY *pkey) | |||
550 | } else if (i == EVP_PKEY_DSA) { | 550 | } else if (i == EVP_PKEY_DSA) { |
551 | ret = SSL_PKEY_DSA_SIGN; | 551 | ret = SSL_PKEY_DSA_SIGN; |
552 | } | 552 | } |
553 | #ifndef OPENSSL_NO_EC | ||
554 | else if (i == EVP_PKEY_EC) { | 553 | else if (i == EVP_PKEY_EC) { |
555 | ret = SSL_PKEY_ECC; | 554 | ret = SSL_PKEY_ECC; |
556 | } | 555 | } |
557 | #endif | ||
558 | else if (i == NID_id_GostR3410_94 || i == NID_id_GostR3410_94_cc) { | 556 | else if (i == NID_id_GostR3410_94 || i == NID_id_GostR3410_94_cc) { |
559 | ret = SSL_PKEY_GOST94; | 557 | ret = SSL_PKEY_GOST94; |
560 | } else if (i == NID_id_GostR3410_2001 || i == NID_id_GostR3410_2001_cc) { | 558 | } else if (i == NID_id_GostR3410_2001 || i == NID_id_GostR3410_2001_cc) { |