pkcs11-helper: really fix for libressl-2.7

Some missing openssl-1.1 functions need to be defined.

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2018-04-27 17:48:02 +02:00
parent 886921f6a4
commit 955919b7ac
No known key found for this signature in database
GPG key ID: 6764EC32352D0647
2 changed files with 48 additions and 9 deletions

View file

@ -1,11 +1,50 @@
--- lib/pkcs11h-openssl.c 2017-02-11 23:13:00.000000000 +0100 --- lib/pkcs11h-openssl.c 2017-02-11 23:13:00.000000000 +0100
+++ lib/pkcs11h-openssl.c 2018-04-27 17:14:28.626339188 +0200 +++ lib/pkcs11h-openssl.c 2018-04-27 17:46:48.160261853 +0200
@@ -62,7 +62,7 @@ @@ -96,6 +96,7 @@
*/ };
#if defined(LIBRESSL_VERSION_NUMBER)
#undef OPENSSL_VERSION_NUMBER #if OPENSSL_VERSION_NUMBER < 0x10100001L
-#define OPENSSL_VERSION_NUMBER 0x1000107fL +#if !defined(LIBRESSL_VERSION_NUMBER)
+#define OPENSSL_VERSION_NUMBER 0x10100001 static RSA_METHOD *
RSA_meth_dup (const RSA_METHOD *meth)
{
@@ -123,6 +124,7 @@
_pkcs11h_mem_free ((void *)&meth);
}
}
+#endif /* defined(LIBRESSL_VERSION_NUMBER) */
static int
RSA_meth_set1_name (RSA_METHOD *meth, const char *name)
@@ -139,6 +141,7 @@
return 1;
}
+#if !defined(LIBRESSL_VERSION_NUMBER)
static int
RSA_meth_set_priv_enc (
RSA_METHOD *meth,
@@ -198,6 +201,7 @@
_pkcs11h_mem_free ((void *)&meth);
}
}
+#endif /* defined(LIBRESSL_VERSION_NUMBER) */
static int
DSA_meth_set1_name (DSA_METHOD *meth, const char *name)
@@ -207,6 +211,7 @@
return rv == CKR_OK ? 1 : 0;
}
+#if !defined(LIBRESSL_VERSION_NUMBER)
static int
DSA_meth_set_sign (DSA_METHOD *meth,
DSA_SIG *(*sign) (const unsigned char *, int, DSA *))
@@ -224,6 +229,7 @@
sig->s = s;
return 1;
}
+#endif /* defined(LIBRESSL_VERSION_NUMBER) */
#endif #endif
#if !defined(OPENSSL_NO_EC) && defined(ENABLE_PKCS11H_OPENSSL_EC) static struct {

View file

@ -1,7 +1,7 @@
# Template file for 'pkcs11-helper' # Template file for 'pkcs11-helper'
pkgname=pkcs11-helper pkgname=pkcs11-helper
version=1.22 version=1.22
revision=3 revision=4
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-doc" configure_args="--enable-doc"
hostmakedepends="automake libtool pkg-config doxygen" hostmakedepends="automake libtool pkg-config doxygen"