[Openvpn-devel] config-msvc.h: fix OpenSSL-related defines

Message ID	20211014010436.359-1-lstipakov@gmail.com
State	Accepted
Headers	show Return-Path: <openvpn-devel-bounces@lists.sourceforge.net> From: Lev Stipakov <lstipakov@gmail.com> To: openvpn-devel@lists.sourceforge.net Date: Thu, 14 Oct 2021 04:04:36 +0300 Message-Id: <20211014010436.359-1-lstipakov@gmail.com> 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 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 Subject: [Openvpn-devel] [PATCH] config-msvc.h: fix OpenSSL-related defines Precedence: list Cc: Lev Stipakov <lev@openvpn.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox
Series	[Openvpn-devel] config-msvc.h: fix OpenSSL-related defines \| expand [Openvpn-devel] config-msvc.h: fix OpenSSL-related defines

Message ID

20211014010436.359-1-lstipakov@gmail.com

State

Accepted

Headers

From: Lev Stipakov <lstipakov@gmail.com>
To: openvpn-devel@lists.sourceforge.net
Date: Thu, 14 Oct 2021 04:04:36 +0300
Message-Id: <20211014010436.359-1-lstipakov@gmail.com>
Subject: [Openvpn-devel] [PATCH] config-msvc.h: fix OpenSSL-related defines
Precedence: list
Cc: Lev Stipakov <lev@openvpn.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: openvpn-devel-bounces@lists.sourceforge.net

Series

[Openvpn-devel] config-msvc.h: fix OpenSSL-related defines | expand

Commit Message

Lev Stipakov Oct. 13, 2021, 2:04 p.m. UTC

From: Lev Stipakov <lev@openvpn.net>

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 <lev@openvpn.net>
---
 config-msvc.h | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

Comments

Gert Doering Oct. 14, 2021, 3:36 a.m. UTC | #1

Acked-by: Gert Doering <gert@greenie.muc.de>

This very much like it is "master only", and that's where it went :-)

Your patch has been applied to the master branch.

commit dd73b620f2bbb4ad9d3b9d43e5124911e48256f1
Author: Lev Stipakov
Date:   Thu Oct 14 04:04:36 2021 +0300

     config-msvc.h: fix OpenSSL-related defines

     Signed-off-by: Lev Stipakov <lev@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20211014010436.359-1-lstipakov@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22934.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

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

[Openvpn-devel] config-msvc.h: fix OpenSSL-related defines

Commit Message

Comments

Patch