From: Lev Stipakov Date: Wed, 13 Oct 2021 23:04:42 +0000 (+0300) Subject: config-msvc.h: fix OpenSSL-related defines X-Git-Tag: v2.5.5~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c93fcb75782f44a3feb9dba2292a891e579adac4;p=thirdparty%2Fopenvpn.git config-msvc.h: fix OpenSSL-related defines 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 Message-Id: <20211013230442.305-1-lstipakov@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22933.html Signed-off-by: Gert Doering --- diff --git a/config-msvc.h b/config-msvc.h index f199bb2ce..a39eeed8a 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 '\\'