From patchwork Fri Oct 5 22:06:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 493 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id OAFcC0ptuFu7VAAAIUCqbw for ; Sat, 06 Oct 2018 04:07:38 -0400 Received: from director9.mail.ord1c.rsapps.net ([172.28.255.1]) by director12.mail.ord1d.rsapps.net with LMTP id 2OFOC0ptuFu7KQAAIasKDg ; Sat, 06 Oct 2018 04:07:38 -0400 Received: from smtp1.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director9.mail.ord1c.rsapps.net with LMTP id yB7rCkptuFsLYgAA4V03VA ; Sat, 06 Oct 2018 04:07:38 -0400 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: smtp1.gate.ord1c.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; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: e2962b0a-c93e-11e8-8326-842b2b47c027-1-1 Received: from [216.105.38.7] ([216.105.38.7:50156] helo=lists.sourceforge.net) by smtp1.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 60/1F-20741-84D68BB5; Sat, 06 Oct 2018 04:07:36 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1g8hbc-0006l4-9L; Sat, 06 Oct 2018 08:06:32 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1g8hbb-0006kY-BG for openvpn-devel@lists.sourceforge.NET; Sat, 06 Oct 2018 08:06:31 +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:To: From:Sender:Reply-To:Cc: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=Z6JE1OCosFCAlNlGBivMSMYKb7dvNlOOMA8ZLywyJ54=; b=nHfGi8qruSD1tR2+8Q/iHxy117 lUNxLRrZLosfEbrmpMgoZ0UIa5l7aHnBY5hGtF3LuHiKweFYharxhP9i5X8E1Ad9IESlkxeS/Aag6 ujJLJqNKwMfqPb/xccO9rwuFYA41KMTvo9F+1/VzC5rGQoqeVWLSvtbtYF030RugVzjI=; 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:To:From:Sender:Reply-To:Cc :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=Z6JE1OCosFCAlNlGBivMSMYKb7dvNlOOMA8ZLywyJ54=; b=QhHGdkCJw0hUAgfgxeilP4l/5/ /ZDfmKvpy4DauNSciauyu83PWsZcyQNZQbANI72jqXen8pRJdqH9rlig4Crc5nM0nlxpD4f9Rr7o7 FY2mkvw274Hkgvci+YhVThSibvX4Cb9u5w7llYBKgc/99NFEm9cHtpSdXBZyRYXDA1Js=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1g8hbU-00DDEX-S8 for openvpn-devel@lists.sourceforge.NET; Sat, 06 Oct 2018 08:06:31 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.91 (FreeBSD)) (envelope-from ) id 1g8hbO-000MTo-7H for openvpn-devel@lists.sourceforge.net; Sat, 06 Oct 2018 10:06:18 +0200 Received: (nullmailer pid 18186 invoked by uid 10006); Sat, 06 Oct 2018 08:06:18 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Sat, 6 Oct 2018 10:06:17 +0200 Message-Id: <20181006080617.18136-3-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181006080617.18136-1-arne@rfc2549.org> References: <20181006080617.18136-1-arne@rfc2549.org> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1g8hbU-00DDEX-S8 Subject: [Openvpn-devel] [PATCH 3/3] Add better support for showing TLS 1.3 ciphersuites in --show-tls 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 show-tls shows mixed TLS 1.3 and TLS 1.2 ciphers. The ciphersuites are only valid in tls-cipher or tls-ciphersuites. So this confusing and not really helpful. This patch modifies show-tls to show separate lists for TLS 1.2 and TLS 1.3. --- src/openvpn/init.c | 1 + src/openvpn/ssl_backend.h | 1 + src/openvpn/ssl_mbedtls.c | 2 + src/openvpn/ssl_openssl.c | 79 ++++++++++++++++++++++++++++++--------- 4 files changed, 65 insertions(+), 18 deletions(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index b2ab2a60..ff863cf8 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -1040,6 +1040,7 @@ print_openssl_info(const struct options *options) if (options->show_tls_ciphers) { show_available_tls_ciphers(options->cipher_list, + options->cipher_list_tls13, options->tls_cert_profile); } if (options->show_curves) diff --git a/src/openvpn/ssl_backend.h b/src/openvpn/ssl_backend.h index 0995bb4c..42934230 100644 --- a/src/openvpn/ssl_backend.h +++ b/src/openvpn/ssl_backend.h @@ -525,6 +525,7 @@ void print_details(struct key_state_ssl *ks_ssl, const char *prefix); */ void show_available_tls_ciphers(const char *cipher_list, + const char *cipher_list_tls13, const char *tls_cert_profile); /* diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index f23cd30a..2c6e54b3 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -1341,8 +1341,10 @@ print_details(struct key_state_ssl *ks_ssl, const char *prefix) void show_available_tls_ciphers(const char *cipher_list, + const char *cipher_list_tls13, const char *tls_cert_profile) { + (void) cipher_list_tls13; // Avoid unused warning struct tls_root_ctx tls_ctx; const int *ciphers = mbedtls_ssl_list_ciphersuites(); diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index e3f02d05..044070fe 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -60,6 +60,7 @@ #include #include #include +#include #ifndef OPENSSL_NO_EC #include #endif @@ -1978,15 +1979,12 @@ print_details(struct key_state_ssl *ks_ssl, const char *prefix) msg(D_HANDSHAKE, "%s%s", s1, s2); } -void -show_available_tls_ciphers(const char *cipher_list, - const char *tls_cert_profile) +static void +show_available_tls_ciphers_list(const char *cipher_list, + const char *tls_cert_profile, + const bool tls13) { struct tls_root_ctx tls_ctx; - SSL *ssl; - const char *cipher_name; - const tls_cipher_name_pair *pair; - int priority = 0; tls_ctx.ctx = SSL_CTX_new(SSLv23_method()); if (!tls_ctx.ctx) @@ -1994,22 +1992,44 @@ show_available_tls_ciphers(const char *cipher_list, crypto_msg(M_FATAL, "Cannot create SSL_CTX object"); } - ssl = SSL_new(tls_ctx.ctx); - if (!ssl) +#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL) + if (tls13) { - crypto_msg(M_FATAL, "Cannot create SSL object"); + SSL_CTX_set_min_proto_version(tls_ctx.ctx, TLS1_3_VERSION); + } + else +#endif + { + SSL_CTX_set_max_proto_version(tls_ctx.ctx, TLS1_2_VERSION); } tls_ctx_set_cert_profile(&tls_ctx, tls_cert_profile); tls_ctx_restrict_ciphers(&tls_ctx, cipher_list); - printf("Available TLS Ciphers,\n"); - printf("listed in order of preference:\n\n"); - while ((cipher_name = SSL_get_cipher_list(ssl, priority++))) + SSL *ssl = SSL_new(tls_ctx.ctx); + if (!ssl) { - pair = tls_get_cipher_name_pair(cipher_name, strlen(cipher_name)); + crypto_msg(M_FATAL, "Cannot create SSL object"); + } + +#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) + STACK_OF(SSL_CIPHER)* sk = SSL_get_ciphers(ssl); +#else + STACK_OF(SSL_CIPHER)* sk = SSL_get1_supported_ciphers(ssl); +#endif + for (int i=0;i < sk_SSL_CIPHER_num(sk);i++) + { + const SSL_CIPHER* c = sk_SSL_CIPHER_value(sk, i); + + const char* cipher_name = SSL_CIPHER_get_name(c); + + const tls_cipher_name_pair *pair = tls_get_cipher_name_pair(cipher_name, strlen(cipher_name)); - if (NULL == pair) + if (tls13) + { + printf("%s\n", cipher_name); + } + else if (NULL == pair) { /* No translation found, print warning */ printf("%s (No IANA name known to OpenVPN, use OpenSSL name.)\n", cipher_name); @@ -2018,14 +2038,37 @@ show_available_tls_ciphers(const char *cipher_list, { printf("%s\n", pair->iana_name); } - } - printf("\n" SHOW_TLS_CIPHER_LIST_WARNING); - +#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) + sk_SSL_CIPHER_free(sk); +#endif SSL_free(ssl); SSL_CTX_free(tls_ctx.ctx); } + + +void +show_available_tls_ciphers(const char *cipher_list, + const char *cipher_list_tls13, + const char *tls_cert_profile) +{ + printf("Available TLS Ciphers,\n"); + printf("listed in order of preference:\n"); + +#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL) + printf("\nFor TLS 1.3 and newer (--tls-ciphersuite):\n\n"); + show_available_tls_ciphers_list(cipher_list_tls13, tls_cert_profile, true); +#else + (void) cipher_list_tls13; /* Avoid unused warning */ +#endif + + printf("\nFor TLS 1.2 and older (--tls-cipher):\n\n"); + show_available_tls_ciphers_list(cipher_list, tls_cert_profile, false); + + printf("\n" SHOW_TLS_CIPHER_LIST_WARNING); +} + /* * Show the Elliptic curves that are available for us to use * in the OpenSSL library.