diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-12-27 16:37:22 +0100 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-12-27 16:37:22 +0100 |
| commit | 8175af50cc208c09f92b30358d30dd86c798b60e (patch) | |
| tree | b19206cbabf69c104b9edc66a2c4287db38cbd49 /ssl/ssl_ciph.c | |
| parent | 8af7e94d7b720224547efa7e3364857f7f666dd4 (diff) | |
| download | openssl-8175af50cc208c09f92b30358d30dd86c798b60e.zip openssl-8175af50cc208c09f92b30358d30dd86c798b60e.tar.gz openssl-8175af50cc208c09f92b30358d30dd86c798b60e.tar.bz2 | |
Alternate fix for ../test/recipes/80-test_ssl_old.t with no-ec
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4981)
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 59b0851..19b592a 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -401,7 +401,7 @@ int ssl_load_ciphers(void) disabled_mkey_mask |= SSL_kDHE | SSL_kDHEPSK; #endif #ifdef OPENSSL_NO_EC - disabled_mkey_mask |= SSL_kECDHEPSK; + disabled_mkey_mask |= SSL_kECDHE | SSL_kECDHEPSK; disabled_auth_mask |= SSL_aECDSA; #endif #ifdef OPENSSL_NO_PSK |