diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
| -rw-r--r-- | src/lib/libssl/ssl_lib.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index b563071cda..6b62713bca 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c  | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_lib.c,v 1.77 2014/07/12 19:45:53 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.78 2014/07/12 22:33:39 jsing 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 | * | 
| @@ -1973,7 +1973,7 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) | |||
| 1973 | mask_k|=SSL_kRSA; | 1973 | mask_k|=SSL_kRSA; | 
| 1974 | 1974 | ||
| 1975 | if (dh_tmp) | 1975 | if (dh_tmp) | 
| 1976 | mask_k|=SSL_kEDH; | 1976 | mask_k|=SSL_kDHE; | 
| 1977 | 1977 | ||
| 1978 | if (dh_rsa) | 1978 | if (dh_rsa) | 
| 1979 | mask_k|=SSL_kDHr; | 1979 | mask_k|=SSL_kDHr; | 
| @@ -2022,7 +2022,7 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) | |||
| 2022 | } | 2022 | } | 
| 2023 | 2023 | ||
| 2024 | if (have_ecdh_tmp) { | 2024 | if (have_ecdh_tmp) { | 
| 2025 | mask_k|=SSL_kEECDH; | 2025 | mask_k|=SSL_kECDHE; | 
| 2026 | } | 2026 | } | 
| 2027 | 2027 | ||
| 2028 | 2028 | ||
| @@ -2108,10 +2108,10 @@ ssl_get_server_send_pkey(const SSL *s) | |||
| 2108 | 2108 | ||
| 2109 | if (alg_k & (SSL_kECDHr|SSL_kECDHe)) { | 2109 | if (alg_k & (SSL_kECDHr|SSL_kECDHe)) { | 
| 2110 | /* | 2110 | /* | 
| 2111 | * We don't need to look at SSL_kEECDH | 2111 | * We don't need to look at SSL_kECDHE | 
| 2112 | * since no certificate is needed for | 2112 | * since no certificate is needed for | 
| 2113 | * anon ECDH and for authenticated | 2113 | * anon ECDH and for authenticated | 
| 2114 | * EECDH, the check for the auth | 2114 | * ECDHE, the check for the auth | 
| 2115 | * algorithm will set i correctly | 2115 | * algorithm will set i correctly | 
| 2116 | * NOTE: For ECDH-RSA, we need an ECC | 2116 | * NOTE: For ECDH-RSA, we need an ECC | 
| 2117 | * not an RSA cert but for EECDH-RSA | 2117 | * not an RSA cert but for EECDH-RSA | 
