From patchwork Wed Nov 9 11:52:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2842 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id wFlSKrGUa2N+DQAAIUCqbw (envelope-from ) for ; Wed, 09 Nov 2022 06:53:21 -0500 Received: from proxy18.mail.ord1d.rsapps.net ([172.30.191.6]) by director15.mail.ord1d.rsapps.net with LMTP id 0GYDKrGUa2OgZgAAIcMcQg (envelope-from ) for ; Wed, 09 Nov 2022 06:53:21 -0500 Received: from smtp39.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.ord1d.rsapps.net with LMTPS id IEvAKbGUa2PcFgAATCaURg (envelope-from ) for ; Wed, 09 Nov 2022 06:53:21 -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: smtp39.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; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 1b5af228-6025-11ed-bca7-525400a97bbc-1-1 Received: from [216.105.38.7] ([216.105.38.7:42044] helo=lists.sourceforge.net) by smtp39.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 7F/B6-02482-1B49B636; Wed, 09 Nov 2022 06:53:21 -0500 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.95) (envelope-from ) id 1osjdB-00044S-F9; Wed, 09 Nov 2022 11:52:33 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1osjcy-00044G-Hc for openvpn-devel@lists.sourceforge.net; Wed, 09 Nov 2022 11:52:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=iEr6eSGe20VkswP8NYPcKso88EZvbsKHa00bBd0U3Tc=; b=Uq28sWZEExi98vidVcpjRAXx1Y rxF9WtlNA9KH1GZWHCfJGiPAvAaPGaXCXDlANUtwD12UcPZgk77fh5R4iIZ3iyajwQU5P4TlWlgoQ wfhM7e/IWS9oSyQyqXN4H5usxiZX/sBT0T7qGjoHLitvEyNarnkb+sMuhn4qd8NqJ6EI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=iEr6eSGe20VkswP8NYPcKso88EZvbsKHa00bBd0U3Tc=; b=U Jo4lNCWrrVzino4y2N/yB36Q8HyhINoyGv7sXZ9xwQb1YGx8yXrgq1HI13LujROnQr3yLgK2Q0V0j Wj2ee8zE1bmuOlUQetQVUm//DgX8JAbKFXPGJl7SAoOv5K29lYmnMVhqbdh/sQ+X5uk+pAq3TOKRh PfPRsXBMTQ8ecWWc=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1osjct-001olR-OC for openvpn-devel@lists.sourceforge.net; Wed, 09 Nov 2022 11:52:20 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1osjcm-000CyJ-AN for openvpn-devel@lists.sourceforge.net; Wed, 09 Nov 2022 12:52:08 +0100 Received: (nullmailer pid 1248994 invoked by uid 10006); Wed, 09 Nov 2022 11:52:08 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 9 Nov 2022 12:52:08 +0100 Message-Id: <20221109115208.1248948-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Previously this would error out with a M_FATAL message about cipher not known. Align the mbed TLS version to OpenSSL version and also remove unreachable code. This manifested in key_print2 running int [...] Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1osjct-001olR-OC Subject: [Openvpn-devel] [PATCH] Fix md_kt_size in mbed TLS when queried for size of "none" 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Previously this would error out with a M_FATAL message about cipher not known. Align the mbed TLS version to OpenSSL version and also remove unreachable code. This manifested in key_print2 running into this M_FATAL message when used with an AEAD cipher and verb 7. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/crypto_mbedtls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/crypto_mbedtls.c b/src/openvpn/crypto_mbedtls.c index da4ed9809..9087ff6ad 100644 --- a/src/openvpn/crypto_mbedtls.c +++ b/src/openvpn/crypto_mbedtls.c @@ -809,11 +809,11 @@ md_kt_name(const char *mdname) unsigned char md_kt_size(const char *mdname) { - const mbedtls_md_info_t *kt = md_get(mdname); - if (NULL == kt) + if (!strcmp("none", mdname)) { return 0; } + const mbedtls_md_info_t *kt = md_get(mdname); return mbedtls_md_get_size(kt); }