security/pkcs11-helper: sync with upstream
Taken from: FreeBSD
This commit is contained in:
parent
30558683d1
commit
7905ddecd7
1 changed files with 10 additions and 1 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
--- lib/pkcs11h-openssl.c.orig 2022-04-07 17:01:01 UTC
|
--- lib/pkcs11h-openssl.c.orig 2022-04-07 17:01:01 UTC
|
||||||
+++ lib/pkcs11h-openssl.c
|
+++ lib/pkcs11h-openssl.c
|
||||||
@@ -235,9 +235,13 @@ DSA_meth_set1_name (DSA_METHOD *meth, const char *name
|
@@ -235,9 +235,13 @@ DSA_meth_free (DSA_METHOD *meth)
|
||||||
static int
|
static int
|
||||||
DSA_meth_set1_name (DSA_METHOD *meth, const char *name)
|
DSA_meth_set1_name (DSA_METHOD *meth, const char *name)
|
||||||
{
|
{
|
||||||
|
|
@ -14,6 +14,15 @@
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -330,7 +334,7 @@ static struct {
|
||||||
|
#endif
|
||||||
|
} __openssl_methods;
|
||||||
|
|
||||||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100001L
|
||||||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100001L || defined(LIBRESSL_VERSION_NUMBER)
|
||||||
|
static
|
||||||
|
int
|
||||||
|
__pkcs11h_openssl_ex_data_dup (
|
||||||
@@ -341,12 +345,22 @@ __pkcs11h_openssl_ex_data_dup (
|
@@ -341,12 +345,22 @@ __pkcs11h_openssl_ex_data_dup (
|
||||||
long argl,
|
long argl,
|
||||||
void *argp
|
void *argp
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue