From patchwork Sun Oct 7 11:30:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 503 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id oPBHIlyJuluLGgAAIUCqbw for ; Sun, 07 Oct 2018 18:31:56 -0400 Received: from proxy8.mail.ord1d.rsapps.net ([172.30.191.6]) by director9.mail.ord1d.rsapps.net with LMTP id gBUgIlyJulsdRgAAalYnBA ; Sun, 07 Oct 2018 18:31:56 -0400 Received: from smtp20.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.ord1d.rsapps.net with LMTP id eIvVIVyJulsXfwAAGdz6CA ; Sun, 07 Oct 2018 18:31:56 -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: smtp20.gate.ord1d.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-Suspicious-Flag: YES X-Classification-ID: cb9206f2-ca80-11e8-966c-525400b8bfda-1-1 Received: from [216.105.38.7] ([216.105.38.7:20189] helo=lists.sourceforge.net) by smtp20.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 69/80-07746-B598ABB5; Sun, 07 Oct 2018 18:31:56 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1g9HZe-0003ir-UE; Sun, 07 Oct 2018 22:30:54 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1g9HZe-0003il-Dt for openvpn-devel@lists.sourceforge.net; Sun, 07 Oct 2018 22:30:54 +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=WiUfcpeHx8cVY61FfBEAC3tyOIAKsZD+risVgQP8YlY=; b=Zpj6LyJbm1IXMJQNlMNIj7jYRq QIaX0RxldpM7tEoM+MtLicdcfZIp3kHhSuSdj/rjqyZKVLixBqt7suSCKOMV+hAWW2WBcYiqM7aq7 QFOimza0oHrmI0KapXeUpyD26LvG8MqbgJXo2cdUVkBhz6MV9XYRfCFHq9AssYHNHu9U=; 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=WiUfcpeHx8cVY61FfBEAC3tyOIAKsZD+risVgQP8YlY=; b=JyfWAaTUiyOKrgrAfa+H/qldh6 L0Qi9mrHc2mrJd8p1PXQ0N8UCcJ+G+GQIeU7Cy6LfpKszuC+L+2aGApvrqURdgz7OEGnQrTtJsKGk iI/F+MA+pgxY4PJeHLrjs1aiawveSUWMhNVEV6+fYjRQjV5AZwRTaJz6i02s3WDCPNnM=; Received: from mail-ed1-f44.google.com ([209.85.208.44]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1g9HZa-00E58c-LV for openvpn-devel@lists.sourceforge.net; Sun, 07 Oct 2018 22:30:54 +0000 Received: by mail-ed1-f44.google.com with SMTP id y19-v6so15991115edd.2 for ; Sun, 07 Oct 2018 15:30:50 -0700 (PDT) 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=WiUfcpeHx8cVY61FfBEAC3tyOIAKsZD+risVgQP8YlY=; b=hEQ9UoG20QRbruxU8jgekvhM+c9XT1Io90nGU8vcpYRsOUCPBoDrPPRzN1SWesMlDf 3j67+//odLy2cUzxl66whtllr7gJHdR2P5GNcDP3wB05EwvUzQwqYPIlFuFIZjhBDyCj iSY1nIao1YofEGqqbWXUK1t1RuMoFCxow4lgwmjrpzus6WpSpESFcJGNR13llFsr9KJb GtkmLRtdbRXy7rJMujyJNqgdvUxcUnRuda1FBH0EU2wv5ukADL5RJ6nYxULzBf9MfnFo A5y2XE03MiTrTgIphEZZcASrvP86SmsHqKOGDoS5xFcjYT8qIJMb44C3Omph41b0g2B3 CFIA== 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=WiUfcpeHx8cVY61FfBEAC3tyOIAKsZD+risVgQP8YlY=; b=NUzMXvM33INdRIZBmY59FDj9xW5uAZrVozs6NQ1UPAteRWl9qy52geCb9NpfySj0nH EmNcxTNsL9/WxRmq+cTsPLQOR6b8wKf8uB9bkqe9Xm/1MBBM0HVQCa23km2W97lJAzxR oU34uSoWQjcDlVXQjFK67fuPD9+UzP7ooWHM0mtZaUVqrfHJ/OQ/1Ohs3g7SsZPqJdZs +ZVtHzsZcRb81atJO/dF8tUht6yLBh9/7SOLuzoWbCD6UQJt1ZmSGDbb33FIFY8xmONs uVxzY7n2XFNUegzvlm5kGPyl178CbcUKn6IbC/0e/g5PHO1WEicttcbsFY80O5/bApxB 7k8w== X-Gm-Message-State: ABuFfojCp3hG0VPfYP1e2UdD35pGU3c6JfUmqJj1PaKT+670FZmqV6gV g2T0LDmayzivb4cdDWBiI9MrP7m8WMJpPw== X-Google-Smtp-Source: ACcGV62JP2mv5YXN8VAUis2j50qfkfaeT4d5fHfWQUIHDVWiMS+82w+zlcpe1CFJMROB1mvPAp6gwg== X-Received: by 2002:a05:6402:2c9:: with SMTP id b9mr26518586edx.149.1538951443729; Sun, 07 Oct 2018 15:30:43 -0700 (PDT) Received: from vesta.fritz.box ([2001:985:e54:1:f574:9f7d:c43:8bcf]) by smtp.gmail.com with ESMTPSA id p3-v6sm3716410eda.88.2018.10.07.15.30.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Oct 2018 15:30:43 -0700 (PDT) From: Steffan Karger To: openvpn-devel@lists.sourceforge.net Date: Mon, 8 Oct 2018 00:30:35 +0200 Message-Id: <20181007223035.21179-2-steffan@karger.me> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181007223035.21179-1-steffan@karger.me> References: <20181007223035.21179-1-steffan@karger.me> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.208.44 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.44 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1g9HZa-00E58c-LV Subject: [Openvpn-devel] [PATCH v2 2/2] List ChaCha20-Poly1305 as stream cipher 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 As Antonio pointed out, "8-bit block cipher" is a bit funny. So teach print_cipher() to print such cipher as "stream cipher". Because I didn't want to write the same code twice, I decided to merge the two print_cipher() implementations into one shared function. That should make it easier to keep both backends consistent. Signed-off-by: Steffan Karger --- v2: introduce this patch src/openvpn/crypto.c | 27 +++++++++++++++++++++++++++ src/openvpn/crypto.h | 3 +++ src/openvpn/crypto_mbedtls.c | 23 ++--------------------- src/openvpn/crypto_mbedtls.h | 4 ++++ src/openvpn/crypto_openssl.c | 15 --------------- src/openvpn/crypto_openssl.h | 4 ++++ 6 files changed, 40 insertions(+), 36 deletions(-) diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c index 6d34acd7..e81399b7 100644 --- a/src/openvpn/crypto.c +++ b/src/openvpn/crypto.c @@ -1769,6 +1769,33 @@ get_random(void) return l; } +void +print_cipher(const cipher_kt_t *cipher) +{ + const char *var_key_size = cipher_kt_var_key_size(cipher) ? + " by default" : ""; + + printf("%s (%d bit key%s, ", + translate_cipher_name_to_openvpn(cipher_kt_name(cipher)), + cipher_kt_key_size(cipher) * 8, var_key_size); + + if (cipher_kt_block_size(cipher) == 1) + { + printf("stream cipher"); + } + else + { + printf("%d bit block", cipher_kt_block_size(cipher) * 8); + } + + if (!cipher_kt_mode_cbc(cipher)) + { + printf(", TLS client/server mode only"); + } + + printf(")\n"); +} + static const cipher_name_pair * get_cipher_name_pair(const char *cipher_name) { diff --git a/src/openvpn/crypto.h b/src/openvpn/crypto.h index f4b3dca3..cf87cb49 100644 --- a/src/openvpn/crypto.h +++ b/src/openvpn/crypto.h @@ -465,6 +465,9 @@ void prng_uninit(void); /* an analogue to the random() function, but use prng_bytes */ long int get_random(void); +/** Print a cipher list entry */ +void print_cipher(const cipher_kt_t *cipher); + void test_crypto(struct crypto_options *co, struct frame *f); diff --git a/src/openvpn/crypto_mbedtls.c b/src/openvpn/crypto_mbedtls.c index 0c39eccc..54ac1893 100644 --- a/src/openvpn/crypto_mbedtls.c +++ b/src/openvpn/crypto_mbedtls.c @@ -140,26 +140,6 @@ const cipher_name_pair cipher_name_translation_table[] = { const size_t cipher_name_translation_table_count = sizeof(cipher_name_translation_table) / sizeof(*cipher_name_translation_table); -static void -print_cipher(const cipher_kt_t *info) -{ - if (info && (cipher_kt_mode_cbc(info) -#ifdef HAVE_AEAD_CIPHER_MODES - || cipher_kt_mode_aead(info) -#endif - )) - { - const char *ssl_only = cipher_kt_mode_cbc(info) ? - "" : ", TLS client/server mode only"; - const char *var_key_size = info->flags & MBEDTLS_CIPHER_VARIABLE_KEY_LEN ? - " by default" : ""; - - printf("%s (%d bit key%s, %d bit block%s)\n", - cipher_kt_name(info), cipher_kt_key_size(info) * 8, var_key_size, - cipher_kt_block_size(info) * 8, ssl_only); - } -} - void show_available_ciphers(void) { @@ -175,7 +155,8 @@ show_available_ciphers(void) while (*ciphers != 0) { const cipher_kt_t *info = mbedtls_cipher_info_from_type(*ciphers); - if (info && !cipher_kt_insecure(info)) + if (info && !cipher_kt_insecure(info) + && (cipher_kt_mode_aead(info) || cipher_kt_mode_cbc(info))) { print_cipher(info); } diff --git a/src/openvpn/crypto_mbedtls.h b/src/openvpn/crypto_mbedtls.h index 452b06ed..81b542bc 100644 --- a/src/openvpn/crypto_mbedtls.h +++ b/src/openvpn/crypto_mbedtls.h @@ -146,5 +146,9 @@ mbed_log_func_line_lite(unsigned int flags, int errval, #define mbed_ok(errval) \ mbed_log_func_line_lite(D_CRYPT_ERRORS, errval, __func__, __LINE__) +static inline bool cipher_kt_var_key_size(const cipher_kt_t *cipher) +{ + return cipher->flags & MBEDTLS_CIPHER_VARIABLE_KEY_LEN; +} #endif /* CRYPTO_MBEDTLS_H_ */ diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index 1c0fae86..7989127b 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -265,21 +265,6 @@ cipher_name_cmp(const void *a, const void *b) return strcmp(cipher_name_a, cipher_name_b); } -static void -print_cipher(const EVP_CIPHER *cipher) -{ - const char *var_key_size = - (EVP_CIPHER_flags(cipher) & EVP_CIPH_VARIABLE_LENGTH) ? - " by default" : ""; - const char *ssl_only = cipher_kt_mode_cbc(cipher) ? - "" : ", TLS client/server mode only"; - - printf("%s (%d bit key%s, %d bit block%s)\n", - translate_cipher_name_to_openvpn(EVP_CIPHER_name(cipher)), - EVP_CIPHER_key_length(cipher) * 8, var_key_size, - cipher_kt_block_size(cipher) * 8, ssl_only); -} - void show_available_ciphers(void) { diff --git a/src/openvpn/crypto_openssl.h b/src/openvpn/crypto_openssl.h index 0a413705..1ea3e858 100644 --- a/src/openvpn/crypto_openssl.h +++ b/src/openvpn/crypto_openssl.h @@ -101,5 +101,9 @@ void crypto_print_openssl_errors(const unsigned int flags); msg((flags), __VA_ARGS__); \ } while (false) +static inline bool cipher_kt_var_key_size(const cipher_kt_t *cipher) +{ + return EVP_CIPHER_flags(cipher) & EVP_CIPH_VARIABLE_LENGTH; +} #endif /* CRYPTO_OPENSSL_H_ */