From patchwork Fri Oct 9 21:14:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 1513 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id iGSyKaltgV83UQAAIUCqbw (envelope-from ) for ; Sat, 10 Oct 2020 04:15:37 -0400 Received: from proxy12.mail.iad3b.rsapps.net ([172.31.255.6]) by director9.mail.ord1d.rsapps.net with LMTP id 4DipKaltgV/ldQAAalYnBA (envelope-from ) for ; Sat, 10 Oct 2020 04:15:37 -0400 Received: from smtp36.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy12.mail.iad3b.rsapps.net with LMTPS id 8MNvIqltgV+jNgAAEsW3lA (envelope-from ) for ; Sat, 10 Oct 2020 04:15:37 -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: smtp36.gate.iad3b.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=greenie.muc.de X-Suspicious-Flag: YES X-Classification-ID: c660b1b4-0ad0-11eb-ab05-5254003a7283-1-1 Received: from [216.105.38.7] ([216.105.38.7:38114] helo=lists.sourceforge.net) by smtp36.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 73/13-21127-8AD618F5; Sat, 10 Oct 2020 04:15: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 1kRA1j-0004wS-Ui; Sat, 10 Oct 2020 08:14:51 +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 1kRA1i-0004w3-4S for openvpn-devel@lists.sourceforge.net; Sat, 10 Oct 2020 08:14:50 +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:References: In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=TmB5bfK5KtWF3c+f9GcYmuMpSt3rs4xhO4AtswRyNTw=; b=efHPAuvXX/DT6Vudow1fn1jBJ2 Wyw/fvBfHFBwBQffMcUTNEbv3RzKPfuhj4PkT4FnP/KleEMBezkPfKWPBk3uGrOE80Kmlin8BDfJz pt5JzzgasUR6uvsFum5LO3yMv+1JjExr4TVeTHCvLHhmdU/Q2+iQEe2BPFiH+/Ww90PM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=TmB5bfK5KtWF3c+f9GcYmuMpSt3rs4xhO4AtswRyNTw=; b=hxGIj4dc2gWZGOAASVrYZklwR0 1AuRCG523zy1EDXEk707E8eUxllkXFL3EcWdemdm2743T3nSE/OZmSimjFZfOgxOvNUyaLpgIpd42 y9hBo8zjazn+nyMAr02z+RnrWyOea64ZOshCrhHgAdjx+dK587QI1ZLtxR40IumR39/o=; Received: from vmail1.greenie.net ([195.30.8.66]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1kRA1c-0050T2-Hi for openvpn-devel@lists.sourceforge.net; Sat, 10 Oct 2020 08:14:50 +0000 Received: from nbsd81.ov.greenie.net (nbsd81.ov.greenie.net [IPv6:2001:608:0:814:0:0:f000:17]) by vmail1.greenie.net (8.16.1/8.12.11) with ESMTP id 09A8EaGc072469 for ; Sat, 10 Oct 2020 10:14:36 +0200 (CEST) Received: by nbsd81.ov.greenie.net (Postfix, from userid 1000) id E491576A62; Sat, 10 Oct 2020 10:14:35 +0200 (CEST) From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Sat, 10 Oct 2020 10:14:35 +0200 Message-Id: <20201010081435.2154-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.22.0 In-Reply-To: <009203331.11779-1-gert@greenie.muc.de> References: <009203331.11779-1-gert@greenie.muc.de> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (vmail1.greenie.net [IPv6:2001:608:1:995a:20c:29ff:feb8:10eb]); Sat, 10 Oct 2020 10:14:36 +0200 (CEST) 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: muc.de] 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: 1kRA1c-0050T2-Hi Subject: [Openvpn-devel] [PATCH v2] Fix compilation on pre-EKM mbedTLS libraries. 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 commit f0734e49956217 simplified key_state_export_keying_material(), changing the function prototype. For older mbedTLS versions, there is an "always fail" dummy function which was overlooked in that change. Fix prototype. v2: also adjust function return (NULL -> false) Signed-off-by: Gert Doering Acked-by: Steffan Karger --- src/openvpn/ssl_mbedtls.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index bb5633b7..11fbeae4 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -252,14 +252,13 @@ key_state_export_keying_material(struct tls_session *session, } } #else -unsigned char* +bool key_state_export_keying_material(struct tls_session *session, const char* label, size_t label_size, - size_t ekm_size, - struct gc_arena *gc) + void *ekm, size_t ekm_size) { /* Dummy function to avoid ifdefs in the common code */ - return NULL; + return false; } #endif /* HAVE_EXPORT_KEYING_MATERIAL */