aboutsummaryrefslogtreecommitdiff
path: root/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c
diff options
context:
space:
mode:
Diffstat (limited to 'security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c')
-rw-r--r--security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c28
1 files changed, 26 insertions, 2 deletions
diff --git a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c
index e0bc64247fc7..e27454eb3d28 100644
--- a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c
+++ b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c
@@ -1,6 +1,6 @@
---- lib/pkcs11h-openssl.c.orig 2022-10-20 14:36:14 UTC
+--- lib/pkcs11h-openssl.c.orig 2022-04-07 17:01:01 UTC
+++ lib/pkcs11h-openssl.c
-@@ -235,9 +235,13 @@ DSA_meth_free (DSA_METHOD *meth)
+@@ -235,9 +235,13 @@ DSA_meth_set1_name (DSA_METHOD *meth, const char *name
static int
DSA_meth_set1_name (DSA_METHOD *meth, const char *name)
{
@@ -14,3 +14,27 @@
}
#endif
+@@ -341,12 +345,22 @@ __pkcs11h_openssl_ex_data_dup (
+ long argl,
+ void *argp
+ ) {
+-#else
++#elif OPENSSL_VERSION_NUMBER < 0x30000000L
+ int
+ __pkcs11h_openssl_ex_data_dup (
+ CRYPTO_EX_DATA *to,
+ const CRYPTO_EX_DATA *from,
+ void *from_d,
++ int idx,
++ long argl,
++ void *argp
++) {
++#else
++int
++__pkcs11h_openssl_ex_data_dup (
++ CRYPTO_EX_DATA *to,
++ const CRYPTO_EX_DATA *from,
++ void **from_d,
+ int idx,
+ long argl,
+ void *argp