1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
diff -urN libp11-0.4.11.orig/src/p11_pkey.c libp11-0.4.11/src/p11_pkey.c
--- libp11-0.4.11.orig/src/p11_pkey.c 2022-04-03 22:46:06.258227409 +0200
+++ libp11-0.4.11/src/p11_pkey.c 2022-04-03 22:47:56.740220036 +0200
@@ -79,7 +79,7 @@
#define EVP_PKEY_FLAG_DYNAMIC 1
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10002000L
typedef struct {
int nbits;
@@ -94,7 +94,7 @@
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10002000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3000100L )
+#if OPENSSL_VERSION_NUMBER < 0x10002000L
static int EVP_PKEY_CTX_get_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD **pmd)
{
@@ -107,7 +107,7 @@
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10002000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3010000L )
+#if OPENSSL_VERSION_NUMBER < 0x10002000L
static int EVP_PKEY_CTX_get_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD **pmd)
{
@@ -621,7 +621,7 @@
BIGNUM *r = BN_bin2bn(sig, size/2, NULL);
BIGNUM *s = BN_bin2bn(sig + size/2, size/2, NULL);
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
ECDSA_SIG_set0(ossl_sig, r, s);
#else
BN_free(ossl_sig->r);
|
