upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-04-05 09:05:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Add option to disable Diffie Hellman key exchange by setting '--dh none'

Browse source 
As requested on the mailing list and in trac ticket #410, add an option to
disable 'traditional' Diffie Hellman key exchange. People want to be able
to create ecdh-only configurations.

This patch also disables RSA key exchange by default for OpenSSL builds, to
prevent that people who set "--dh none" but have an OpenSSL version that
doesn't support ECDH end up with a less secure connection. Note that users
that specify their own --tls-cipher override these defaults and thus can
still use whatever OpenSSL supports (and might thus end up with less secure
connections).

PolarSSL does not allow to easily disable RSA key exchange during runtime,
but its default compile options do not include RSA key exchange based
cipher suites.

Finally update the manpage to reflect the new behaviour, and while touching
it change the text to motivate users towards a more secure configuration.

v2 - disable RSA key exchange by default

Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <1420141569-11773-1-git-send-email-steffan@karger.me>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9376
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Steffan Karger 2015-01-01 20:46:09 +01:00 committed by Gert Doering
parent 98ea2ec5d8
commit bd9aa06feb
4 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
doc/openvpn.8
View file

@ -4239,13 +4239,18 @@ Not available with PolarSSL.
File containing Diffie Hellman parameters
in .pem format (required for
.B \-\-tls-server
only). Use
only).
.B openssl dhparam -out dh1024.pem 1024
Set
.B file=none
to disable Diffie Hellman key exchange (and use ECDH only). Note that this
requires peers to be using an SSL library that supports ECDH TLS cipher suites
(e.g. OpenSSL 1.0.1+, or PolarSSL 1.3+).
to generate your own, or use the existing dh1024.pem file
included with the OpenVPN distribution. Diffie Hellman parameters
may be considered public.
Use
.B openssl dhparam -out dh2048.pem 2048
to generate 2048-bit DH parameters. Diffie Hellman parameters may be considered
public.
.\"*********************************************************
.TP
.B \-\-ecdh-curve name

14
src/openvpn/options.c
View file

@ -2134,10 +2134,6 @@ options_postprocess_verify_ce (const struct options *options, const struct conne
(options->shared_secret_file != NULL) > 1)
msg (M_USAGE, "specify only one of --tls-server, --tls-client, or --secret");
if (options->tls_server)
{
notnull (options->dh_file, "DH file (--dh)");
}
if (options->tls_server || options->tls_client)
{
#ifdef ENABLE_PKCS11
@ -2497,6 +2493,16 @@ options_postprocess_mutate (struct options *o)
for (i = 0; i < o->connection_list->len; ++i)
options_postprocess_mutate_ce (o, o->connection_list->array[i]);
#ifdef ENABLE_CRYPTO
if (o->tls_server)
{
/* Check that DH file is specified, or explicitly disabled */
notnull (o->dh_file, "DH file (--dh)");
if (streq (o->dh_file, "none"))
o->dh_file = NULL;
}
#endif
#if ENABLE_MANAGEMENT
if (o->http_proxy_override)
options_postprocess_http_proxy_override(o);

6
src/openvpn/ssl.c
View file

@ -242,6 +242,7 @@ static const tls_cipher_name_pair tls_cipher_name_translation_table[] = {
{"EDH", "EDH"},
{"EXP", "EXP"},
{"RSA", "RSA"},
{"kRSA", "kRSA"},
{"SRP", "SRP"},
#endif
{NULL, NULL}
@ -483,7 +484,10 @@ init_ssl (const struct options *options, struct tls_root_ctx *new_ctx)
if (options->tls_server)
{
tls_ctx_server_new(new_ctx);
tls_ctx_load_dh_params(new_ctx, options->dh_file, options->dh_file_inline);
if (options->dh_file)
tls_ctx_load_dh_params(new_ctx, options->dh_file,
options->dh_file_inline);
}
else /* if client */
{

2
src/openvpn/ssl_openssl.c
View file

@ -234,7 +234,7 @@ tls_ctx_restrict_ciphers(struct tls_root_ctx *ctx, const char *ciphers)
if (ciphers == NULL)
{
/* Use sane default (disable export, and unsupported cipher modes) */
if(!SSL_CTX_set_cipher_list(ctx->ctx, "DEFAULT:!EXP:!PSK:!SRP"))
if(!SSL_CTX_set_cipher_list(ctx->ctx, "DEFAULT:!EXP:!PSK:!SRP:!kRSA"))
crypto_msg (M_FATAL, "Failed to set default TLS cipher list.");
return;
}