| Message ID | 20220111150647.267-1-lstipakov@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel,master+2.5] vcpkg-ports/pkcs11-helper: indicate OpenSSL EC support | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> As stated before, I have no idea what this does - but it doesn't touch code or MinGW building (= not tested anything) and looks reasonable for the purpose described. It would be good to have 2.5 test installers with this, to verify that PKCS#11 and EC do work now... Your patch has been applied to the master branch. commit 95b076144933e04782c031182669523dab457f15 (master) commit a184e790df801bd074619f2c90992866d40d8c3b (HEAD -> release/2.5) Author: Lev Stipakov Date: Tue Jan 11 17:06:47 2022 +0200 vcpkg-ports/pkcs11-helper: indicate OpenSSL EC support Signed-off-by: Lev Stipakov <lev@openvpn.net> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20220111150647.267-1-lstipakov@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23527.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL-EC-support.patch b/contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL-EC-support.patch new file mode 100644 index 00000000..212181a7 --- /dev/null +++ b/contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL-EC-support.patch @@ -0,0 +1,33 @@ +From c2293864de70fec322fe7e559055530ef56b9641 Mon Sep 17 00:00:00 2001 +From: Lev Stipakov <lev@openvpn.net> +Date: Tue, 11 Jan 2022 13:35:42 +0200 +Subject: [PATCH] config-w32-vc.h.in: indicate OpenSSL EC support + +Signed-off-by: Lev Stipakov <lev@openvpn.net> +--- + config-w32-vc.h.in | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/config-w32-vc.h b/config-w32-vc.h +index 6d94841..db83825 100644 +--- a/config-w32-vc.h ++++ b/config-w32-vc.h +@@ -218,3 +218,15 @@ + + /* Define to 1 if you have the `DSA_SIG_set0' function. */ + #define HAVE_DSA_SIG_SET0 1 ++ ++/* Define to 1 if you have the `ECDSA_SIG_set0' function. */ ++#define HAVE_ECDSA_SIG_SET0 1 ++ ++/* Define to 1 if you have the `EC_KEY_METHOD_get_sign' function. */ ++#define HAVE_EC_KEY_METHOD_GET_SIGN 1 ++ ++/* Define to 1 if you have the `EC_KEY_METHOD_set_sign' function. */ ++#define HAVE_EC_KEY_METHOD_SET_SIGN 1 ++ ++/* Define to 1 if OpenSSL has EC support. */ ++#define ENABLE_PKCS11H_OPENSSL_EC 1 +-- +2.23.0.windows.1 + diff --git a/contrib/vcpkg-ports/pkcs11-helper/CONTROL b/contrib/vcpkg-ports/pkcs11-helper/CONTROL index 372d420a..6a5077fd 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/CONTROL +++ b/contrib/vcpkg-ports/pkcs11-helper/CONTROL @@ -1,4 +1,4 @@ Source: pkcs11-helper -Version: 1.28-1 +Version: 1.28-3 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 d8dee3f6..532aa69b 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake +++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex( PATCHES 0001-nmake-compatibility-with-vcpkg-nmake.patch 0002-pkcs11.h-rename-interface-parameter.patch + 0003-config-w32-vc.h.in-indicate-OpenSSL-EC-support.patch pkcs11-helper-001-RFC7512.patch )