From nobody Fri Jun 2 13:02:14 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXjny6F7wz4YH2g; Fri, 2 Jun 2023 13:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXjny5nsrz40Mj; Fri, 2 Jun 2023 13:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685710934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1a04FX1ARI3vbhJaMwTC9zWVqcrxLZaweDuG7IORxt8=; b=PQZWxiECZb7uXGkjDeTAInO1B2ZMgFJBLcI5gpuCOzzdsq8uHnQjC9kEijTao0NtlaNxcK GBfX6hfmByoM0QVFeHKOHhnFus9l5JmjhyEn808hjyPjD4HqhRvDkYo+BT8FgXLg59gzxg dKkKCl/XEjxyDqIoLpMa7S8sLX2aZq4ih3pEgTGFI56E3WPuDRTdy22TtIio94WcB6lCNI iZpIYCNkh/ncgyWC5F9M4bwB8wMJ9R1Q+8H5mH8ts35UN0xpi/0PER5IcTcXPJ6r5QrKz0 zIs4yfIskiB0t4Laals8KWQ7twnkH/z+Acq/3GtVgjaBXph5ziKa6miX2sZeaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685710934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1a04FX1ARI3vbhJaMwTC9zWVqcrxLZaweDuG7IORxt8=; b=NbUukebs7oXe/rxUsENIXvRRhAPqp3XtgKLEz28U6wAwf61r5gwlF2k3ggHsSPV72i1rDT dh+8Abn3dt5EKBpXbuxUj1lOSu9Ko9mvzmQkkoLUq35hv158fIPjnavrTFlCMDVxO5F/iI FKjVGaAch0mDk9nFRkCdmwglwjh8YpEqMU1YCUmgHRvZrE4ONkEqZ04I91HPHcVCWumHHw j6WlamluYIuClAkEitqqRwjZMwASpknvkBwDXTbAlvBq6Sv0aLD1c3FrrP/1IeX4EI8asE gd4nel5JhKz9TVFzaKWvkKCiTiQXCQa3xbE+I33vOzItpS8cbmKEJqKEq+glPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685710934; a=rsa-sha256; cv=none; b=w0x5emBcZH+9FgDbnwnV1+Itvep5I6QY8jfM/vWsJCzyIpiRQ03YHmHnWPruQE4rKP+FhL j+YO3HVaHzPvRnJRbu7nETxwxHAO2K36Lyx03t2JNSrDnp+U//LO4rPGlBn9PUrDl1WBdt MBvwmoOE7zDNrJwXj83oNnHwvFvv+zuPWOd6HMwOPGa7Szi4m3L9yFOnoBk9LP1NWA8FEZ BpawOBaiecO8lsm45ri2ZuYITUgN1Gfp3FGGAeNydzr0nz/1mdj4ViBJKBKh2TQBGRW70F /rucrAAaXTPR21fbwrYaCjtmJSxEeSnW8RKKWr7vU5CF2E6XtWJP5bnavJUqKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXjny4rWLz10jc; Fri, 2 Jun 2023 13:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 352D2E2w045682; Fri, 2 Jun 2023 13:02:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352D2EnU045681; Fri, 2 Jun 2023 13:02:14 GMT (envelope-from git) Date: Fri, 2 Jun 2023 13:02:14 GMT Message-Id: <202306021302.352D2EnU045681@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 52a298e4f26d - main - security/py-cryptography: Fix with LibreSSL 3.7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52a298e4f26d092942bd5d460a97b8aa9c8b6dfb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=52a298e4f26d092942bd5d460a97b8aa9c8b6dfb commit 52a298e4f26d092942bd5d460a97b8aa9c8b6dfb Author: Felix Palmen AuthorDate: 2023-06-02 06:12:10 +0000 Commit: Felix Palmen CommitDate: 2023-06-02 13:01:58 +0000 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) --- security/py-cryptography/files/patch-libressl | 24 ------------------------ 1 file changed, 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);