View | Details | Raw Unified | Return to bug 272190 | Differences between
and this patch

Collapse All | Expand All

(-)b/security/pkcs11-helper/files/patch-lib_pkcs11h-openssl.c (-2 / +41 lines)
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 
@@ -330,28 +334,32 @@ static struct {
18 
 #endif
19 
 } __openssl_methods;
20
21 
-#if OPENSSL_VERSION_NUMBER < 0x10100001L
22 
 static
23 
 int
24 
 __pkcs11h_openssl_ex_data_dup (
25 
+#if OPENSSL_VERSION_NUMBER < 0x10100001L
26 
 	CRYPTO_EX_DATA *to,
27 
 	CRYPTO_EX_DATA *from,
28 
 	void *from_d,
29 
 	int idx,
30 
 	long argl,
31 
 	void *argp
32 
-) {
33 
-#else
34 
-int
35 
-__pkcs11h_openssl_ex_data_dup (
36 
+#elif OPENSSL_VERSION_NUMBER < 0x30000000L
37 
 	CRYPTO_EX_DATA *to,
38 
 	const CRYPTO_EX_DATA *from,
39 
 	void *from_d,
40 
 	int idx,
41 
 	long argl,
42 
 	void *argp
43 
-) {
44 
+#else
45 
+	CRYPTO_EX_DATA *to,
46 
+	const CRYPTO_EX_DATA *from,
47 
+	void **from_d,
48 
+	int idx,
49 
+	long argl,
50 
+	void *argp
51 
 #endif
52 
+) {
53 
 	pkcs11h_openssl_session_t openssl_session;
54
55 
 	_PKCS11H_DEBUG (

Return to bug 272190