aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Palmen <zirias@FreeBSD.org>2023-06-02 06:12:10 +0000
committerFelix Palmen <zirias@FreeBSD.org>2023-06-02 13:01:58 +0000
commit52a298e4f26d092942bd5d460a97b8aa9c8b6dfb (patch)
treef3e7b84ee674f4f828dd2c95c2e911913328fb36
parent219974a35cb87756c92ed39055da854a219f4213 (diff)
downloadports-52a298e4f26d092942bd5d460a97b8aa9c8b6dfb.tar.gz
ports-52a298e4f26d092942bd5d460a97b8aa9c8b6dfb.zip
security/py-cryptography: Fix with LibreSSL 3.7
LibreSSL 3.7 introduced a few EVP_* functions, so remove the dummy replacements from the patch. Approved by: portmgr (just-fix-it), tcberner (mentor, implicit)
-rw-r--r--security/py-cryptography/files/patch-libressl24
1 files changed, 0 insertions, 24 deletions
diff --git a/security/py-cryptography/files/patch-libressl b/security/py-cryptography/files/patch-libressl
index 80047e366bf2..b9bc1e535d63 100644
--- a/security/py-cryptography/files/patch-libressl
+++ b/security/py-cryptography/files/patch-libressl
@@ -167,30 +167,6 @@
/* These functions were added in OpenSSL 1.1.0f commit d0c50e80a8 */
/* Define our own to simplify support across all versions. */
---- src/_cffi_src/openssl/evp.py.orig 2021-08-24 17:02:37 UTC
-+++ src/_cffi_src/openssl/evp.py
-@@ -203,7 +203,20 @@ int (*EVP_PKEY_set1_tls_encodedpoint)(EVP_PKEY *, cons
- size_t) = NULL;
- #endif
-
--#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_111
-+#if CRYPTOGRAPHY_IS_LIBRESSL
-+static const long Cryptography_HAS_ONESHOT_EVP_DIGEST_SIGN_VERIFY = 1;
-+static const long Cryptography_HAS_RAW_KEY = 0;
-+static const long Cryptography_HAS_EVP_DIGESTFINAL_XOF = 0;
-+int (*EVP_DigestFinalXOF)(EVP_MD_CTX *, unsigned char *, size_t) = NULL;
-+EVP_PKEY *(*EVP_PKEY_new_raw_private_key)(int, ENGINE *, const unsigned char *,
-+ size_t) = NULL;
-+EVP_PKEY *(*EVP_PKEY_new_raw_public_key)(int, ENGINE *, const unsigned char *,
-+ size_t) = NULL;
-+int (*EVP_PKEY_get_raw_private_key)(const EVP_PKEY *, unsigned char *,
-+ size_t *) = NULL;
-+int (*EVP_PKEY_get_raw_public_key)(const EVP_PKEY *, unsigned char *,
-+ size_t *) = NULL;
-+#elif CRYPTOGRAPHY_OPENSSL_LESS_THAN_111
- static const long Cryptography_HAS_ONESHOT_EVP_DIGEST_SIGN_VERIFY = 0;
- static const long Cryptography_HAS_RAW_KEY = 0;
- static const long Cryptography_HAS_EVP_DIGESTFINAL_XOF = 0;
--- src/_cffi_src/openssl/fips.py.orig 2021-08-24 17:17:17 UTC
+++ src/_cffi_src/openssl/fips.py
@@ -17,11 +17,5 @@ int FIPS_mode(void);