From patchwork Wed Oct 13 14:04:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1983 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director14.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 6LU/NhgLaGHkcQAAIUCqbw (envelope-from ) for ; Thu, 14 Oct 2021 06:48:56 -0400 Received: from proxy1.mail.ord1d.rsapps.net ([172.30.191.6]) by director14.mail.ord1d.rsapps.net with LMTP id aBbnNRgLaGGqFAAAeJ7fFg (envelope-from ) for ; Thu, 14 Oct 2021 06:48:56 -0400 Received: from smtp36.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.ord1d.rsapps.net with LMTPS id MP+fNRgLaGFzcAAAasrz9Q (envelope-from ) for ; Thu, 14 Oct 2021 06:48:56 -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: smtp36.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; 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: 54601dd2-2cdc-11ec-a79b-525400c11307-1-1 Received: from [216.105.38.7] ([216.105.38.7:56748] helo=lists.sourceforge.net) by smtp36.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 29/85-02339-81B08616; Thu, 14 Oct 2021 06:48:56 -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 1mayH9-0003s2-RO; Thu, 14 Oct 2021 10:47:51 +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 1mayH8-0003rw-NA for openvpn-devel@lists.sourceforge.net; Thu, 14 Oct 2021 10:47:50 +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=uPnrVFOC0ddJdhRIcoL1MhtcZXiX+nblXfQgR1XXDX0=; b=SvQPhbRpru4J2XcBYM3mF9myOC /r9yfye/SCnfePSfCmV6LHjrSh4yFx8cG+swBx6JdlwpkBUpNdFCO8dRYwE1kJ+ePXnUOKU2lIPy5 8xNW7a4jqcpONIoAHnnM572aLT/hY0k3BT4QXnC42CECccGFJCwBhKUggUB5WtsMBSjg=; 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=uPnrVFOC0ddJdhRIcoL1MhtcZXiX+nblXfQgR1XXDX0=; b=CxpdbJmjoe6HaUkbXfD0tpQglS YpDczArkQ1HwIPdbZ3pT6sLRkcO/O6PEF9dH4epxXyACN++SlqORUwEgm5Ei6Zj5g5G7Z6hpzICaV 1oUbhhre4Y8TD1g0PBNDhDswVMjPceRevTcgJmmJzdg12s8/EN15Ul2BLX5JHK8j1ifQ=; Received: from mail-wr1-f42.google.com ([209.85.221.42]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1mayH8-00B1l4-29 for openvpn-devel@lists.sourceforge.net; Thu, 14 Oct 2021 10:47:50 +0000 Received: by mail-wr1-f42.google.com with SMTP id y3so18146150wrl.1 for ; Thu, 14 Oct 2021 03:47:49 -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=uPnrVFOC0ddJdhRIcoL1MhtcZXiX+nblXfQgR1XXDX0=; b=hX7hTAPbnQPZ0XfwiX+WpL0HDnfUquc2W6SqDy303hk21PDhIU4UjjfOFUQ48h+yes KbWhVAnzprjhloNX7msnPhGSoAYO4mA6EBJEMvec7IaJ/mpgLQicSxtFeQKgBKOFWW+/ lIwZdegFrjgYHg5l3AqHuWJYY6FyqSD+d2PsQR7XaniAy5ypnriOG9pkPHMVP771dxae UMJmhthHusYLBeRrm0GtOAtRiy4/i/r9Oqh+p1pRELHmWvPa7pBaPjq6O/A1sxkOkyvW 5mhiZXvjR+rbZcFM8RQKA+pXDJBvE+oB8DXoI8lYz+BtCQen8kI2BqRq25OIBXgNyjJ3 SX9A== 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=uPnrVFOC0ddJdhRIcoL1MhtcZXiX+nblXfQgR1XXDX0=; b=w09PAQXpClFaSGgu5L9FXk2CAAK9sApwgcfWW79Wh/oiAWLVG87nELzRlDngLfaFZY 8ER6nh2XjtmXGVeQM9986lYyT9GVK5q+0wfkunSd17kIXDgNql+XGJJQlnFKGK5VOXg5 Ztyr5cSdYSwLz0wlu4UpndXYWK/+64qORdCZ5N+rlCBguWPs81RiMzckT2stZzro84oB nXoUO/hpCWMQcFPbiEroq/eL7eQ46hYmWot1taxbBwe4ltbJrFEOY6+yNRckSlN6XKwy BOlrlks277KXa5b4SQp5Qw90r0AU0RB7PZ9dm7ApG0WH5dj7uVloD5hHijQjL+SG9SfM 0Diw== X-Gm-Message-State: AOAM532EHsSj52hcu07efVriQX+gX+hF+npt02AXzK3BmDHnuAB/OL5y ziHBOOOwI0wpju/P+cPdvBiLgplt6ds= X-Google-Smtp-Source: ABdhPJxH/pxalFWUi9Dl8UrNQxnO92ozoLNIKnyacWDuInzll++QcPgoCnB1eKqFGi01GGzEEsj1oA== X-Received: by 2002:a1c:1941:: with SMTP id 62mr4854717wmz.131.1634208463386; Thu, 14 Oct 2021 03:47:43 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (nat2.panoulu.net. [185.38.2.2]) by smtp.gmail.com with ESMTPSA id r9sm2029837wru.2.2021.10.14.03.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 03:47:42 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 14 Oct 2021 04:04:36 +0300 Message-Id: <20211014010436.359-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. 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.221.42 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 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.42 listed in wl.mailspike.net] -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 X-Headers-End: 1mayH8-00B1l4-29 Subject: [Openvpn-devel] [PATCH] 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. Commit bc36d9d ("Remove OpenSSL configure checks") removed abovementioned defines. Adjust config-msvc.h accordingly. Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- config-msvc.h | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/config-msvc.h b/config-msvc.h index 97923228..b28d8742 100644 --- a/config-msvc.h +++ b/config-msvc.h @@ -41,43 +41,7 @@ #define HAVE_IN_PKTINFO 1 #define HAVE_OPENSSL_ENGINE 1 -/* hardcode usage of OpenSSL 1.1.x */ -#define HAVE_EVP_MD_CTX_RESET 1 -#define HAVE_EVP_MD_CTX_FREE 1 -#define HAVE_EVP_MD_CTX_NEW 1 -#define HAVE_HMAC_CTX_RESET 1 -#define HAVE_HMAC_CTX_FREE 1 -#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_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_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 -#define HAVE_RSA_SET0_KEY 1 -#define HAVE_RSA_BITS 1 -#define HAVE_DSA_GET0_PQG 1 -#define HAVE_DSA_BITS 1 -#define HAVE_RSA_METH_NEW 1 -#define HAVE_RSA_METH_FREE 1 -#define HAVE_RSA_METH_SET_PUB_ENC 1 -#define HAVE_RSA_METH_SET_PUB_DEC 1 -#define HAVE_RSA_METH_SET_PRIV_ENC 1 -#define HAVE_RSA_METH_SET_PRIV_DEC 1 -#define HAVE_RSA_METH_SET_INIT 1 -#define HAVE_RSA_METH_SET_SIGN 1 -#define HAVE_RSA_METH_SET_FINISH 1 -#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 #ifndef __cplusplus