From patchwork Wed Oct 13 12:02:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1980 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.27.255.52]) by backend30.mail.ord1d.rsapps.net with LMTP id NxAwKtDuZ2HRSQAAIUCqbw (envelope-from ) for ; Thu, 14 Oct 2021 04:48:16 -0400 Received: from proxy18.mail.iad3a.rsapps.net ([172.27.255.52]) by director8.mail.ord1d.rsapps.net with LMTP id aJ5IKdDuZ2H1BAAAfY0hYg (envelope-from ) for ; Thu, 14 Oct 2021 04:48:16 -0400 Received: from smtp8.gate.iad3a ([172.27.255.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.iad3a.rsapps.net with LMTPS id EGHLItDuZ2E5HQAAon3hFg (envelope-from ) for ; Thu, 14 Oct 2021 04:48:16 -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: smtp8.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; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 78940dfa-2ccb-11ec-a5d0-525400b8fe03-1-1 Received: from [216.105.38.7] ([216.105.38.7:33712] helo=lists.sourceforge.net) by smtp8.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 4D/CC-12344-FCEE7616; Thu, 14 Oct 2021 04:48:16 -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 1mawOC-0000KR-PF; Thu, 14 Oct 2021 08:47:00 +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 1mawOB-0000KH-Ei for openvpn-devel@lists.sourceforge.net; Thu, 14 Oct 2021 08:46:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: 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=9paJXVSQ7thQh7idmxKIkbgU8yKnoWBDdIgHv/guBIk=; b=B5Xt1Ktn0wBN//YoNKt1jsa1TC HbAcEDknK02pg1sHE+JTF8dEzutV5cWnL8fpdT+eqoDn7XyBwTv+5IXJaItc6MNM2otoULdeiEybJ t2bQB83gcwir8+pMqslT3pKR76RFMOdgjUY0S4dr3BuaULfZ0an51/Imt8ccrtJOsnSQ=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=9paJXVSQ7thQh7idmxKIkbgU8yKnoWBDdIgHv/guBIk=; b=mXA0hEvfmJFFgl3IkOz5IG6RZt 6xmSeZoRq+l8Wo5CM/HkoWj7/yRnXylUPRDrl0JqhMEpRrgE+38j2wQIDFaLhFuBquK+2Xovs1sdp 9RsQ0kq2dskBleFh/Q/8+uDrC2NF1J397+witNmzEjbPj7KUnp6+fm8NKCKG5t7T+Cz4=; Received: from mail-lf1-f43.google.com ([209.85.167.43]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1mawO7-0003NZ-86 for openvpn-devel@lists.sourceforge.net; Thu, 14 Oct 2021 08:46:59 +0000 Received: by mail-lf1-f43.google.com with SMTP id y26so23732377lfa.11 for ; Thu, 14 Oct 2021 01:46:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=9paJXVSQ7thQh7idmxKIkbgU8yKnoWBDdIgHv/guBIk=; b=Hi+bFFHta71/EXi8G1IgyHIeM89k5UssFPfv/ZnbX+4ESHGC3h4WMU93B+YWTafmSd px52ToN8nWK4OSnjwc73wqmp0HK5ocF1HOZgcLH0/nxOWpiXs5ngp4976REptzxqWpnh 5qO1sZmqw6/JbonYgxX3c+cV6fNQtBRPQTlUub57R0hM4WMbuy7VvsYWrM4yrfFSu6fI jTF9s+TXKJIBsozsKys6f3fMVmxS0gfkM7SGYtGucYdvqbqaTlmdWJh8RNexj1JdQoiX yyPP1NplaRim7SNMO1xlGqji+RDvjEi2q/w/jYJ0Jllvx9BE1aYqJkx8qVnSvHIf1sci RMVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9paJXVSQ7thQh7idmxKIkbgU8yKnoWBDdIgHv/guBIk=; b=AeLyqAolNVScsj3GCK6ibF9PZHxGFEuz+VEYculqwmZz5d64PBaOCV76/20CfAk6YT 6PNoZZ+gCneXSjH2GIIuem92sAikQ2+eAfKFKh7p6yD/3fH9BFVq/3SwuQrPEzAbVQv1 yJDOBRffH3kruU0jXdNFLcf8XvTqNwhTblmtzfSKaUPUtQXlEG3sVDpTCrhOLAhrnwFt oiLxG/ubW9uEW8LK/S7k70j+Siy1MxqgfVVHHiICE+9dMfFhvOsTJ6bl00eP3NbBUcp8 8dXQaqbySRZfgF/M77L5dRo+ED1VBTMLmvcx+gGyAJqF4TCEUYE01/dpQt97Jeaa1L3q ggJg== X-Gm-Message-State: AOAM530O5ENni1c3g3HjtfWLRt+RvTmcd2RUixGYkRJsg1TA8h9c9IE2 jUrmwZB6kQ8OWTzqUzuxMe+I55F+Up8= X-Google-Smtp-Source: ABdhPJxOYttqV6fCRk7czXu1o0yJAoC2huIpeqtKrs7pMYmGcLoquq1G7HdUCC9esk3uxkwZVRyhfw== X-Received: by 2002:a19:e045:: with SMTP id g5mr3634133lfj.689.1634201208292; Thu, 14 Oct 2021 01:46:48 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (37-33-133-156.bb.dnainternet.fi. [37.33.133.156]) by smtp.gmail.com with ESMTPSA id u23sm167112lfg.286.2021.10.14.01.46.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 01:46:47 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 14 Oct 2021 02:02:27 +0300 Message-Id: <20211013230227.199-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 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: From: Lev Stipakov PRODUCT_VERSION_PATCH, defined in version.m4, already includes dot (like ".4"), so no need to include it here. Signed-off-by: Lev Stipakov --- config-msvc-version.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Content analysis details: (1.7 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.43 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.43 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date 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: h.in] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.8 UPPERCASE_50_75 message body is 50-75% uppercase X-Headers-End: 1mawO7-0003NZ-86 Subject: [Openvpn-devel] [PATCH 1/3] msvc: fix product version display 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: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov PRODUCT_VERSION_PATCH, defined in version.m4, already includes dot (like ".4"), so no need to include it here. Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- config-msvc-version.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config-msvc-version.h.in b/config-msvc-version.h.in index 7977cb84..59ca654a 100644 --- a/config-msvc-version.h.in +++ b/config-msvc-version.h.in @@ -5,8 +5,8 @@ #define PRODUCT_VERSION_MAJOR "@PRODUCT_VERSION_MAJOR@" #define PRODUCT_VERSION_MINOR "@PRODUCT_VERSION_MINOR@" #define PRODUCT_VERSION_PATCH "@PRODUCT_VERSION_PATCH@" -#define PACKAGE_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@.@PRODUCT_VERSION_PATCH@" -#define PRODUCT_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@.@PRODUCT_VERSION_PATCH@" +#define PACKAGE_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@@PRODUCT_VERSION_PATCH@" +#define PRODUCT_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@@PRODUCT_VERSION_PATCH@" #define PRODUCT_BUGREPORT "@PRODUCT_BUGREPORT@" #define OPENVPN_VERSION_RESOURCE @PRODUCT_VERSION_RESOURCE@ #define TAP_WIN_COMPONENT_ID "@PRODUCT_TAP_WIN_COMPONENT_ID@" From patchwork Wed Oct 13 12:04:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1981 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.27.255.58]) by backend30.mail.ord1d.rsapps.net with LMTP id eBrsCNHuZ2HHSQAAIUCqbw (envelope-from ) for ; Thu, 14 Oct 2021 04:48:17 -0400 Received: from proxy19.mail.iad3a.rsapps.net ([172.27.255.58]) by director15.mail.ord1d.rsapps.net with LMTP id sGRvCNHuZ2FGFQAAIcMcQg (envelope-from ) for ; Thu, 14 Oct 2021 04:48:17 -0400 Received: from smtp32.gate.iad3a ([172.27.255.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy19.mail.iad3a.rsapps.net with LMTPS id MIo7ANHuZ2HzawAAXy6Yeg (envelope-from ) for ; Thu, 14 Oct 2021 04:48:17 -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.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; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 789d69fe-2ccb-11ec-a059-5254001741cc-1-1 Received: from [216.105.38.7] ([216.105.38.7:35094] helo=lists.sourceforge.net) by smtp32.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 17/BE-19692-0DEE7616; Thu, 14 Oct 2021 04:48:16 -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 1mawOc-0004XS-Aw; Thu, 14 Oct 2021 08:47:26 +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 1mawOb-0004XA-9r for openvpn-devel@lists.sourceforge.net; Thu, 14 Oct 2021 08:47:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: 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=jLzxX6tDBywfCUujwrFjqi0BO8TZO80yLIvIFbEpPFo=; b=ecFZ16Elc1cask8vRbFFcoH/iM p1+uqC+DD3QVzyCYpGjnbIEl0ekh0T57oDTRNWMOXtllwIMpHTakAI5p+dOLgLk+BEpqLHuYqx28k SHItWUUvq2fRXuqUz7kdj9W2yJAvPq9vws8EG5RfShNmUYkCJsphA49vTerzJvKgp5bI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=jLzxX6tDBywfCUujwrFjqi0BO8TZO80yLIvIFbEpPFo=; b=OLZncNexTw7dhjokaFPPR92lOq H04G4aqL0j4tP6Fx8zmml6Cq+VpcMEWPIOw3lFMMVE1H7E4GQrffdIhGmcZNbJ4v4/uGVW7X3XD8n VAFepUcO+JsiTqld77WUhNkrD8xaNII6b4R/3GOGVW95RNUzXwad/GCunGaaZf3HnKUg=; Received: from mail-lf1-f48.google.com ([209.85.167.48]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1mawOa-00Al8u-JF for openvpn-devel@lists.sourceforge.net; Thu, 14 Oct 2021 08:47:25 +0000 Received: by mail-lf1-f48.google.com with SMTP id r19so23338711lfe.10 for ; Thu, 14 Oct 2021 01:47:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=jLzxX6tDBywfCUujwrFjqi0BO8TZO80yLIvIFbEpPFo=; b=V9G7bgx6SrX2WmWEoxqygZcAbVMv/3Ohb4DDiTDDYoBwFVVIUa1Jh9a12rm0KAVGFU SQVzaBTgyz1d7dsyzNzi2entYNi3JbbNEcjd0f98R9dq077peSy8pv6zrtX0GNXQJ0bV Q+wLTqmJX/vDwaf8ED5UQhpdEc0kIkyjgmB/gCVhHvQ4JA0ezbRYWNzDKt11Cp6b6/8B ZEMCa5P/CaMlpc1ekl+Rju4YiFOQq92lRGAkd14WU8CpKOadxw9NrfS4cKxqCehj9zh+ dcN3CSmTniY0s0cdvj37/h9D2ybbwgP4HlxOwJgmTDVBmzYpV7dERDeGP9p8+uPEkjro dzSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jLzxX6tDBywfCUujwrFjqi0BO8TZO80yLIvIFbEpPFo=; b=hBIOyw8BLFItXzYoy7W5/qar04G5B3f/Vh1YwO4MPmtjldLWWgOrDfZxntJc+QaeA3 UuhiXpOJ+J8N9IdqAjyP5BTJXFGLqGknsN5UYi/WQDTtbPPZYQG6GQ02px21pYCjVFky K84kyYPbk1PecjR2cxZvB/qGmkMkmVo+csXKeTnRqF6Nj/ptMBCLzTtVtSJ4Sk4mPh1p s2a124+8Ku3csXCnx+tjUX1gzpQL4xbUgkzpi+J6tb9G0Hna0uosWM1ch/74Y6S4jj2l BSZ0b7S7rCo6X2t+jvB2pfjm+Z1IRGXoVJrSqtc84cL5Z2Pksz+0ZQ1kasQu2m+PJ1zQ 22FA== X-Gm-Message-State: AOAM531ubEcfwOtGrTw0DvqTTawKg4ZOZ6DQN6yezcTcppUwZZTNWW62 T9n1zbwU+Y3wKghjqMEWPvv7VhinetY= X-Google-Smtp-Source: ABdhPJwODNhWSxhq0DCrlM8KKeaYofLFaE9dhqVNecB0VqTvbq9DHs56TZ7Paj3cVnD3WAnKE/EZbQ== X-Received: by 2002:a05:6512:1155:: with SMTP id m21mr3828639lfg.471.1634201237856; Thu, 14 Oct 2021 01:47:17 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (37-33-133-156.bb.dnainternet.fi. [37.33.133.156]) by smtp.gmail.com with ESMTPSA id b23sm169356lff.148.2021.10.14.01.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 01:47:17 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 14 Oct 2021 02:04:17 +0300 Message-Id: <20211013230417.252-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 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: From: Lev Stipakov Signed-off-by: Lev Stipakov --- src/openvpn/openvpn.vcxproj | 1 + src/openvpn/openvpn.vcxproj.filters | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj index 2144775f..a3350410 100644 --- a/src/openvpn/openvpn.vcxproj +++ b/src/openvpn/openvpn.vcxproj @@ -355,6 +355,7 @@ List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- src/openvpn/openvpn.vcxproj | 1 + src/openvpn/openvpn.vcxproj.filters | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj index 2144775f..a3350410 100644 --- a/src/openvpn/openvpn.vcxproj +++ b/src/openvpn/openvpn.vcxproj @@ -355,6 +355,7 @@ + diff --git a/src/openvpn/openvpn.vcxproj.filters b/src/openvpn/openvpn.vcxproj.filters index cf5748c7..bbcbff34 100644 --- a/src/openvpn/openvpn.vcxproj.filters +++ b/src/openvpn/openvpn.vcxproj.filters @@ -509,6 +509,9 @@ Header Files + + Header Files + From patchwork Wed Oct 13 12:04:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1982 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 1ONVO+zuZ2FpSgAAIUCqbw (envelope-from ) for ; Thu, 14 Oct 2021 04:48:44 -0400 Received: from proxy3.mail.iad3b.rsapps.net ([172.31.255.6]) by director13.mail.ord1d.rsapps.net with LMTP id 8EFIOuzuZ2EuJgAA91zNiA (envelope-from ) for ; Thu, 14 Oct 2021 04:48:44 -0400 Received: from smtp9.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.iad3b.rsapps.net with LMTPS id 0OucM+zuZ2FAPgAAM8Wetg (envelope-from ) for ; Thu, 14 Oct 2021 04:48:44 -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: smtp9.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; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 88cb6e70-2ccb-11ec-b34c-525400f4d366-1-1 Received: from [216.105.38.7] ([216.105.38.7:58508] helo=lists.sourceforge.net) by smtp9.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 6C/D7-29784-BEEE7616; Thu, 14 Oct 2021 04:48:43 -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 1mawP8-0000Q2-3N; Thu, 14 Oct 2021 08:47:58 +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 1mawP6-0000Pw-P8 for openvpn-devel@lists.sourceforge.net; Thu, 14 Oct 2021 08:47:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: 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=dg9F2lWLUYnzhZhgcN0VogO+SCDA3oI7eXTKm9Pn60Q=; b=Y5kYQNXvDudfsuxQPrBC+Ng+jR zSyaYXfZhmsgD3kgMFjpiD4BzGilHAwGjUqUHDVMTKBCf3obKpmOLV5EAubqVbV+pwX2iLLd+WJar kW7T/y8WApZUdWKTpHt81YntDyeoZtrfnMgnneOemWRu+btR9R6/q+lBwE6iDDfV+ayE=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=dg9F2lWLUYnzhZhgcN0VogO+SCDA3oI7eXTKm9Pn60Q=; b=ALpesGhZr1e/2nDz0wTIjVEKrj cGDaEe18dSFLMqqCVGFKm0nZRShaOOMz+DCyFHKraNCmuohcruVis616bwMI5EmP0J+elEtauTcnq q1CSorzLH80LbWe9qhiwzKtSVp7nNGeay2fVnQlihvUWguKDVEJEN7YcwjE1geqvtPSM=; Received: from mail-lf1-f50.google.com ([209.85.167.50]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1mawP2-0003WZ-Cf for openvpn-devel@lists.sourceforge.net; Thu, 14 Oct 2021 08:47:56 +0000 Received: by mail-lf1-f50.google.com with SMTP id j21so24071057lfe.0 for ; Thu, 14 Oct 2021 01:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=dg9F2lWLUYnzhZhgcN0VogO+SCDA3oI7eXTKm9Pn60Q=; b=XtVLCerdaX5CGPW6qmb0Xi8BlRn40lI+7qJw6BKM6ZT6sL3Ds40PeqxavQ9s3lm4BM O2bh66hM6siTc2QnwsD2yP8T5pk3pj0OgQJnBZHwfuttLmuzqke5l/ox82HSIbzPYPQb 3SLTVxf6qgP+ZcZZ6RbMQEWWdb29evtbUIFc8JRVfAM6gVm2778k8lfyiHfQ2Iyd8nNL ZsS+f/mAolvWbZj+IK0HtiN9uzzUh/Cso0XCJOJ0bSVi5VI/baMBPsxL9pVZgCILEcba RMJHeqxdO+5j2S/Jm65pWniRNMcmXpw/WhD3iJdW3XjEQRaAAk7cyFB0Pk3yqYNGKs9W P1Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dg9F2lWLUYnzhZhgcN0VogO+SCDA3oI7eXTKm9Pn60Q=; b=kD26i4tFmNImO3hUyinHc4/32gAYi89Bvb1crcqNIsxOoreocXxskLntLHdvGesyQg pZNIbl8dwBc8+VGvT3i9G8wvNIB2VWUK3SnUyfBVPFfPW03n7s9fzJnhsvDMt1gqPkp5 euuntzgHe2CTym53TjIgKu3eDpNC2rt3dHz7//HgyHqMfgx+R28eZlD6V8xFfA6OpmJB 9KmJZzuTzKqiP4c6Wn6lDtkT16pyqUExphXSNIQf9Z34duaBmL/SKjTw4mLApPB5FjQW +RWvorTQgQyRh5Yr+tIv1GxJodXuhsIpPF32r5cTMMfKtYfebgaomtl+Rpsx8MDUHH5i 2MiA== X-Gm-Message-State: AOAM532qZTRy+TrmMB4Hp2l1py4i8CkWHYstANR8oL7UXKRibEEoQxel EyExyDA/0wYH6+nPB5uzvzys6bSRh98= X-Google-Smtp-Source: ABdhPJzrkfN0OCuAyl3f/JL5jdVNKAD3GPW7huQ2QNMAA9L8bEGixHuE86+VrfcZvAwmcG3qG3La4Q== X-Received: by 2002:a19:4891:: with SMTP id v139mr3918947lfa.435.1634201265672; Thu, 14 Oct 2021 01:47:45 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (37-33-133-156.bb.dnainternet.fi. [37.33.133.156]) by smtp.gmail.com with ESMTPSA id p18sm200619ljc.114.2021.10.14.01.47.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 01:47:45 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 14 Oct 2021 02:04:42 +0300 Message-Id: <20211013230442.305-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 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: From: Lev Stipakov Commit 2778443 ("msvc: OpenSSL 1.1.x support") added OpenSSL-related defines to config-msvc.h, which in Linux/MinGW are set during configure step. Turns out that OPENSSL_NO_EC was added by mistake - it breaks loading EC keys. Also few others were missing. Content analysis details: (0.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.50 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.50 listed in wl.mailspike.net] X-Headers-End: 1mawP2-0003WZ-Cf Subject: [Openvpn-devel] [PATCH 3/3] config-msvc.h: fix OpenSSL-related defines 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: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Commit 2778443 ("msvc: OpenSSL 1.1.x support") added OpenSSL-related defines to config-msvc.h, which in Linux/MinGW are set during configure step. Turns out that OPENSSL_NO_EC was added by mistake - it breaks loading EC keys. Also few others were missing. Compare with MinGW-generated config.h, which uses the same OpenSSL version. Remove unneeded defines and add missing ones. Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- config-msvc.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config-msvc.h b/config-msvc.h index f199bb2c..a39eeed8 100644 --- a/config-msvc.h +++ b/config-msvc.h @@ -84,13 +84,16 @@ #define HAVE_HMAC_CTX_NEW 1 #define HAVE_SSL_CTX_GET_DEFAULT_PASSWD_CB_USERDATA 1 #define HAVE_SSL_CTX_GET_DEFAULT_PASSWD_CB 1 +#define HAVE_SSL_CTX_NEW 1 +#define HAVE_SSL_CTX_SET_SECURITY_LEVEL 1 #define HAVE_X509_GET0_PUBKEY 1 #define HAVE_X509_STORE_GET0_OBJECTS 1 #define HAVE_X509_OBJECT_FREE 1 #define HAVE_X509_OBJECT_GET_TYPE 1 +#define HAVE_X509_GET0_NOTAFTER 1 +#define HAVE_X509_GET0_NOTBEFORE 1 #define HAVE_EVP_PKEY_GET0_RSA 1 #define HAVE_EVP_PKEY_GET0_EC_KEY 1 -#define HAVE_EVP_PKEY_ID 1 #define HAVE_EVP_PKEY_GET0_DSA 1 #define HAVE_RSA_SET_FLAGS 1 #define HAVE_RSA_GET0_KEY 1 @@ -110,8 +113,8 @@ #define HAVE_RSA_METH_SET0_APP_DATA 1 #define HAVE_RSA_METH_GET0_APP_DATA 1 #define HAVE_EC_GROUP_ORDER_BITS 1 -#define OPENSSL_NO_EC 1 #define HAVE_EVP_CIPHER_CTX_RESET 1 + #define HAVE_DIINSTALLDEVICE 1 #define PATH_SEPARATOR '\\'