From patchwork Mon Aug 24 18:16:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1400 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id MKgRG/eQRF/vSQAAIUCqbw for ; Tue, 25 Aug 2020 00:17:59 -0400 Received: from proxy8.mail.iad3b.rsapps.net ([172.31.255.6]) by director10.mail.ord1d.rsapps.net with LMTP id 8KjiGveQRF8uXQAApN4f7A (envelope-from ) for ; Tue, 25 Aug 2020 00:17:59 -0400 Received: from smtp12.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy8.mail.iad3b.rsapps.net with LMTPS id 2A3iFPeQRF9dQAAAoCsc3g (envelope-from ) for ; Tue, 25 Aug 2020 00:17:59 -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: smtp12.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=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: f4cb6ca8-e689-11ea-927e-525400ae1f9d-1-1 Received: from [216.105.38.7] ([216.105.38.7:49550] helo=lists.sourceforge.net) by smtp12.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 4B/BE-14770-6F0944F5; Tue, 25 Aug 2020 00:17:58 -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 1kAQOV-0001hE-Cg; Tue, 25 Aug 2020 04:17:11 +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 1kAQOT-0001h7-Mn for openvpn-devel@lists.sourceforge.net; Tue, 25 Aug 2020 04:17:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=sdRFUs8sayDCnlv1qGmkmpUhSOikEAxBXXzBFcHCS4Y=; b=f9M5QXqly6MweQG0xM5Qujwmrv XMHX/TeXf4izPiRncKBqOYsefU0yX9NwQarkxcTe/gwLV6bgjWk3cJpb3pkdIwLl2OUg6wNAKnQ3f nbGqq73kb5l5dIqVrHOKAiHLZ4cfnz/O+l3LCR1n6j2WXwimskFtED5HQv3eBmeN/aWM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=sdRFUs8sayDCnlv1qGmkmpUhSOikEAxBXXzBFcHCS4Y=; b=DHM5hwzvrd0Lc4h1nSlDFGQXRT eQdnvX3w7YA8X+9QROvgi7KeWcvQG4K4u35RRCKtg+U1mqjcbrJlAEZR+UwIVHG3NexFcPBoiNDm7 oMOtTqZqe0wVo1rA2XdUBiO6DIkea5dKBsi6n8oqrk1sHQm5Ks2EVYXDzIkXPlGCWslE=; 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 1kAQOR-002y7a-SK for openvpn-devel@lists.sourceforge.net; Tue, 25 Aug 2020 04:17:09 +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 1kAQO7-000OYY-9p for openvpn-devel@lists.sourceforge.net; Tue, 25 Aug 2020 06:16:47 +0200 Received: (nullmailer pid 26282 invoked by uid 10006); Tue, 25 Aug 2020 04:16:47 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 25 Aug 2020 06:16:47 +0200 Message-Id: <20200825041647.26235-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 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: rfc2549.org] 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: 1kAQOR-002y7a-SK Subject: [Openvpn-devel] [PATCH] Fix compilation with older mbed TLS versions (mbedtls_tls_prf_types undefined) 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 The usage of the new keying material methods was not properly guarded. To avoid a number of ifdefs this commit uses a dummy struct and function. When we eventually drop support for non-EKM mbed TLS version we can remove these. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/ssl_mbedtls.c | 10 ++++++++++ src/openvpn/ssl_mbedtls.h | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index 4287b59e..4ec355a9 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -253,6 +253,16 @@ key_state_export_keying_material(struct tls_session *session, return NULL; } } +#else +unsigned char* +key_state_export_keying_material(struct tls_session *session, + const char* label, size_t label_size, + size_t ekm_size, + struct gc_arena *gc) +{ + /* Dummy function to avoid ifdefs in the common code */ + return NULL; +} #endif /* HAVE_EXPORT_KEYING_MATERIAL */ bool diff --git a/src/openvpn/ssl_mbedtls.h b/src/openvpn/ssl_mbedtls.h index 17aae551..ff64e17c 100644 --- a/src/openvpn/ssl_mbedtls.h +++ b/src/openvpn/ssl_mbedtls.h @@ -82,6 +82,7 @@ struct external_context { void *sign_ctx; }; +#ifdef HAVE_EXPORT_KEYING_MATERIAL /** struct to cache TLS secrets for keying material exporter (RFC 5705). * The constants (64 and 48) are inherent to TLS version and * the whole keying material export will likely change when they change */ @@ -90,6 +91,9 @@ struct tls_key_cache { mbedtls_tls_prf_types tls_prf_type; unsigned char master_secret[48]; }; +#else +struct tls_key_cache { }; +#endif /** * Structure that wraps the TLS context. Contents differ depending on the @@ -124,7 +128,6 @@ struct key_state_ssl { bio_ctx *bio_ctx; struct tls_key_cache tls_key_cache; - }; /**