diff options
author | tedu <> | 2014-05-05 15:03:22 +0000 |
---|---|---|
committer | tedu <> | 2014-05-05 15:03:22 +0000 |
commit | 5b4326f23352be2e7084f2020795d8aa042c746f (patch) | |
tree | c342d9903092a19dfda173837629fd04c429eda9 /src/lib/libssl/ssl_ciph.c | |
parent | 77dd1ca11ad22b323b27beea447edd1e35c3b24e (diff) | |
download | openbsd-5b4326f23352be2e7084f2020795d8aa042c746f.tar.gz openbsd-5b4326f23352be2e7084f2020795d8aa042c746f.tar.bz2 openbsd-5b4326f23352be2e7084f2020795d8aa042c746f.zip |
Remove SRP and Kerberos support from libssl. These are complex protocols
all on their own and we can't effectively maintain them without using them,
which we don't. If the need arises, the code can be resurrected.
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
-rw-r--r-- | src/lib/libssl/ssl_ciph.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 00ab752de1..a1523524a1 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
@@ -702,10 +702,8 @@ ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth, unsigned long | |||
702 | *mkey |= SSL_kDHr|SSL_kDHd|SSL_kEDH; | 702 | *mkey |= SSL_kDHr|SSL_kDHd|SSL_kEDH; |
703 | *auth |= SSL_aDH; | 703 | *auth |= SSL_aDH; |
704 | #endif | 704 | #endif |
705 | #ifdef OPENSSL_NO_KRB5 | ||
706 | *mkey |= SSL_kKRB5; | 705 | *mkey |= SSL_kKRB5; |
707 | *auth |= SSL_aKRB5; | 706 | *auth |= SSL_aKRB5; |
708 | #endif | ||
709 | #ifdef OPENSSL_NO_ECDSA | 707 | #ifdef OPENSSL_NO_ECDSA |
710 | *auth |= SSL_aECDSA; | 708 | *auth |= SSL_aECDSA; |
711 | #endif | 709 | #endif |
@@ -717,9 +715,7 @@ ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth, unsigned long | |||
717 | *mkey |= SSL_kPSK; | 715 | *mkey |= SSL_kPSK; |
718 | *auth |= SSL_aPSK; | 716 | *auth |= SSL_aPSK; |
719 | #endif | 717 | #endif |
720 | #ifdef OPENSSL_NO_SRP | ||
721 | *mkey |= SSL_kSRP; | 718 | *mkey |= SSL_kSRP; |
722 | #endif | ||
723 | /* Check for presence of GOST 34.10 algorithms, and if they | 719 | /* Check for presence of GOST 34.10 algorithms, and if they |
724 | * do not present, disable appropriate auth and key exchange */ | 720 | * do not present, disable appropriate auth and key exchange */ |
725 | if (!get_optional_pkey_id("gost94")) { | 721 | if (!get_optional_pkey_id("gost94")) { |