diff options
| author |   jsing <jsing@openbsd.org> | 2014-07-12 22:33:39 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-07-12 22:33:39 +0000 |
| commit | daecd61139095533ccdd24c7b8fbac1ca439f207 (patch) | |
| tree | ecab73cb9030e69b11055684cf04fad4129e75bd /lib/libssl/ssl_lib.c | |
| parent | some basic formatting fixes; (diff) | |
| download | wireguard-openbsd-daecd61139095533ccdd24c7b8fbac1ca439f207.tar.xz wireguard-openbsd-daecd61139095533ccdd24c7b8fbac1ca439f207.zip | |
The correct name for EDH is DHE, likewise EECDH should be ECDHE.
Based on changes to OpenSSL trunk.
ok beck@ miod@
Diffstat (limited to 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index b563071cdad..6b62713bca5 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.77 2014/07/12 19:45:53 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.78 2014/07/12 22:33:39 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1973,7 +1973,7 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) mask_k|=SSL_kRSA; if (dh_tmp) - mask_k|=SSL_kEDH; + mask_k|=SSL_kDHE; if (dh_rsa) mask_k|=SSL_kDHr; @@ -2022,7 +2022,7 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) } if (have_ecdh_tmp) { - mask_k|=SSL_kEECDH; + mask_k|=SSL_kECDHE; } @@ -2108,10 +2108,10 @@ ssl_get_server_send_pkey(const SSL *s) if (alg_k & (SSL_kECDHr|SSL_kECDHe)) { /* - * We don't need to look at SSL_kEECDH + * We don't need to look at SSL_kECDHE * since no certificate is needed for * anon ECDH and for authenticated - * EECDH, the check for the auth + * ECDHE, the check for the auth * algorithm will set i correctly * NOTE: For ECDH-RSA, we need an ECC * not an RSA cert but for EECDH-RSA |