From patchwork Mon Sep 7 06:22:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1417 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.27.255.50]) by backend30.mail.ord1d.rsapps.net with LMTP id uGifF3leVl+QagAAIUCqbw (envelope-from ) for ; Mon, 07 Sep 2020 12:23:21 -0400 Received: from proxy3.mail.iad3a.rsapps.net ([172.27.255.50]) by director10.mail.ord1d.rsapps.net with LMTP id uMplF3leVl8wDAAApN4f7A (envelope-from ) for ; Mon, 07 Sep 2020 12:23:21 -0400 Received: from smtp37.gate.iad3a ([172.27.255.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.iad3a.rsapps.net with LMTPS id wKx4EHleVl+1IgAAYaqY3Q (envelope-from ) for ; Mon, 07 Sep 2020 12:23:21 -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: smtp37.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; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 71326b7e-f126-11ea-ad2d-525400dc5f6a-1-1 Received: from [216.105.38.7] ([216.105.38.7:48930] helo=lists.sourceforge.net) by smtp37.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 9D/7F-14040-87E565F5; Mon, 07 Sep 2020 12:23:20 -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 1kFJud-0000Y9-H0; Mon, 07 Sep 2020 16:22:35 +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 1kFJub-0000Xy-Hi for openvpn-devel@lists.sourceforge.net; Mon, 07 Sep 2020 16:22:33 +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=958mO5fhZflXi5nn3JH5xK07MahKLGaaBLShSWOfGQI=; b=aSfTejmPElRiKLqiGPzJpZeOU7 u2KLGCCk4jitzwB4NFlvPJkrDRq/eVoLrX1P4odhKwPHvq8nANEAsTOg+xJiSC7r73+jzNMqbItYV 6DbsSfo0TO/fnOaoob+ktFALXtxSB+8cQbGhNFHPbEY3RNF1ddO7Kta5iQHvEVedVsk4=; 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=958mO5fhZflXi5nn3JH5xK07MahKLGaaBLShSWOfGQI=; b=mtdYKdx7TFd/OItP4hlZZGSOEo Mk2KkNpW1Raxxv+sruBBJhv2zoFRRz8vRzsS7Iw6DsKun5TarfZ/12wyu4gOa0aGNtNCnpSj0l+DJ ZN938bVt/XJu1KAmaXLbED/ta1dWXS04P+GtentgnqQen5Po3jL882Q6PSAh7fOXQ3Us=; 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.92.2) id 1kFJuW-00Fxg8-KI for openvpn-devel@lists.sourceforge.net; Mon, 07 Sep 2020 16:22:33 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1kFJuP-000NbC-Ec for openvpn-devel@lists.sourceforge.net; Mon, 07 Sep 2020 18:22:21 +0200 Received: (nullmailer pid 20978 invoked by uid 10006); Mon, 07 Sep 2020 16:22:21 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Mon, 7 Sep 2020 18:22:20 +0200 Message-Id: <20200907162221.20928-2-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200907162221.20928-1-arne@rfc2549.org> References: <20200825073643.15920-2-arne@rfc2549.org> <20200907162221.20928-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.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1kFJuW-00Fxg8-KI Subject: [Openvpn-devel] [PATCH 4/5] Check return values in md_ctx_init and hmac_ctx_init 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 Without this OpenVPN will later segfault on a FIPS enabled system due to the algorithm available but not allowed. Signed-off-by: Arne Schwabe --- src/openvpn/crypto_openssl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index c60d4a54..75557cca 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -954,7 +954,10 @@ md_ctx_init(EVP_MD_CTX *ctx, const EVP_MD *kt) ASSERT(NULL != ctx && NULL != kt); EVP_MD_CTX_init(ctx); - EVP_DigestInit(ctx, kt); + if (EVP_DigestInit(ctx, kt) != 1) + { + crypto_msg(M_FATAL, "EVP_DigestInit failed"); + } } void @@ -1011,7 +1014,10 @@ hmac_ctx_init(HMAC_CTX *ctx, const uint8_t *key, int key_len, ASSERT(NULL != kt && NULL != ctx); HMAC_CTX_reset(ctx); - HMAC_Init_ex(ctx, key, key_len, kt, NULL); + if (HMAC_Init_ex(ctx, key, key_len, kt, NULL) != 1) + { + crypto_msg(M_FATAL, "HMAC_Init_ex failed"); + } /* make sure we used a big enough key */ ASSERT(HMAC_size(ctx) <= key_len);