diff options
Diffstat (limited to 'security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c')
| -rw-r--r-- | security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c | 52 |
1 files changed, 17 insertions, 35 deletions
diff --git a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c index 99db16701bc0..b39df99149f3 100644 --- a/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c +++ b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c @@ -1,20 +1,6 @@ ---- lib/pkcs11h-openssl.c.orig 2022-04-07 17:01:01 UTC +--- lib/pkcs11h-openssl.c.orig 2024-09-04 08:44:23 UTC +++ lib/pkcs11h-openssl.c -@@ -235,9 +235,13 @@ DSA_meth_free (DSA_METHOD *meth) - static int - DSA_meth_set1_name (DSA_METHOD *meth, const char *name) - { -+#if (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L) -+ return 0; -+#else - CK_RV rv; - rv = _pkcs11h_mem_strdup ((void *)&meth->name, name); - return rv == CKR_OK ? 1 : 0; -+#endif - } - #endif - -@@ -330,7 +334,7 @@ static struct { +@@ -334,16 +334,26 @@ static struct { #endif } __openssl_methods; @@ -23,27 +9,23 @@ static int __pkcs11h_openssl_ex_data_dup ( -@@ -341,12 +345,22 @@ __pkcs11h_openssl_ex_data_dup ( + CRYPTO_EX_DATA *to, + CRYPTO_EX_DATA *from, +- void **from_d, ++ void *from_d, + int idx, 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 ++#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 ++ CRYPTO_EX_DATA *to, ++ const CRYPTO_EX_DATA *from, ++ void *from_d, ++ int idx, ++ long argl, ++ void *argp + ) { + #else + int |