diff options
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 92d2417cb9..a79eafc9cf 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_ciph.c,v 1.62 2014/07/10 11:58:08 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.63 2014/07/11 09:24:44 beck Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -883,10 +883,8 @@ ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth, unsigned long | |||
| 883 | *auth |= SSL_aDH; | 883 | *auth |= SSL_aDH; |
| 884 | *mkey |= SSL_kKRB5; | 884 | *mkey |= SSL_kKRB5; |
| 885 | *auth |= SSL_aKRB5; | 885 | *auth |= SSL_aKRB5; |
| 886 | #ifdef OPENSSL_NO_PSK | ||
| 887 | *mkey |= SSL_kPSK; | 886 | *mkey |= SSL_kPSK; |
| 888 | *auth |= SSL_aPSK; | 887 | *auth |= SSL_aPSK; |
| 889 | #endif | ||
| 890 | *mkey |= SSL_kSRP; | 888 | *mkey |= SSL_kSRP; |
| 891 | /* Check for presence of GOST 34.10 algorithms, and if they | 889 | /* Check for presence of GOST 34.10 algorithms, and if they |
| 892 | * do not present, disable appropriate auth and key exchange */ | 890 | * do not present, disable appropriate auth and key exchange */ |