diff options
| author |   jsing <jsing@openbsd.org> | 2014-10-03 13:58:17 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-10-03 13:58:17 +0000 |
| commit | 97025b677e168f0f669080544a3c37f4eab9033f (patch) | |
| tree | 4ee95d6f35b81e86c4a4da26131c2ec3955160b2 /lib/libssl/src/ssl/ssl_lib.c | |
| parent | Update ftp ressl configuration to handle recent changes in the library. (diff) | |
| download | wireguard-openbsd-97025b677e168f0f669080544a3c37f4eab9033f.tar.xz wireguard-openbsd-97025b677e168f0f669080544a3c37f4eab9033f.zip | |
Add support for automatic ephemeral EC keys.
This allows an SSL server to enable ECDHE ciphers with a single setting,
which results in an EC key being generated using the first preference
shared curve.
Based on OpenSSL with inspiration from boringssl.
ok miod@
Diffstat (limited to 'lib/libssl/src/ssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_lib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libssl/src/ssl/ssl_lib.c b/lib/libssl/src/ssl/ssl_lib.c index bd5f9f6da14..f6a21d43514 100644 --- a/lib/libssl/src/ssl/ssl_lib.c +++ b/lib/libssl/src/ssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.84 2014/09/07 12:16:23 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.85 2014/10/03 13:58:18 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1943,7 +1943,8 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) rsa_tmp = (c->rsa_tmp != NULL || c->rsa_tmp_cb != NULL); dh_tmp = (c->dh_tmp != NULL || c->dh_tmp_cb != NULL); - have_ecdh_tmp = (c->ecdh_tmp != NULL || c->ecdh_tmp_cb != NULL); + have_ecdh_tmp = (c->ecdh_tmp != NULL || c->ecdh_tmp_cb != NULL || + c->ecdh_tmp_auto != 0); cpk = &(c->pkeys[SSL_PKEY_RSA_ENC]); rsa_enc = (cpk->x509 != NULL && cpk->privatekey != NULL); cpk = &(c->pkeys[SSL_PKEY_RSA_SIGN]); |