From nobody Tue Jul 26 17:59:36 2022 X-Original-To: dev-commits-ports-all@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 4Lsl6c63GNz4XgGK; Tue, 26 Jul 2022 17:59:36 +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 4Lsl6c5Svyz3jCX; Tue, 26 Jul 2022 17:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658858376; 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=TeAR8X8zryoMRKy7BhKwZtZoEF7I/HrvbLMoqe7BktQ=; b=qZhA9XwcWliFyit+k33+ap7ayKSyTJYYq9Lg9yVxKuNFhoCy83Wp5QWxHIR43rL3gUL8Yz dtZoJz2XKlbaWIj3jS+6C4g/Bjnvbu/tsUqL18/oSzjyVVtorKTKYhZSBQX/JK6XV65ffO Y+69lm1G2okrpKElFx7jKQ4rTRUSfiT4/MMgWsh++jcWFR/OzN0FS6Panheb2NynGdC5wM 6cTklmfdlT4tE2OwfPZpaJVHPm68TatjQXYSA1EdifJF2lWkng8iF96+I4ev82KU6c+pjr F01h1YkKqfVRnEJP3DhxFPHCjkR4i7NKb7xbTrWw5eGGp8WfQlIa2n2IrRGcUA== 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 4Lsl6c49xkzmJJ; Tue, 26 Jul 2022 17:59:36 +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 26QHxaJK096171; Tue, 26 Jul 2022 17:59:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QHxap2096169; Tue, 26 Jul 2022 17:59:36 GMT (envelope-from git) Date: Tue, 26 Jul 2022 17:59:36 GMT Message-Id: <202207261759.26QHxap2096169@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 22a9a1e09c0a - main - security/boringssl: move aarch64 support to a separate file List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22a9a1e09c0a6d2c20d1fdd637f0a8973443870f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658858376; 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=TeAR8X8zryoMRKy7BhKwZtZoEF7I/HrvbLMoqe7BktQ=; b=iYERHZ2HQsIyuMRBdegWK5Qwrn+eYXzrI0eG0cnRiuSh6hdXAqgiw4A3zXozUZz6ceI8da noRoJd3sNY6qF3tCxU9rsDGIazcljNPdl08AE+LlPnN5hDx681Lb6ag2qcDt/xAEKysUR+ pJle9l7K38fAKFniCGHGuz41/SY0exGbEDVdqVrYRA6uKO8oqKLH3e9ZF5Suc9oDLwv2SA KLNmYCQAzgQSWHTLhc4WfMTlAQVWp0lCbNqG2Vbwd4cQ86tLjQ2baIi//FrX/p1+I6C5ff Hp55b5P0vRpVHrgkv7DvpHcRVxu7s3WkThyVtvUVsOCcsOc5tbtK9Yl41xV2Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658858376; a=rsa-sha256; cv=none; b=b2ylpUtDTziIoQYJGSIzeYuY+SGQ8ba3EejyNnO1LtelRa/hKWkTgbR8twqVUYpPfkBCH2 OXCw0hrZBeliPHfKgHCUq40xtnHkHCYb84zPuCcCRnKEB09ROToE1H89txKkvy0wnL95bw j3Jec60UhDmIxbC+DqHGGbDerq4DDMolWnWBm/j/et37OPnXbjwLhnivykk+vm73vVZSEN NBo6rH9wnGaLgRtXxcfp90htDqs3ZvLIeKNl3qylfHLZ33wtqHJiica4+XroFilLxPl5IR NJ26cXz2DLu96XYxcvxwpVi/LEd631gjnUfYEcNe8fKCaPH5lOsLT9JZDelAFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=22a9a1e09c0a6d2c20d1fdd637f0a8973443870f commit 22a9a1e09c0a6d2c20d1fdd637f0a8973443870f Author: Sergey A. Osokin AuthorDate: 2022-07-26 17:58:18 +0000 Commit: Sergey A. Osokin CommitDate: 2022-07-26 17:59:28 +0000 security/boringssl: move aarch64 support to a separate file Bump PORTREVISION. --- security/boringssl/Makefile | 2 +- .../boringssl/files/patch-crypto_CMakeLists.txt | 10 ++- .../files/patch-crypto_cpu__aarch64__freebsd.c | 65 ++++++++++++++++++ .../files/patch-crypto_cpu__aarch64__linux.c | 78 ---------------------- 4 files changed, 73 insertions(+), 82 deletions(-) diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index 45ccb2abe6b6..6bca457c80f1 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -1,6 +1,6 @@ PORTNAME= boringssl PORTVERSION= 0.0.0.0.2022.07.25.01 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MAINTAINER= osa@FreeBSD.org diff --git a/security/boringssl/files/patch-crypto_CMakeLists.txt b/security/boringssl/files/patch-crypto_CMakeLists.txt index 6755b7553615..d46e32af0db3 100644 --- a/security/boringssl/files/patch-crypto_CMakeLists.txt +++ b/security/boringssl/files/patch-crypto_CMakeLists.txt @@ -1,6 +1,10 @@ --- crypto/CMakeLists.txt.orig 2022-07-25 14:53:51.000000000 -0400 -+++ crypto/CMakeLists.txt 2022-07-26 11:40:36.847197000 -0400 -@@ -267,6 +267,7 @@ ++++ crypto/CMakeLists.txt 2022-07-26 12:18:36.169803000 -0400 +@@ -264,9 +264,11 @@ + cipher_extra/tls_cbc.c + conf/conf.c + cpu_aarch64_apple.c ++ cpu_aarch64_freebsd.c cpu_aarch64_fuchsia.c cpu_aarch64_linux.c cpu_aarch64_win.c @@ -8,7 +12,7 @@ cpu_arm_linux.c cpu_arm.c cpu_intel.c -@@ -464,6 +465,7 @@ +@@ -464,6 +466,7 @@ endif() SET_TARGET_PROPERTIES(crypto PROPERTIES LINKER_LANGUAGE C) diff --git a/security/boringssl/files/patch-crypto_cpu__aarch64__freebsd.c b/security/boringssl/files/patch-crypto_cpu__aarch64__freebsd.c new file mode 100644 index 000000000000..fe7b139f23ed --- /dev/null +++ b/security/boringssl/files/patch-crypto_cpu__aarch64__freebsd.c @@ -0,0 +1,65 @@ +--- /dev/null 2022-07-26 12:16:14.406018000 -0400 ++++ crypto/cpu_aarch64_freebsd.c 2022-07-26 12:15:28.130832000 -0400 +@@ -0,0 +1,62 @@ ++/* Copyright (c) 2016, Google Inc. ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY ++ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION ++ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ ++ ++#include "internal.h" ++ ++#if defined(OPENSSL_AARCH64) ++ ++ ++#include ++ ++ ++extern uint32_t OPENSSL_armcap_P; ++ ++#if defined(OPENSSL_FREEBSD) ++#include ++#include ++#include ++#endif ++ ++#ifndef ID_AA64ISAR0_AES_VAL ++#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES ++#endif ++#ifndef ID_AA64ISAR0_SHA1_VAL ++#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1 ++#endif ++#ifndef ID_AA64ISAR0_SHA2_VAL ++#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2 ++#endif ++ ++void OPENSSL_cpuid_setup(void) { ++ uint64_t id_aa64isar0; ++ ++ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); ++ ++ OPENSSL_armcap_P |= ARMV7_NEON; ++ ++ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE) { ++ OPENSSL_armcap_P |= ARMV8_AES; ++ } ++ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) { ++ OPENSSL_armcap_P |= ARMV8_PMULL; ++ } ++ if (ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) { ++ OPENSSL_armcap_P |= ARMV8_SHA1; ++ } ++ if (ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) { ++ OPENSSL_armcap_P |= ARMV8_SHA256; ++ } ++} ++ ++#endif // OPENSSL_AARCH64 diff --git a/security/boringssl/files/patch-crypto_cpu__aarch64__linux.c b/security/boringssl/files/patch-crypto_cpu__aarch64__linux.c deleted file mode 100644 index a5276e203ab0..000000000000 --- a/security/boringssl/files/patch-crypto_cpu__aarch64__linux.c +++ /dev/null @@ -1,78 +0,0 @@ ---- crypto/cpu_aarch64_linux.c.orig 2022-01-18 16:46:15 UTC -+++ crypto/cpu_aarch64_linux.c -@@ -14,51 +14,49 @@ - - #include "internal.h" - --#if defined(OPENSSL_AARCH64) && defined(OPENSSL_LINUX) && \ -- !defined(OPENSSL_STATIC_ARMCAP) -+#if defined(OPENSSL_AARCH64) - --#include - - #include - - - extern uint32_t OPENSSL_armcap_P; - --void OPENSSL_cpuid_setup(void) { -- unsigned long hwcap = getauxval(AT_HWCAP); -+#if defined(OPENSSL_FREEBSD) -+#include -+#include -+#include -+#endif - -- // See /usr/include/asm/hwcap.h on an aarch64 installation for the source of -- // these values. -- static const unsigned long kNEON = 1 << 1; -- static const unsigned long kAES = 1 << 3; -- static const unsigned long kPMULL = 1 << 4; -- static const unsigned long kSHA1 = 1 << 5; -- static const unsigned long kSHA256 = 1 << 6; -- static const unsigned long kSHA512 = 1 << 21; -+#ifndef ID_AA64ISAR0_AES_VAL -+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES -+#endif -+#ifndef ID_AA64ISAR0_SHA1_VAL -+#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1 -+#endif -+#ifndef ID_AA64ISAR0_SHA2_VAL -+#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2 -+#endif - -- if ((hwcap & kNEON) == 0) { -- // Matching OpenSSL, if NEON is missing, don't report other features -- // either. -- return; -- } -+void OPENSSL_cpuid_setup(void) { -+ uint64_t id_aa64isar0; - -+ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); -+ - OPENSSL_armcap_P |= ARMV7_NEON; - -- if (hwcap & kAES) { -+ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE) { - OPENSSL_armcap_P |= ARMV8_AES; - } -- if (hwcap & kPMULL) { -+ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) { - OPENSSL_armcap_P |= ARMV8_PMULL; - } -- if (hwcap & kSHA1) { -+ if (ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) { - OPENSSL_armcap_P |= ARMV8_SHA1; - } -- if (hwcap & kSHA256) { -+ if (ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) { - OPENSSL_armcap_P |= ARMV8_SHA256; - } -- if (hwcap & kSHA512) { -- OPENSSL_armcap_P |= ARMV8_SHA512; -- } - } - --#endif // OPENSSL_AARCH64 && OPENSSL_LINUX && !OPENSSL_STATIC_ARMCAP -+#endif // OPENSSL_AARCH64