summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-10-15 14:08:26 +0000
committerjsing <jsing@openbsd.org>2014-10-15 14:08:26 +0000
commit814a52879decfd26e5ab4b18680d60001d0b5725 (patch)
treeeeb355df1dd562d5a01740f096f1c3cc2568505b
parentOnly require an EC public key in tls1_set_ec_id(), if we need to provide (diff)
downloadwireguard-openbsd-814a52879decfd26e5ab4b18680d60001d0b5725.tar.xz
wireguard-openbsd-814a52879decfd26e5ab4b18680d60001d0b5725.zip
Set SSL_OP_SINGLE_ECDH_USE before calling SSL_CTX_set_tmp_ecdh() - this
avoids generating an EC key pair that will never be used.
-rw-r--r--lib/libressl/ressl_server.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libressl/ressl_server.c b/lib/libressl/ressl_server.c
index 1d5ee2a3f93..4783674a0b9 100644
--- a/lib/libressl/ressl_server.c
+++ b/lib/libressl/ressl_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ressl_server.c,v 1.10 2014/10/03 14:09:09 jsing Exp $ */
+/* $OpenBSD: ressl_server.c,v 1.11 2014/10/15 14:08:26 jsing Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
*
@@ -70,8 +70,8 @@ ressl_configure_server(struct ressl *ctx)
ressl_set_error(ctx, "failed to set ECDH curve");
goto err;
}
- SSL_CTX_set_tmp_ecdh(ctx->ssl_ctx, ecdh_key);
SSL_CTX_set_options(ctx->ssl_ctx, SSL_OP_SINGLE_ECDH_USE);
+ SSL_CTX_set_tmp_ecdh(ctx->ssl_ctx, ecdh_key);
EC_KEY_free(ecdh_key);
}