diff -urN libp11-0.4.11.orig/src/p11_rsa.c libp11-0.4.11/src/p11_rsa.c --- libp11-0.4.11.orig/src/p11_rsa.c 2022-04-03 22:25:33.712309664 +0200 +++ libp11-0.4.11/src/p11_rsa.c 2022-04-03 22:28:11.811299113 +0200 @@ -223,7 +223,7 @@ rsa = RSA_new(); if (!rsa) goto failure; -#if OPENSSL_VERSION_NUMBER >= 0x10100005L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100005L RSA_set0_key(rsa, rsa_n, rsa_e, NULL); #else rsa->n = rsa_n; @@ -275,7 +275,7 @@ if (key->isPrivate) { RSA_set_method(rsa, PKCS11_get_rsa_method()); -#if OPENSSL_VERSION_NUMBER >= 0x10100005L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100005L RSA_set_flags(rsa, RSA_FLAG_EXT_PKEY); #else rsa->flags |= RSA_FLAG_EXT_PKEY; @@ -301,7 +301,7 @@ if (!rsa) return 0; -#if OPENSSL_VERSION_NUMBER >= 0x10100005L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100005L RSA_get0_key(rsa, &rsa_n, NULL, NULL); #else rsa_n=rsa->n; @@ -318,7 +318,7 @@ if (!rsa) return 0; -#if OPENSSL_VERSION_NUMBER >= 0x10100005L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100005L RSA_get0_key(rsa, NULL, &rsa_e, NULL); #else rsa_e=rsa->e; @@ -336,7 +336,7 @@ return RSA_size(rsa); } -#if OPENSSL_VERSION_NUMBER < 0x10100005L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100005L int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth)) (int flen, const unsigned char *from, @@ -418,7 +418,7 @@ #endif } -#if OPENSSL_VERSION_NUMBER < 0x10100005L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2080000L ) +#if OPENSSL_VERSION_NUMBER < 0x10100005L static RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth) { @@ -446,7 +446,7 @@ #endif -#if OPENSSL_VERSION_NUMBER < 0x10100005L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3000000L ) +#if OPENSSL_VERSION_NUMBER < 0x10100005L static int RSA_meth_set_flags(RSA_METHOD *meth, int flags) { @@ -455,7 +455,7 @@ } #endif -#if OPENSSL_VERSION_NUMBER < 0x10100005L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2080000L ) +#if OPENSSL_VERSION_NUMBER < 0x10100005L static int RSA_meth_set_priv_enc(RSA_METHOD *meth, int (*priv_enc) (int flen, const unsigned char *from,