diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2015-12-04 22:25:11 +0100 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2015-12-04 22:25:11 +0100 |
| commit | 6977e8ee4a718a76351ba5275a9f0be4e530eab5 (patch) | |
| tree | 84cd56401bf1e8c72e12187709d4fdd5ea674677 /ssl/ssl_lib.c | |
| parent | 6f78b9e824c053d062188578635c575017b587c5 (diff) | |
Make SSL_{CTX}_set_tmp_ecdh() call SSL_{CTX_}set1_curves()
SSL_{CTX}_set_tmp_ecdh() allows to set 1 EC curve and then tries to use it. On
the other hand SSL_{CTX_}set1_curves() allows you to set a list of curves, but
only when SSL_{CTX_}set_ecdh_auto() was called to turn it on.
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 9343e7dff2..d598f91eb7 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2037,7 +2037,7 @@ void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher) #endif #ifndef OPENSSL_NO_EC - have_ecdh_tmp = (c->ecdh_tmp || c->ecdh_tmp_auto); + have_ecdh_tmp = c->ecdh_tmp_auto; #endif cpk = &(c->pkeys[SSL_PKEY_RSA_ENC]); rsa_enc = pvalid[SSL_PKEY_RSA_ENC] & CERT_PKEY_VALID; |