summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_cert.c
diff options
context:
space:
mode:
authorjsing <>2014-10-03 13:58:18 +0000
committerjsing <>2014-10-03 13:58:18 +0000
commitf42035acfafef5f2efe92cd8eef619164f7144f2 (patch)
treecffe0badf760bb2604b226bec541734923e423b7 /src/lib/libssl/ssl_cert.c
parent079e384e3438a23d2ddc504f4d34e5a46d9dd6e8 (diff)
downloadopenbsd-f42035acfafef5f2efe92cd8eef619164f7144f2.tar.gz
openbsd-f42035acfafef5f2efe92cd8eef619164f7144f2.tar.bz2
openbsd-f42035acfafef5f2efe92cd8eef619164f7144f2.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 'src/lib/libssl/ssl_cert.c')
-rw-r--r--src/lib/libssl/ssl_cert.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index 6aae59e310..6f1815067b 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_cert.c,v 1.41 2014/07/10 08:25:00 guenther Exp $ */ 1/* $OpenBSD: ssl_cert.c,v 1.42 2014/10/03 13:58:18 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 *
@@ -244,6 +244,7 @@ ssl_cert_dup(CERT *cert)
244 } 244 }
245 } 245 }
246 ret->ecdh_tmp_cb = cert->ecdh_tmp_cb; 246 ret->ecdh_tmp_cb = cert->ecdh_tmp_cb;
247 ret->ecdh_tmp_auto = cert->ecdh_tmp_auto;
247 248
248 for (i = 0; i < SSL_PKEY_NUM; i++) { 249 for (i = 0; i < SSL_PKEY_NUM; i++) {
249 if (cert->pkeys[i].x509 != NULL) { 250 if (cert->pkeys[i].x509 != NULL) {