diff options
| author | tedu <> | 2014-04-16 20:39:09 +0000 |
|---|---|---|
| committer | tedu <> | 2014-04-16 20:39:09 +0000 |
| commit | e7892d59587f55067ca2e2bc6fa26cf4bcd6c084 (patch) | |
| tree | 761d3461cd8f278c74120d2836c29dd21dc95be6 /src/lib/libssl/ssl_ciph.c | |
| parent | 750d86a4fc04f53024575d65269281ea6c4e450c (diff) | |
| download | openbsd-e7892d59587f55067ca2e2bc6fa26cf4bcd6c084.tar.gz openbsd-e7892d59587f55067ca2e2bc6fa26cf4bcd6c084.tar.bz2 openbsd-e7892d59587f55067ca2e2bc6fa26cf4bcd6c084.zip | |
add back SRP. i was being too greedy.
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 1a87cc255d..4bd3be0d41 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
| @@ -724,7 +724,9 @@ ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth, unsigned long | |||
| 724 | *mkey |= SSL_kPSK; | 724 | *mkey |= SSL_kPSK; |
| 725 | *auth |= SSL_aPSK; | 725 | *auth |= SSL_aPSK; |
| 726 | #endif | 726 | #endif |
| 727 | #ifdef OPENSSL_NO_SRP | ||
| 727 | *mkey |= SSL_kSRP; | 728 | *mkey |= SSL_kSRP; |
| 729 | #endif | ||
| 728 | /* Check for presence of GOST 34.10 algorithms, and if they | 730 | /* Check for presence of GOST 34.10 algorithms, and if they |
| 729 | * do not present, disable appropriate auth and key exchange */ | 731 | * do not present, disable appropriate auth and key exchange */ |
| 730 | if (!get_optional_pkey_id("gost94")) { | 732 | if (!get_optional_pkey_id("gost94")) { |