From patchwork Tue Jan 11 04:06:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2214 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.28.255.1]) by backend41.mail.ord1d.rsapps.net with LMTP id sAquAEqd3WEiKQAAqwncew (envelope-from ) for ; Tue, 11 Jan 2022 10:07:54 -0500 Received: from proxy5.mail.ord1c.rsapps.net ([172.28.255.1]) by director15.mail.ord1d.rsapps.net with LMTP id sKt+B0qd3WFnVAAAIcMcQg (envelope-from ) for ; Tue, 11 Jan 2022 10:07:54 -0500 Received: from smtp7.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1c.rsapps.net with LMTPS id yKYWB0qd3WGUDwAAPBRIyg (envelope-from ) for ; Tue, 11 Jan 2022 10:07:54 -0500 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: smtp7.gate.ord1c.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: 3fc91536-72f0-11ec-84db-bc305bf04148-1-1 Received: from [216.105.38.7] ([216.105.38.7:47354] helo=lists.sourceforge.net) by smtp7.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 68/6F-24080-94D9DD16; Tue, 11 Jan 2022 10:07:53 -0500 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.94.2) (envelope-from ) id 1n7IjO-0004AZ-8r; Tue, 11 Jan 2022 15:06:37 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n7IjN-0004AP-Bw for openvpn-devel@lists.sourceforge.net; Tue, 11 Jan 2022 15:06:36 +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=u5PhAEka22Sm6gZ4/dU/Q5Rlzc3f8XMbFK77impO9ZE=; b=UOS/XKhaODfc24xykqG+YrDRwq mfHWr1aYNwe8OofzrbLwe35l/JK1V7u6etDM5Mz4V26Y9jjkYZcwmAsUaylrCC7QfaA7cv4au0Ntt efVZaWJ7BRMhEEk8YWEEW5I4aa/xxcRxJBqjnilODqFKvnpLgQZJ8EDLg75dHhwStK50=; 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=u5PhAEka22Sm6gZ4/dU/Q5Rlzc3f8XMbFK77impO9ZE=; b=j+fuCSvhjIqK0kW6DtQHncu5GV oRWK1esl8DObHUWcXxAP/QXSBnkei8xHnoaxemCUyK2aajlbL3rf2b0TWHbn3pwdLcn3rFd1Bbh7U R6yyKgZOxblmKauqDYY2wk8zEO6a1zl27Qc1DgMOsMU/ECh1/o25Qqun+kLYbmj8LoII=; Received: from mail-lf1-f44.google.com ([209.85.167.44]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1n7IjL-0008SG-C1 for openvpn-devel@lists.sourceforge.net; Tue, 11 Jan 2022 15:06:36 +0000 Received: by mail-lf1-f44.google.com with SMTP id h2so57350638lfv.9 for ; Tue, 11 Jan 2022 07:06:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=u5PhAEka22Sm6gZ4/dU/Q5Rlzc3f8XMbFK77impO9ZE=; b=gpyWkEHBqoiPLTRDBm/4lfNssWpAxCBwFu0H/x1TXdYXQUEnl4v2weg1PnvXE+Diff BfoA9j1pHFT4HtZfUNQcQ4mggUTxTPLoTD9EV8xxlYISZLGBQdR9bF1iVTdfobVxhmKc APvRnsCUk2mEB4ptbdcNiOVVgxhlvfE80ZIaHQ8rqn4le+F/SwOh77BgIj6qcnM9vAqG NAJxP3SnU+HOSe8/sr3H8NYnGhQ/J/O9gaScVXpD0HmtGE+L8gs1cATMso+Sk56ft8c1 JfaqwnFme4je3dKCoqHJKUTOn3rgTvwLIC6Cw/9j45yhxhIKBjLHaDpgRLOLr7C69oOx SzWA== 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=u5PhAEka22Sm6gZ4/dU/Q5Rlzc3f8XMbFK77impO9ZE=; b=DtlooQ93YUzgslEMC6GLd6+O6VijS6/hZkCcsjNj0MSamNBAOKnbqnOkenpa8l//GH Tru4MIC0mLbapoH0kyaCjtEuMm03HMWLpJqGncyPAL7j0cChj2XrWfyyOhQ4RE6gb8sV ql8uFkJAhDTzXvKw5u9Rf8st0hyNeQKtpHNy1kB03r7diGSlZkfQtLsbUK9axHcjoP/7 PGOng0cDOXgNAkKp4NZJICAVYNXVMvJu5pFtQrsPCaq1Zyr3FDNoiZDBWwPocEuutzjU Dhg1uNEFWEUu2b09nJfbmbZDki68KxIweJN/iyfXapGJ6AIGskZ1LzY9nN29FZnhV9+k nBMw== X-Gm-Message-State: AOAM530cdbPS5tnDDGS9zNeUXXt4UN4d+/yuzqr2zHg4tNVdFhkst2Lh dd/uHyS5bbgYRDJ2h59+kQp9GDlwr/g= X-Google-Smtp-Source: ABdhPJxKsO01jmJxRD4vO7AELEa+DlOpduyQ6940LkwYmb/+APMukc7EPUQ3FB+AmjlKhQGAXc66Ww== X-Received: by 2002:a19:8c4b:: with SMTP id i11mr3705000lfj.81.1641913587494; Tue, 11 Jan 2022 07:06:27 -0800 (PST) Received: from LAPTOP-4L3N7KFS.localdomain (37-33-237-42.bb.dnainternet.fi. [37.33.237.42]) by smtp.gmail.com with ESMTPSA id v28sm414252lfg.101.2022.01.11.07.06.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 07:06:27 -0800 (PST) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Tue, 11 Jan 2022 17:06:05 +0200 Message-Id: <20220111150605.208-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 This release has merged openssl 1.1.1 support patch, so our own patch could be removed from the port. Remove unconditional /release flag, which is added by vcpkg for release builds. Having this flag unconditionally breaks vcpkg debug builds. Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.44 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.44 listed in list.dnswl.org] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-Headers-End: 1n7IjL-0008SG-C1 Subject: [Openvpn-devel] [PATCH master+2.5] vcpkg-ports/pkcs11-helper: bump to release 1.28 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 This release has merged openssl 1.1.1 support patch, so our own patch could be removed from the port. Remove unconditional /release flag, which is added by vcpkg for release builds. Having this flag unconditionally breaks vcpkg debug builds. Signed-off-by: Lev Stipakov --- ...make-compatibility-with-vcpkg-nmake.patch} | 8 +- .../0001-nmake-openssl-1.1.1-support.patch | 88 ------------------- ...-pkcs11.h-rename-interface-parameter.patch | 32 +++++++ contrib/vcpkg-ports/pkcs11-helper/CONTROL | 2 +- .../vcpkg-ports/pkcs11-helper/portfile.cmake | 8 +- 5 files changed, 41 insertions(+), 97 deletions(-) rename contrib/vcpkg-ports/pkcs11-helper/{0002-nmake-compatibility-with-vcpkg-nmake.patch => 0001-nmake-compatibility-with-vcpkg-nmake.patch} (81%) delete mode 100644 contrib/vcpkg-ports/pkcs11-helper/0001-nmake-openssl-1.1.1-support.patch create mode 100644 contrib/vcpkg-ports/pkcs11-helper/0002-pkcs11.h-rename-interface-parameter.patch diff --git a/contrib/vcpkg-ports/pkcs11-helper/0002-nmake-compatibility-with-vcpkg-nmake.patch b/contrib/vcpkg-ports/pkcs11-helper/0001-nmake-compatibility-with-vcpkg-nmake.patch similarity index 81% rename from contrib/vcpkg-ports/pkcs11-helper/0002-nmake-compatibility-with-vcpkg-nmake.patch rename to contrib/vcpkg-ports/pkcs11-helper/0001-nmake-compatibility-with-vcpkg-nmake.patch index a6034f7e..add47093 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/0002-nmake-compatibility-with-vcpkg-nmake.patch +++ b/contrib/vcpkg-ports/pkcs11-helper/0001-nmake-compatibility-with-vcpkg-nmake.patch @@ -1,6 +1,6 @@ -From 68d12f3e955cc9df435e9289b1244a4c1f24b96b Mon Sep 17 00:00:00 2001 +From 2d3a2c05383f653544b9c7194dd1349c6d5f3067 Mon Sep 17 00:00:00 2001 From: Lev Stipakov -Date: Wed, 24 Nov 2021 11:21:36 +0200 +Date: Tue, 11 Jan 2022 13:24:51 +0200 Subject: [PATCH] nmake: compatibility with vcpkg nmake Remove options which contradict or already set @@ -12,7 +12,7 @@ Signed-off-by: Lev Stipakov 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/Makefile.w32-vc b/lib/Makefile.w32-vc -index 0e64f42..18af03b 100644 +index 96f1f89..be68a00 100644 --- a/lib/Makefile.w32-vc +++ b/lib/Makefile.w32-vc @@ -75,15 +75,11 @@ OPENSSL_LIBS=-LIBPATH:$(OPENSSL_LIB) user32.lib advapi32.lib $(OPENSSL_STATIC) @@ -27,7 +27,7 @@ index 0e64f42..18af03b 100644 LINK32=link.exe LIB32=lib.exe --LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no +-LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no /release -LIB32_FLAGS=/nologo +LINK32_FLAGS=/dll diff --git a/contrib/vcpkg-ports/pkcs11-helper/0001-nmake-openssl-1.1.1-support.patch b/contrib/vcpkg-ports/pkcs11-helper/0001-nmake-openssl-1.1.1-support.patch deleted file mode 100644 index d1942a98..00000000 --- a/contrib/vcpkg-ports/pkcs11-helper/0001-nmake-openssl-1.1.1-support.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 324026ce179468fcea348e59259dbc5456438ead Mon Sep 17 00:00:00 2001 -From: Lev Stipakov -Date: Fri, 14 May 2021 14:35:53 +0300 -Subject: [PATCH] nmake: openssl 1.1.1 support - -Starting from version 1.1.1, OpenSSL includes routines -like RSA_meth_xxx and DSA_meth_xxx. pkcs11-helper includes -implementation of those routines. That code is compiled if -they're missing from OpenSSL. - -nmake build uses pre-generated config-w32-vc.h, which lacks -defines which indicate that OpenSSL includes above routines, -which causes pkcs11's own implementaion to be compiled. However, -pkcs11-helper implementation is not compatible with OpenSSL 1.1.1 - -for example, it takes size of opaque struct RSA_METHOD, which -has become internal in OpenSSL. - -This adds necessary defines to config header used by nmake build -so that pkcs11-helper code, which is not compatible with OpenSSL 1.1.1, -is not compiled. - -Also libeay is changed to libcrypto. - -Signed-off-by: Lev Stipakov ---- - config-w32-vc.h.in | 33 +++++++++++++++++++++++++++++++++ - lib/Makefile.w32-vc | 4 ++-- - 2 files changed, 35 insertions(+), 2 deletions(-) - -diff --git a/config-w32-vc.h b/config-w32-vc.h -index 6346f02..102b2e3 100644 ---- a/config-w32-vc.h -+++ b/config-w32-vc.h -@@ -185,3 +185,36 @@ - #if _MSC_VER >= 1400 - #define HAVE_CPP_VARARG_MACRO_ISO 1 - #endif -+ -+/* Define to 1 if you have the `RSA_meth_dup' function. */ -+#define HAVE_RSA_METH_DUP 1 -+ -+/* Define to 1 if you have the `RSA_meth_free' function. */ -+#define HAVE_RSA_METH_FREE 1 -+ -+/* Define to 1 if you have the `RSA_meth_set1_name' function. */ -+#define HAVE_RSA_METH_SET1_NAME 1 -+ -+/* Define to 1 if you have the `RSA_meth_set_flags' function. */ -+#define HAVE_RSA_METH_SET_FLAGS 1 -+ -+/* Define to 1 if you have the `RSA_meth_set_priv_dec' function. */ -+#define HAVE_RSA_METH_SET_PRIV_DEC 1 -+ -+/* Define to 1 if you have the `RSA_meth_set_priv_enc' function. */ -+#define HAVE_RSA_METH_SET_PRIV_ENC 1 -+ -+/* Define to 1 if you have the `DSA_meth_dup' function. */ -+#define HAVE_DSA_METH_DUP 1 -+ -+/* Define to 1 if you have the `DSA_meth_free' function. */ -+#define HAVE_DSA_METH_FREE 1 -+ -+/* Define to 1 if you have the `DSA_meth_set1_name' function. */ -+#define HAVE_DSA_METH_SET1_NAME 1 -+ -+/* Define to 1 if you have the `DSA_meth_set_sign' function. */ -+#define HAVE_DSA_METH_SET_SIGN 1 -+ -+/* Define to 1 if you have the `DSA_SIG_set0' function. */ -+#define HAVE_DSA_SIG_SET0 1 -diff --git a/lib/Makefile.w32-vc b/lib/Makefile.w32-vc -index 2edab39..b2ac746 100644 ---- a/lib/Makefile.w32-vc -+++ b/lib/Makefile.w32-vc -@@ -60,9 +60,9 @@ OPENSSL_HOME = ..\..\openssl-0.9.8a - !endif - - !ifdef OPENSSL --OPENSSL_STATIC = libeay32.lib -+OPENSSL_STATIC = libcrypto.lib - #OPENSSL_STATIC = libeay32sd.lib --OPENSSL_DYNAMIC = libeay32.lib -+OPENSSL_DYNAMIC = libcrypto.lib - #OPENSSL_DYNAMIC = libeay32d.lib - - OPENSSL_INC=$(OPENSSL_HOME)\include --- -2.23.0.windows.1 diff --git a/contrib/vcpkg-ports/pkcs11-helper/0002-pkcs11.h-rename-interface-parameter.patch b/contrib/vcpkg-ports/pkcs11-helper/0002-pkcs11.h-rename-interface-parameter.patch new file mode 100644 index 00000000..13c60d9d --- /dev/null +++ b/contrib/vcpkg-ports/pkcs11-helper/0002-pkcs11.h-rename-interface-parameter.patch @@ -0,0 +1,32 @@ +From 0c2f862fe23dc6d2c0ca8432d1f6027c922c5a04 Mon Sep 17 00:00:00 2001 +From: Lev Stipakov +Date: Tue, 11 Jan 2022 14:24:45 +0200 +Subject: [PATCH] pkcs11.h: rename "interface" parameter + +"interface" is defined in cobaseapi.h as + + #define interface __STRUCT__ + +so use different name. + +Signed-off-by: Lev Stipakov +--- + include/pkcs11-helper-1.0/pkcs11.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/pkcs11-helper-1.0/pkcs11.h b/include/pkcs11-helper-1.0/pkcs11.h +index 85aa98e..7a7b958 100644 +--- a/include/pkcs11-helper-1.0/pkcs11.h ++++ b/include/pkcs11-helper-1.0/pkcs11.h +@@ -1210,7 +1210,7 @@ _CK_DECLARE_FUNCTION (C_GetInterfaceList, + _CK_DECLARE_FUNCTION (C_GetInterface, + (unsigned char *interface_name, + struct ck_version *version, +- struct ck_interface **interface, ++ struct ck_interface **iface, + ck_flags_t flags)); + + _CK_DECLARE_FUNCTION (C_LoginUser, +-- +2.23.0.windows.1 + diff --git a/contrib/vcpkg-ports/pkcs11-helper/CONTROL b/contrib/vcpkg-ports/pkcs11-helper/CONTROL index 01831802..372d420a 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/CONTROL +++ b/contrib/vcpkg-ports/pkcs11-helper/CONTROL @@ -1,4 +1,4 @@ Source: pkcs11-helper -Version: 1.27-1 +Version: 1.28-1 Homepage: https://github.com/OpenSC/pkcs11-helper Description: pkcs11-helper is a library that simplifies the interaction with PKCS#11 providers for end-user applications. diff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake index ad19fccb..d8dee3f6 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake +++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake @@ -1,9 +1,9 @@ -set(VERSION 1.27) +set(VERSION 1.28) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${VERSION}/pkcs11-helper-${VERSION}.0.tar.bz2" FILENAME "pkcs11-helper-${VERSION}.tar.bz2" - SHA512 5799342cb755dae8b7ba0880d652e9d4b4f1e52a74043015e1185e1e059326cb2689bb51957db98060ac2257dee34e2f047dcf3d52ad59fd49b91fedcfc5332b + SHA512 11b8e554d9223ab9305a3ad7e2b6a9bbece1c09ca8d49276618dec31eefdccf6a32b0db85a28a90334ea42fe809beec83514a31930b79bdbefa368ed4658945b ) vcpkg_extract_source_archive_ex( @@ -11,8 +11,8 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} REF ${VERSION} PATCHES - 0001-nmake-openssl-1.1.1-support.patch - 0002-nmake-compatibility-with-vcpkg-nmake.patch + 0001-nmake-compatibility-with-vcpkg-nmake.patch + 0002-pkcs11.h-rename-interface-parameter.patch pkcs11-helper-001-RFC7512.patch )