|
Lines 1-6
Link Here
|
| 1 |
--- lib/pkcs11h-openssl.c.orig 2022-10-20 14:36:14 UTC |
1 |
--- lib/pkcs11h-openssl.c.orig 2022-04-07 17:01:01 UTC |
| 2 |
+++ lib/pkcs11h-openssl.c |
2 |
+++ lib/pkcs11h-openssl.c |
| 3 |
@@ -235,9 +235,13 @@ DSA_meth_free (DSA_METHOD *meth) |
3 |
@@ -235,9 +235,13 @@ DSA_meth_set1_name (DSA_METHOD *meth, const char *name |
| 4 |
static int |
4 |
static int |
| 5 |
DSA_meth_set1_name (DSA_METHOD *meth, const char *name) |
5 |
DSA_meth_set1_name (DSA_METHOD *meth, const char *name) |
| 6 |
{ |
6 |
{ |
|
Lines 14-16
Link Here
|
| 14 |
} |
14 |
} |
| 15 |
#endif |
15 |
#endif |
| 16 |
|
16 |
|
| 17 |
- |
17 |
@@ -341,12 +345,22 @@ __pkcs11h_openssl_ex_data_dup ( |
|
|
18 |
long argl, |
| 19 |
void *argp |
| 20 |
) { |
| 21 |
-#else |
| 22 |
+#elif OPENSSL_VERSION_NUMBER < 0x30000000L |
| 23 |
int |
| 24 |
__pkcs11h_openssl_ex_data_dup ( |
| 25 |
CRYPTO_EX_DATA *to, |
| 26 |
const CRYPTO_EX_DATA *from, |
| 27 |
void *from_d, |
| 28 |
+ int idx, |
| 29 |
+ long argl, |
| 30 |
+ void *argp |
| 31 |
+) { |
| 32 |
+#else |
| 33 |
+int |
| 34 |
+__pkcs11h_openssl_ex_data_dup ( |
| 35 |
+ CRYPTO_EX_DATA *to, |
| 36 |
+ const CRYPTO_EX_DATA *from, |
| 37 |
+ void **from_d, |
| 38 |
int idx, |
| 39 |
long argl, |
| 40 |
void *argp |