From patchwork Tue Dec 15 05:42:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1550 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.27.255.7]) by backend30.mail.ord1d.rsapps.net with LMTP id oFcdDsTn2F9XIwAAIUCqbw (envelope-from ) for ; Tue, 15 Dec 2020 11:43:48 -0500 Received: from proxy1.mail.iad3a.rsapps.net ([172.27.255.7]) by director10.mail.ord1d.rsapps.net with LMTP id uF3IDcTn2F/xLQAApN4f7A (envelope-from ) for ; Tue, 15 Dec 2020 11:43:48 -0500 Received: from smtp17.gate.iad3a ([172.27.255.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.iad3a.rsapps.net with LMTPS id KG2UCMTn2F92NAAA8TVjwQ (envelope-from ) for ; Tue, 15 Dec 2020 11:43:48 -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: smtp17.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: b36c934a-3ef4-11eb-ab5c-525400723ca9-1-1 Received: from [216.105.38.7] ([216.105.38.7:53302] helo=lists.sourceforge.net) by smtp17.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id FD/B0-19783-3C7E8DF5; Tue, 15 Dec 2020 11:43:47 -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.90_1) (envelope-from ) id 1kpDPT-0000os-2s; Tue, 15 Dec 2020 16:42:47 +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 1kpDPS-0000ol-3J for openvpn-devel@lists.sourceforge.net; Tue, 15 Dec 2020 16:42:46 +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=VndnrHmotFy+9MedUJlbQQCecCBTV+rUlR+YhJa26B0=; b=BRyRAhe1kuPM9hD4G5SUDRQ5QE 72mZ/sFeIBpMyHXNJEc/Y2aIlx1y1ME3l2HLb+QhCdT5AbdrDes8gz4oe8NXi3SSuP3rJBn0YPp4A 8Pe1cJutEwYx9mbYX5uvnSYXWuy/EB64It4Ho8uu6HFzokV0fq20uPBTkR8eqwQB03iE=; 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=VndnrHmotFy+9MedUJlbQQCecCBTV+rUlR+YhJa26B0=; b=F0ZO7hz3BSn70SyFz9LzLLgxmq pxBlWtr4QOH8s4IBx5QImTaqrF1hGnjUtiXqKjvUpLMEWnwtW0H0XMOQxI/gxmlxbIl0LS8Hy1R8h z3nSi4J+GPrBnqxmDTjZ7WQ01/ZjHpF3Hs8Em/RuYXcfXrgvcAEMql0dzTq3LEMnrL+E=; 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 1kpDPB-00FJ8j-KC for openvpn-devel@lists.sourceforge.net; Tue, 15 Dec 2020 16:42:46 +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 1kpDP4-0000Ue-5L for openvpn-devel@lists.sourceforge.net; Tue, 15 Dec 2020 17:42:22 +0100 Received: (nullmailer pid 6043 invoked by uid 10006); Tue, 15 Dec 2020 16:42:22 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 15 Dec 2020 17:42:21 +0100 Message-Id: <20201215164221.5995-2-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201215164221.5995-1-arne@rfc2549.org> References: <20201215164221.5995-1-arne@rfc2549.org> 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: 1kpDPB-00FJ8j-KC Subject: [Openvpn-devel] [PATCH 2/2] Fix condition to generate session keys 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 For --nobind clients OpenVPN reuses the context and tls_multi structs of the previous clients and does not rerun the connect scripts on connect. But since it is a new client connection, the key_id is 0 and we postpone the key generation but it will never happen. This commit changes postponing the key generation to the right condition of NCP done for this session. Signed-off-by: Arne Schwabe --- src/openvpn/ssl.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index efbf688f..5d322598 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -2351,7 +2351,7 @@ error: * to the TLS control channel (cleartext). */ static bool -key_method_2_write(struct buffer *buf, struct tls_session *session) +key_method_2_write(struct buffer *buf, struct tls_multi *multi, struct tls_session *session) { struct key_state *ks = &session->key[KS_PRIMARY]; /* primary key */ @@ -2442,12 +2442,17 @@ key_method_2_write(struct buffer *buf, struct tls_session *session) goto error; } - /* Generate tunnel keys if we're a TLS server. - * If we're a p2mp server and IV_NCP >= 2 is negotiated, the first key - * generation is postponed until after the pull/push, so we can process pushed - * cipher directives. + /* + * Generate tunnel keys if we're a TLS server. + * + * If we're a p2mp server to allow NCP, the first key + * generation is postponed until after the connect script finished and the + * NCP options can be processed. Since that always happens at after connect + * script options are available the CAS_SUCCEEDED status is identical to + * NCP options are processed and we have no extra state for NCP finished. */ - if (session->opt->server && !(session->opt->mode == MODE_SERVER && ks->key_id <= 0)) + if (session->opt->server && (session->opt->mode != MODE_SERVER + || multi->context_auth == CAS_SUCCEEDED)) { if (ks->authenticated > KS_AUTH_FALSE) { @@ -2936,7 +2941,7 @@ tls_process(struct tls_multi *multi, if (!buf->len && ((ks->state == S_START && !session->opt->server) || (ks->state == S_GOT_KEY && session->opt->server))) { - if (!key_method_2_write(buf, session)) + if (!key_method_2_write(buf, multi, session)) { goto error; }