From patchwork Thu Oct 17 01:23:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 867 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id SB5FHSFeqF0CWwAAIUCqbw for ; Thu, 17 Oct 2019 08:27:13 -0400 Received: from proxy19.mail.iad3b.rsapps.net ([172.31.255.6]) by director11.mail.ord1d.rsapps.net with LMTP id aG1CGiFeqF1ANQAAvGGmqA ; Thu, 17 Oct 2019 08:27:13 -0400 Received: from smtp3.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy19.mail.iad3b.rsapps.net with LMTP id qACtEyFeqF0BEQAAIG4riQ ; Thu, 17 Oct 2019 08:27:13 -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.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: 71f9d784-f0d9-11e9-8f37-525400bb3479-1-1 Received: from [216.105.38.7] ([216.105.38.7:51014] helo=lists.sourceforge.net) by smtp3.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id D4/3B-26315-02E58AD5; Thu, 17 Oct 2019 08:27:13 -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 1iL4r9-0000Wk-C2; Thu, 17 Oct 2019 12:26:15 +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 1iL4r8-0000Wd-3E for openvpn-devel@lists.sourceforge.net; Thu, 17 Oct 2019 12:26:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=pTtMIBTfMgvnnJIoTNM/NwZyYTzYQuaP0JiDg3FYNHA=; b=QUvJLTLOIrEI7Oha7ZuFbyImrE P4oIhALFH10aWzhYtou7SZ61sCKpHJ5EQ3sq+95hVTGDZLXlaeYC/llFrqQ2r5og8BotIOZKP+fxw +wqgMFPf+VE+wfLJVIgqQMzi6Aa88Wbh4Olky8KAGqyvUYIALkZ6+V8O4Rr/ewyzwa6o=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=pTtMIBTfMgvnnJIoTNM/NwZyYTzYQuaP0JiDg3FYNHA=; b=ff/fTF3b9VUKjxutYLXSKn1qAI v0cEORE5QE34v8lZyzE61MuCvsLNuXZXFzLODV6pCmS28msaEZrYaAesAuudrXDA/z2IZCLISy7cV u/jnPDL/N2q933KWQYfuvuc8md97tait6EunHpauyi77UxbQLtjlustDPi0hJa9BBjPY=; Received: from mail-wm1-f65.google.com ([209.85.128.65]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iL4r4-00CNMq-OJ for openvpn-devel@lists.sourceforge.net; Thu, 17 Oct 2019 12:26:14 +0000 Received: by mail-wm1-f65.google.com with SMTP id i16so2354490wmd.3 for ; Thu, 17 Oct 2019 05:26:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=pTtMIBTfMgvnnJIoTNM/NwZyYTzYQuaP0JiDg3FYNHA=; b=Lhg+JpFlqUbLSj67wxt0X/po2rc+w6zdI3kukiAja1fNPjE4lZQIdQ5vo83aTr17AB l+4b3rHeolpRxLiWPx4E6hmuwHPsvIA0vSFQkSco2TjUpKJfxh2EIcVqfrIc6m9oIRT/ vGH+jOwhsV4WH11vpxTRBC1sl7RNPUMu8GcQmjr+sHI8z0N+1e4mCAeLjQ4bBKqt649Y EE30niHnSkcs8HYgNfAR4NP43rTMJRtBfUjSN9rXUHLPvikDM+6fR2kQe+06bN7i/YfA P+oyajjlFmkDUg7QlfxBYjIZhsajhD1En8m3uUlLnHjE0/bzkDf3qwOwDQBnVqhbbXjI p8tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pTtMIBTfMgvnnJIoTNM/NwZyYTzYQuaP0JiDg3FYNHA=; b=Ugy5EIFPyP62iZvQr5Hk3heDhEUksobNeAJoX2V9M4xW3uGwelfr13vOrlYtwdRii3 A7CTV+3Iaq697nAbFxYZzVuYQ+ymc3zpXmFaegplawNwmN0aR+cRX4BUVBkvpk0YshKw Zq62+/cExaI8f8CTl2RMIijtkqCmz6BdlhqkOZemNb6CWO/u/phApPS+RRrohe6hSq5/ WhbIRMLCpRrZD22OUtVcv76Yo6VK3kal0HeyfRB+azN4i9FJbAXcxj/5/bWPpnSoPXGi Ut3BEEDD8PCtC2fBFSZTO1fZ0ohrn8wGzBmMgZJ9HbSZk5OxWQQZdS6zLU/ARra4vYUs JN1w== X-Gm-Message-State: APjAAAUrxelKXKmLai2ccEiFQZ2MA91felmoGKEwIUlKvz/kjQi73I4t CAKu7H+XgElTPKiwvuDHOXzybixyU3ifqg== X-Google-Smtp-Source: APXvYqw6XjTTDvxkoAJfxl6XuYeijsfI5FKaMrxBlmO/DHsx9etGr5f/WIYctixpsIeS3s6nYw16ig== X-Received: by 2002:a1c:1f8d:: with SMTP id f135mr2642905wmf.156.1571315163445; Thu, 17 Oct 2019 05:26:03 -0700 (PDT) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id h17sm2585818wme.6.2019.10.17.05.26.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Oct 2019 05:26:02 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 17 Oct 2019 15:23:43 +0300 Message-Id: <1571315023-17044-1-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571304533-15614-1-git-send-email-lstipakov@gmail.com> References: <1571304533-15614-1-git-send-email-lstipakov@gmail.com> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.65 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.65 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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: 1iL4r4-00CNMq-OJ Subject: [Openvpn-devel] [PATCH v2] msvc: OpenSSL 1.1.x support 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Since we release Windows client with OpenSSL 1.1.0 (and will switch to 1.1.1 in the next release), it makes sense to use a newer version in VS build. This patch adds msvc-specific defines which imply that underlying OpenSSL is 1.1.x (works with 1.1.0 and 1.1.1). Also OpenSSL library names in project file are updated. Signed-off-by: Lev Stipakov Acked-by: Simon Rozman --- v2: clarify in comment and commit message that this supports 1.1.x, which is 1.1.0 and 1.1.1. config-msvc.h | 37 +++++++++++++++++++++++++++++++++++++ src/openvpn/openvpn.vcxproj | 8 ++++---- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/config-msvc.h b/config-msvc.h index 45fae8b..875da4a 100644 --- a/config-msvc.h +++ b/config-msvc.h @@ -76,6 +76,43 @@ #define HAVE_POLL 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 PATH_SEPARATOR '\\' #define PATH_SEPARATOR_STR "\\" diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj index 3b0ee60..4ffff2b 100644 --- a/src/openvpn/openvpn.vcxproj +++ b/src/openvpn/openvpn.vcxproj @@ -78,7 +78,7 @@ - legacy_stdio_definitions.lib;Ncrypt.lib;libeay32.lib;ssleay32.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies) + legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies) $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console @@ -91,7 +91,7 @@ - legacy_stdio_definitions.lib;Ncrypt.lib;libeay32.lib;ssleay32.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies) + legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies) $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console @@ -104,7 +104,7 @@ - legacy_stdio_definitions.lib;Ncrypt.lib;libeay32.lib;ssleay32.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies) + legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies) $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console @@ -117,7 +117,7 @@ - legacy_stdio_definitions.lib;Ncrypt.lib;libeay32.lib;ssleay32.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies) + legacy_stdio_definitions.lib;Ncrypt.lib;libssl.lib;libcrypto.lib;lzo2.lib;pkcs11-helper.dll.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;%(AdditionalDependencies) $(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories) Console