diff options
Diffstat (limited to 'community/opensc/libressl-2.7.patch')
-rw-r--r-- | community/opensc/libressl-2.7.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/community/opensc/libressl-2.7.patch b/community/opensc/libressl-2.7.patch deleted file mode 100644 index 3904bd2c13..0000000000 --- a/community/opensc/libressl-2.7.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h -index 2c853be..0a4e1c7 100644 ---- a/src/libopensc/sc-ossl-compat.h -+++ b/src/libopensc/sc-ossl-compat.h -@@ -92,12 +92,14 @@ extern "C" { - #define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay - #define OPENSSL_malloc_init CRYPTO_malloc_init - --#define EVP_PKEY_get0_RSA(x) (x->pkey.rsa) --#define EVP_PKEY_get0_DSA(x) (x->pkey.dsa) - #define X509_get_extension_flags(x) (x->ex_flags) - #define X509_get_key_usage(x) (x->ex_kusage) - #define X509_get_extended_key_usage(x) (x->ex_xkusage) -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL -+#define EVP_PKEY_get0_RSA(x) (x->pkey.rsa) -+#define EVP_PKEY_get0_DSA(x) (x->pkey.dsa) - #define EVP_PKEY_up_ref(user_key) CRYPTO_add(&user_key->references, 1, CRYPTO_LOCK_EVP_PKEY) -+#endif - #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2050300fL - #define X509_up_ref(cert) CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509) - #endif -@@ -129,7 +131,7 @@ extern "C" { - # endif - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - #define RSA_bits(R) (BN_num_bits(R->n)) - -@@ -217,7 +219,7 @@ static sc_ossl_inline void RSA_get0_crt_params(const RSA *r, - - #endif /* OPENSSL_NO_RSA */ - --#ifndef OPENSSL_NO_DSA -+#if !defined(OPENSSL_NO_DSA) && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL) - static sc_ossl_inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) - { - if (p != NULL) |