From patchwork Fri Oct 9 09:33:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 1512 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id wIVGD3LJgF+FdwAAIUCqbw (envelope-from ) for ; Fri, 09 Oct 2020 16:34:58 -0400 Received: from proxy13.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id +KIPD3LJgF+mNQAAvGGmqA (envelope-from ) for ; Fri, 09 Oct 2020 16:34:58 -0400 Received: from smtp32.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy13.mail.ord1d.rsapps.net with LMTPS id sFm1DnLJgF9wJwAAgjf6aA (envelope-from ) for ; Fri, 09 Oct 2020 16:34:58 -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: smtp32.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=greenie.muc.de X-Suspicious-Flag: YES X-Classification-ID: e4a5efb6-0a6e-11eb-8258-52540099eaf5-1-1 Received: from [216.105.38.7] ([216.105.38.7:49628] helo=lists.sourceforge.net) by smtp32.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id AF/1F-07487-079C08F5; Fri, 09 Oct 2020 16:34:57 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1kQz5I-00049N-GS; Fri, 09 Oct 2020 20:33:48 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQz5G-00049C-OU for openvpn-devel@lists.sourceforge.net; Fri, 09 Oct 2020 20:33:46 +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=dyUJ10C333P2uDDeOQ+AzzL8NbjLt0Ybqz7OMNFV/bw=; b=A0yaC0QFlAeS4+oXQ16hjG17GF PbMjQ2Y9m8Z+ChPqMtNsqP762KJpgGX2SZ7hgDoVvNxYmlYNwgweIDMny9xheN3H3TFRwitWPrt2L CKHVQrrgpVGFJsm/eY+2bfIKiL8vIlBlSOkaCwpQO0JznsXQu2CsOVLo7MCsSBcOYIOs=; 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=dyUJ10C333P2uDDeOQ+AzzL8NbjLt0Ybqz7OMNFV/bw=; b=b poRJniNY2/tCyYOc5kS8frfth3W3yJwza9/CJ6x47sa4NsYLhUkGPNeSElIJBCH5HNWAUHrY4oH9U pFDZuRR534EMUPIQOe4MOfZ6k/Z0nwYbHvjdCRuD/vzWdaPW2RbEmhvOoZLvz/DkLOYN16peHXAhV CJJ+1nrAxg28Fa40=; 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 1kQz5B-004cVA-9H for openvpn-devel@lists.sourceforge.net; Fri, 09 Oct 2020 20:33:46 +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 099KXV8q027591 for ; Fri, 9 Oct 2020 22:33:31 +0200 (CEST) Received: by nbsd81.ov.greenie.net (Postfix, from userid 1000) id 68BAB76A62; Fri, 9 Oct 2020 22:33:31 +0200 (CEST) From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Fri, 9 Oct 2020 22:33:31 +0200 Message-Id: <20201009203331.11779-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.22.0 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]); Fri, 09 Oct 2020 22:33:31 +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: 1kQz5B-004cVA-9H Subject: [Openvpn-devel] [PATCH] 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 "always fail" dummy function which was overlooked in that change. Fix prototype. Signed-off-by: Gert Doering --- src/openvpn/ssl_mbedtls.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index bb5633b7..b100d03e 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -252,11 +252,10 @@ 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;