Merge pull request #459 from ricardosalveti/hsm

Update softhsm and libp11 to latest

1 files changed, 0 insertions, 42 deletions

diff --git a/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch b/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch
deleted file mode 100644
index 55f2ed3..0000000
--- a/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ccab5ce63dd5d3dbb4bd02998d21d34407e550f2 Mon Sep 17 00:00:00 2001
-From: Anton Gerasimov <anton.gerasimov@here.com>
-Date: Fri, 19 Jan 2018 12:44:27 +0100
-Subject: [PATCH] Workaround for a buggy version of openssl (1.0.2m)
-
----
- src/p11_pkey.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/p11_pkey.c b/src/p11_pkey.c
-index 45d5ad3..75625e6 100644
---- a/src/p11_pkey.c
-+++ b/src/p11_pkey.c
-@@ -139,8 +139,14 @@ static void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src)
- 
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x100020d0L || defined(LIBRESSL_VERSION_NUMBER)
--static void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
-+#if OPENSSL_VERSION_NUMBER < 0x10002110L || defined(LIBRESSL_VERSION_NUMBER)
-+
-+#  if (OPENSSL_VERSION_NUMBER & 0xFFFFFFF0) == 0x100020d0L
-+#    undef EVP_PKEY_meth_get_sign
-+#    undef EVP_PKEY_meth_get_decrypt
-+#  endif
-+
-+void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
-                int (**psign_init) (EVP_PKEY_CTX *ctx),
-                int (**psign) (EVP_PKEY_CTX *ctx,
-                        unsigned char *sig, size_t *siglen,
-@@ -152,7 +158,7 @@ static void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
-                *psign = pmeth->sign;
- }
- 
--static void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth,
-+void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth,
-                int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
-                int (**pdecrypt) (EVP_PKEY_CTX *ctx,
-                        unsigned char *out,
--- 
-2.15.1
-