From patchwork Tue Mar 15 23:23:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2346 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id 2GnlCvW6MWJnAQAAqwncew (envelope-from ) for ; Wed, 16 Mar 2022 06:24:53 -0400 Received: from proxy2.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net with LMTP id oDZtDPW6MWIYFgAAIasKDg (envelope-from ) for ; Wed, 16 Mar 2022 06:24:53 -0400 Received: from smtp3.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.ord1d.rsapps.net with LMTPS id AOX6C/W6MWLxRQAAfawv4w (envelope-from ) for ; Wed, 16 Mar 2022 06:24:53 -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: smtp3.gate.ord1c.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: 50dd1b88-a513-11ec-8cbd-842b2b47481a-1-1 Received: from [216.105.38.7] ([216.105.38.7:40524] helo=lists.sourceforge.net) by smtp3.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 42/53-28333-4FAB1326; Wed, 16 Mar 2022 06:24:52 -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.94.2) (envelope-from ) id 1nUQoe-0002ny-5I; Wed, 16 Mar 2022 10:23:38 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nUQoc-0002ni-1M for openvpn-devel@lists.sourceforge.net; Wed, 16 Mar 2022 10:23:36 +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=aO3KXlJ8NWYLHvw2dh2Ewme5V2IDpK3cDzMWVYfCi+w=; b=EIPOVYXjr7D/oI+NdGUZJbGeor pZ4M5jmBbdmKLkf4EalDobkWET0uVlDprJUiG2tH7rOWBr4rBDtee6SUsxwJL60gLRp02thDlh0BY vxAfDB34SjK94MHeVtZ80nHI5xNYqQ9cfSql1cCrcRBJLUGGdAZoYl9wEgECVBAqtWuM=; 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=aO3KXlJ8NWYLHvw2dh2Ewme5V2IDpK3cDzMWVYfCi+w=; b=a qdm2COYBZ3HgNj86HQeV2EIMJy6XS1ikeneJRzbqtYxGUKEXy59yshDhNSFS/ip9KHD6/c3ssjLXm lu364bbRbFjSJetthfw/PmNylNaAC7Lw0/z0Lg1h61rxNOQdVpYEta6ILSvOeoMej/tftov8L0kt5 /daRNG8ka/iSxpfQ=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nUQoU-0008TG-Vw for openvpn-devel@lists.sourceforge.net; Wed, 16 Mar 2022 10:23:36 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1nUQoH-0009Ce-Hp for openvpn-devel@lists.sourceforge.net; Wed, 16 Mar 2022 11:23:17 +0100 Received: (nullmailer pid 3356294 invoked by uid 10006); Wed, 16 Mar 2022 10:23:17 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 16 Mar 2022 11:23:17 +0100 Message-Id: <20220316102317.3356246-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Commit 8c72d7981 changed the push_peer_info_detail to have an additional level for P2P NCP and shifting most of the other levels with 1. The check for UV_ and IV_PLAT_VER was not changed accordingly. [...] Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1nUQoU-0008TG-Vw Subject: [Openvpn-devel] [PATCH] Fix IV_PLAT_VER and UV_ variables sent without push-peer-info 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 8c72d7981 changed the push_peer_info_detail to have an additional level for P2P NCP and shifting most of the other levels with 1. The check for UV_ and IV_PLAT_VER was not changed accordingly. --- src/openvpn/ssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index ca028856..87b476b2 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -2255,7 +2255,7 @@ push_peer_info(struct buffer *buf, struct tls_session *session) { if ((((strncmp(e->string, "UV_", 3) == 0 || strncmp(e->string, "IV_PLAT_VER=", sizeof("IV_PLAT_VER=") - 1) == 0) - && session->opt->push_peer_info_detail >= 2) + && session->opt->push_peer_info_detail > 2) || (strncmp(e->string, "IV_GUI_VER=", sizeof("IV_GUI_VER=") - 1) == 0) || (strncmp(e->string, "IV_SSO=", sizeof("IV_SSO=") - 1) == 0) )