From patchwork Sat Feb 24 06:04:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 247 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.27.255.57]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id g2NgKrCqkVqyBwAAIUCqbw for ; Sat, 24 Feb 2018 13:10:56 -0500 Received: from proxy1.mail.iad3a.rsapps.net ([172.27.255.57]) by director9.mail.ord1d.rsapps.net (Dovecot) with LMTP id OV5lFrCqkVqMcwAAalYnBA ; Sat, 24 Feb 2018 13:10:56 -0500 Received: from smtp17.gate.iad3a ([172.27.255.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.iad3a.rsapps.net (Dovecot) with LMTP id +kbWIbCqkVosEAAA8TVjwQ ; Sat, 24 Feb 2018 13:10:56 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp17.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=karger-me.20150623.gappssmtp.com; dmarc=none (p=nil; dis=none) header.from=karger.me X-Classification-ID: 0e7b513e-198e-11e8-87fd-525400723ca9-1-1 Received: from [216.105.38.7] ([216.105.38.7:31117] helo=lists.sourceforge.net) by smtp17.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id A9/5F-09384-0BAA19A5; Sat, 24 Feb 2018 13:10:56 -0500 Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1epeGa-000NMJ-UK; Sat, 24 Feb 2018 18:09:48 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1epdFx-000LET-Bw for openvpn-devel@lists.sourceforge.net; Sat, 24 Feb 2018 17:05:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=T8vynDOcQ2BoBK8t3Zs3cCEfVeCdOYzmE7s2dHV4vCA=; b=E8un1sDnrfCQMLqeatlvudttj6 Ci+NRko0CLt+YsDELrIMeE82DqMb6pU5EflvE03ofvePPNkZ7lsbUhIGxgfLLe82v+wyxLf08WFCP 5424yabYnK0bcVSg9zWdjob2yvTDV+3TB1vfXaJ0wxqCJX9mIxEn2abJyPXCbvdcNvF4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=T8vynDOcQ2BoBK8t3Zs3cCEfVeCdOYzmE7s2dHV4vCA=; b=V0nTSSfg8vEWCD8xCDN1ynBsI1 ulhm9S+mDq4TZVZgaNcS/CPC2QcHXFocF4vZwWZl9EvP0MaNL3kBQZQIn1GNVULfsg76bRDYcJLaR t7ThKaF4fjp2zJJa6i591KgS6/LqUra2YJvAda+/0qIz3w0cGCg3VUCAp7/MCKq5hT2Q=; Received: from sfi-lb-mx.v20.lw.sourceforge.com ([172.30.20.201] helo=mail-wm0-f68.google.com) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89) id 1epdFr-000Hvm-CH for openvpn-devel@lists.sourceforge.net; Sat, 24 Feb 2018 17:05:04 +0000 Received: by mail-wm0-f68.google.com with SMTP id w128so4136695wmw.0 for ; Sat, 24 Feb 2018 09:05:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karger-me.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=T8vynDOcQ2BoBK8t3Zs3cCEfVeCdOYzmE7s2dHV4vCA=; b=GaxmgH5ClXr74nRtbkvhj1tnyj++rg6hknpa4dzLqF/vf54d9+ohGGLBdLVHivPNQJ GdGzfTKXEqno9zA40mSlS1HtfehCemKLEfSfJ+0uBPtdAVONHCmABMQV3pxi5nITElrf nogZsp9OGmwCUjKJVW6qeQADvNcwfhFfTu1QLm2KvWX5uSQNXQAaiSQrob3SHABi5siM BtqRevVw3kySq5FqIkSowj/VADJmvZg26dj+nt0Zr4bMlFMfbxE+gnw8jcPmOly9WDQn /ghC7UFMFA8JXVj7rDBfdX/E4Mi3ne48vFzBEzfRzujKeV3IftitvdwwxBo+L1e2eqtQ HHKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=T8vynDOcQ2BoBK8t3Zs3cCEfVeCdOYzmE7s2dHV4vCA=; b=Y1OrKXCUQp5JdkjoJDH8vo7D4ABW/+gHacPlWZd0H1g5ryvr124Lg2XSn4GJQDH1T5 Dv/RpcnDn/qvqq6fSOz1D3gMaexWTimVdudVhaehnbgSLtIhd/i4eED+YYti5k7svzXn bDqWc0+RjuGfKd2rFN6WsytTDnqWVVYdqVTx68ENZIo1juo23C7SxPHIR4qbEZCcW6N6 8cDZPguBEY7Is02nBHaULT+BTYHVvujx6e70vRzVqoRh8hQIq6nE4IcqgtxPPug2M0lt nBY2XS46Gvtndv09Z00okzJLysH7JoSZ9SFLPcdf+z2yKROWMwg7sKQDXZSC7+W3ei5g ExYQ== X-Gm-Message-State: APf1xPCcY0H0IE3pQcnYRMn3Tx5t5HTMdyBqH7yVdfr9TXqcWRqUm40p wojOdPA3gRvb1b1H53Tqdnvm7/MXahI= X-Google-Smtp-Source: AH8x224imdB72pLWVMdLV1FmCshos0SQ8Tllxi/kp9dQfqFvcW8QgH12V/wcNg+tn139+YxMz4k7oA== X-Received: by 10.80.245.245 with SMTP id x50mr7413461edm.310.1519491894006; Sat, 24 Feb 2018 09:04:54 -0800 (PST) Received: from vesta.fritz.box ([2001:985:e54:1:21a1:1c64:a83c:2542]) by smtp.gmail.com with ESMTPSA id 43sm3064401edt.42.2018.02.24.09.04.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Feb 2018 09:04:53 -0800 (PST) From: Steffan Karger To: openvpn-devel@lists.sourceforge.net Date: Sat, 24 Feb 2018 18:04:49 +0100 Message-Id: <20180224170449.25194-1-steffan@karger.me> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: karger.me] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-Headers-End: 1epdFr-000Hvm-CH Subject: [Openvpn-devel] [PATCH] Warn if tls-version-max < tls-version-min X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox This adds warnings for when a user or our code tries to set a maximum TLS version that's smaller then the current configured minimum TLS version. (And fixes some related whitespace now I touch it anyway.) Signed-off-by: Steffan Karger --- src/openvpn/cryptoapi.c | 12 +++++++++--- src/openvpn/openssl_compat.h | 22 ++++++++++++++++++---- src/openvpn/options.c | 12 ++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/src/openvpn/cryptoapi.c b/src/openvpn/cryptoapi.c index 1097286c..28f217f4 100644 --- a/src/openvpn/cryptoapi.c +++ b/src/openvpn/cryptoapi.c @@ -610,12 +610,18 @@ SSL_CTX_use_CryptoAPI_certificate(SSL_CTX *ssl_ctx, const char *cert_prop) if ((!max_version || max_version > TLS1_1_VERSION) && cd->key_spec != CERT_NCRYPT_KEY_SPEC) { - msg(M_WARN,"WARNING: cryptoapicert: private key is in a legacy store." + msg(M_WARN, "WARNING: cryptoapicert: private key is in a legacy store." " Restricting TLS version to 1.1"); + if (SSL_CTX_get_min_proto_version(ssl_ctx) > TLS1_1_VERSION) + { + msg(M_NONFATAL, + "ERROR: cryptoapicert: min TLS version larger than 1.1." + " Try config option --tls-version-min 1.1"); + goto err; + } if (!SSL_CTX_set_max_proto_version(ssl_ctx, TLS1_1_VERSION)) { - msg(M_NONFATAL,"ERROR: cryptoapicert: unable to set max TLS version" - " to 1.1. Try config option --tls-version-min 1.1"); + msg(M_NONFATAL, "ERROR: cryptoapicert: set max TLS version failed"); goto err; } } diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h index 8ef86649..d375fabd 100644 --- a/src/openvpn/openssl_compat.h +++ b/src/openvpn/openssl_compat.h @@ -662,10 +662,24 @@ EC_GROUP_order_bits(const EC_GROUP *group) #endif #ifndef SSL_CTX_get_min_proto_version -/** Dummy SSL_CTX_get_min_proto_version for OpenSSL < 1.1 (not really needed) */ +/** Return the min SSL protocol version currently enabled in the context. + * If no valid version >= TLS1.0 is found, return 0. */ static inline int SSL_CTX_get_min_proto_version(SSL_CTX *ctx) { + long sslopt = SSL_CTX_get_options(ctx); + if (!(sslopt & SSL_OP_NO_TLSv1)) + { + return TLS1_VERSION; + } + if (!(sslopt & SSL_OP_NO_TLSv1_1)) + { + return TLS1_1_VERSION; + } + if (!(sslopt & SSL_OP_NO_TLSv1_2)) + { + return TLS1_2_VERSION; + } return 0; } #endif /* SSL_CTX_get_min_proto_version */ @@ -679,15 +693,15 @@ SSL_CTX_get_max_proto_version(SSL_CTX *ctx) long sslopt = SSL_CTX_get_options(ctx); if (!(sslopt & SSL_OP_NO_TLSv1_2)) { - return TLS1_2_VERSION; + return TLS1_2_VERSION; } if (!(sslopt & SSL_OP_NO_TLSv1_1)) { - return TLS1_1_VERSION; + return TLS1_1_VERSION; } if (!(sslopt & SSL_OP_NO_TLSv1)) { - return TLS1_VERSION; + return TLS1_VERSION; } return 0; } diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 95fb4de3..41a42cf2 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2522,6 +2522,18 @@ options_postprocess_verify_ce(const struct options *options, const struct connec "in the configuration file, which is the recommended approach."); } + const int tls_version_max = + (options->ssl_flags >> SSLF_TLS_VERSION_MAX_SHIFT) + & SSLF_TLS_VERSION_MAX_MASK; + const int tls_version_min = + (options->ssl_flags >> SSLF_TLS_VERSION_MIN_SHIFT) + & SSLF_TLS_VERSION_MIN_MASK; + + if (tls_version_max > 0 && tls_version_max < tls_version_min) + { + msg(M_USAGE, "--tls-version-min bigger than --tls-version-max"); + } + if (options->tls_server || options->tls_client) { #ifdef ENABLE_PKCS11