From patchwork Wed Oct 16 22:28:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 866 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id EBAdIjQ1qF2UCgAAIUCqbw for ; Thu, 17 Oct 2019 05:32:36 -0400 Received: from proxy9.mail.ord1d.rsapps.net ([172.30.191.6]) by director8.mail.ord1d.rsapps.net with LMTP id SGEHIjQ1qF0GPQAAfY0hYg ; Thu, 17 Oct 2019 05:32:36 -0400 Received: from smtp28.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy9.mail.ord1d.rsapps.net with LMTP id QAigITQ1qF1iCwAA7h+8OQ ; Thu, 17 Oct 2019 05:32:36 -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: smtp28.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: 0d787fa8-f0c1-11e9-9124-525400ea129b-1-1 Received: from [216.105.38.7] ([216.105.38.7:56826] helo=lists.sourceforge.net) by smtp28.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 2C/35-02522-43538AD5; Thu, 17 Oct 2019 05:32:36 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1iL28O-00042I-J7; Thu, 17 Oct 2019 09:31:52 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1iL28M-00042B-PA for openvpn-devel@lists.sourceforge.net; Thu, 17 Oct 2019 09:31: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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=h83hcRhZBLzYachyinpPrQyOxyEnIojt/8qbNdfohjQ=; b=NDH2teUVG+uHMu4srX6iYwm3Yx ed0URvqfZqQQuj/1GRSPRWzMfLrJ/E6J71p4XpH729th/x784lfpSp79JWTlh9Xn0IfO0FqCXl+ZS QQMzAYRb6HxXDIO6lYyLmcjKujxQVep8VkW1bfxPryCACe9rKhgvW5anKUMGjwlAY0NE=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=h83hcRhZBLzYachyinpPrQyOxyEnIojt/8qbNdfohjQ=; b=Ul2SaBV7x16BWlKe1FoZqU4k8+ 7iVfDR6s+suQkgt4dHLS35wydVQCCXDp0w1HGlJKbLrEq8BGHIoHRp2146cRVseM5hSsWyRtxXe0x IzIRCIzxnvbkOn3gMW6BkRsHG1MFCkXVEi2EWrE704VXGBY1QyuhhYyvu42mj2DEQzk8=; Received: from mail-wm1-f67.google.com ([209.85.128.67]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iL28L-00CFBm-DM for openvpn-devel@lists.sourceforge.net; Thu, 17 Oct 2019 09:31:50 +0000 Received: by mail-wm1-f67.google.com with SMTP id b24so1757430wmj.5 for ; Thu, 17 Oct 2019 02:31:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=h83hcRhZBLzYachyinpPrQyOxyEnIojt/8qbNdfohjQ=; b=a1JmWJSWAV10ISTlutddpk7hLXhr0iyEMKpDFYQBYvs3GWDG7VN2VYdL5pxphzVta7 pQtuIJ4HAL2nmGssRGqh3/XfFA7V9W2qCFJhjZKg/52pKg46DNllUQKnA21y10BIszuh Je0ZM2qETLeIX4T+KvZY0veZ47DjsgKtSjSmDHzqd1YWiEwIBCfaDkleUJw5ceUDaJTR WUTnC5rRvPB8gtatOC/e5xvcYT7CRvR1ZEbwjc4+SNmk3qN0KsnS2i/tH9p3E1O3x9kq +mvOMtcf5aFUXEXQkj/dBAA8E1daHAXupBCMEU50y9XKaha3N8tOOxk7MTVcOHCF6Aug Tu/g== 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; bh=h83hcRhZBLzYachyinpPrQyOxyEnIojt/8qbNdfohjQ=; b=ScmNDQ9konN+HqRsuI5W0jF1N9dY9vmawpwTlmiyu+V53zOZo1ZCFeHu56egS2joXp YVkkzoFGit3KnDMXLakSbUeALkn54Sya+zEyMj3k0yrBLM2you0FxVRXdu4Ib/xzeh6b 82ou403WkxpwGXhYUzK+6JCQeH6dpFg6iLVbXVn9l0HQIkcyElXmdnYbOkoinvXcFimZ xtY+AD8myWNMVxolBYel9y9TIDnnUt+WEkyc1qYCiCq8sTt8uEjI8i38QmNZa19M2rwp 9b2HdItnltMLDJ5LBhVHO6I/lxiZp4f+tZKKz27zcMEZUWWqgq9FmKQAy6kEpnjRQdFP sT7w== X-Gm-Message-State: APjAAAVBjlQPgemf1K6PY/nfDLioy4zULUb1N+Q+eL+rSPic0mCh/YJh ih30TRJa/wEzauwEtvoqlXdLb2TUzT4= X-Google-Smtp-Source: APXvYqxkKEmbLOFWBFCgZp00TgYOS0gCfuOFDPdW+xa9CyPqUpi3IBXJiLbCdRK/4yiqTFE9HBmZhA== X-Received: by 2002:a1c:7f4e:: with SMTP id a75mr1980961wmd.68.1571304702268; Thu, 17 Oct 2019 02:31:42 -0700 (PDT) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id p15sm1544752wrs.94.2019.10.17.02.31.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Oct 2019 02:31:41 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 17 Oct 2019 12:28:53 +0300 Message-Id: <1571304533-15614-1-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 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.67 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.67 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: 1iL28L-00CFBm-DM Subject: [Openvpn-devel] [PATCH] msvc: OpenSSL 1.1.0 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 From: Lev Stipakov Since we release Windows client with OpenSSL 1.1.0, it makes sense to switch to this version in VS build. This patch adds msvc-specific defines which imply that underlying OpenSSL is 1.1.0. Also OpenSSL library names in project file are updated. Signed-off-by: Lev Stipakov --- 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..2f2d98f 100644 --- a/config-msvc.h +++ b/config-msvc.h @@ -76,6 +76,43 @@ #define HAVE_POLL 1 #define HAVE_OPENSSL_ENGINE 1 +/* hardcode OpenSSL 1.1.0 support */ +#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