diff options
| author | tedu <> | 2014-05-29 18:11:13 +0000 |
|---|---|---|
| committer | tedu <> | 2014-05-29 18:11:13 +0000 |
| commit | 149c6f9c05a2f73c39aed364b51e57279a57cd35 (patch) | |
| tree | e214d026b5b66638630daa4617eb61197c96abb9 /src/lib/libssl/ssl_ciph.c | |
| parent | e164bff3660a81a13f661bc0f7cf0cb0cbd94e51 (diff) | |
| download | openbsd-149c6f9c05a2f73c39aed364b51e57279a57cd35.tar.gz openbsd-149c6f9c05a2f73c39aed364b51e57279a57cd35.tar.bz2 openbsd-149c6f9c05a2f73c39aed364b51e57279a57cd35.zip | |
unidef DH, ECDH, and ECDSA. there's no purpose to a libssl without them.
ok deraadt jsing
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 5e93a4cde1..72061035aa 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
| @@ -708,19 +708,8 @@ ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth, unsigned long | |||
| 708 | 708 | ||
| 709 | *mkey |= SSL_kDHr|SSL_kDHd; /* no such ciphersuites supported! */ | 709 | *mkey |= SSL_kDHr|SSL_kDHd; /* no such ciphersuites supported! */ |
| 710 | *auth |= SSL_aDH; | 710 | *auth |= SSL_aDH; |
| 711 | #ifdef OPENSSL_NO_DH | ||
| 712 | *mkey |= SSL_kDHr|SSL_kDHd|SSL_kEDH; | ||
| 713 | *auth |= SSL_aDH; | ||
| 714 | #endif | ||
| 715 | *mkey |= SSL_kKRB5; | 711 | *mkey |= SSL_kKRB5; |
| 716 | *auth |= SSL_aKRB5; | 712 | *auth |= SSL_aKRB5; |
| 717 | #ifdef OPENSSL_NO_ECDSA | ||
| 718 | *auth |= SSL_aECDSA; | ||
| 719 | #endif | ||
| 720 | #ifdef OPENSSL_NO_ECDH | ||
| 721 | *mkey |= SSL_kECDHe|SSL_kECDHr; | ||
| 722 | *auth |= SSL_aECDH; | ||
| 723 | #endif | ||
| 724 | #ifdef OPENSSL_NO_PSK | 713 | #ifdef OPENSSL_NO_PSK |
| 725 | *mkey |= SSL_kPSK; | 714 | *mkey |= SSL_kPSK; |
| 726 | *auth |= SSL_aPSK; | 715 | *auth |= SSL_aPSK; |