From nobody Thu Jan 06 15:55:56 2022 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 73E481931CB2; Thu, 6 Jan 2022 15:55:57 +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 4JV9tj0l6Fz3htg; Thu, 6 Jan 2022 15:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 ED95E224FF; Thu, 6 Jan 2022 15:55:56 +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 206FtueD000521; Thu, 6 Jan 2022 15:55:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 206Ftuww000520; Thu, 6 Jan 2022 15:55:56 GMT (envelope-from git) Date: Thu, 6 Jan 2022 15:55:56 GMT Message-Id: <202201061555.206Ftuww000520@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: 494cfc7c54ee - main - security/boringssl: update to the recent commit 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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 494cfc7c54ee4bcb4937242c4ffae916151092dd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641484557; 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=Gp0OT8AClot95fqtonmnTtVS11XqShYSRn3Ib5Zizs4=; b=Z8mFTmu6gYZavkda4+qflWqPILTmLbnuonL1Coy+aEmiP15a3UU/akSWrasp6L/MfvY7TI Eq2MJ9FAQHulkOELoKoVwQYO8h4EKtJ1eq6HJZYBETNWjaq1AgmIU0g3RCeBT1y8mbXbS5 dm3k4tgsO+gj6IqTxZFfA9WaNRlvwRF4mhgyWzuPvP4Efmvr5ZaKtnyzs60xcmo5RrNNRw 5IXyxVAbmkH8akX5fD+Er8BzgR/a11liLocn5neVYoEK3JqUHIwsYbqF1Py00J8Si7R+se 8jdQmOACb7/ZyBzv8FpAzWry4wQU6RT6ki8X0SthgCzJB1Zeahxlo+oLtMA5Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641484557; a=rsa-sha256; cv=none; b=vzAgcsMuxv5KSTC3gAuFVHt3RCHKlUhpc6bU9PJhi5lNGjez4NZWfePF9ierPrhNh6Smii zlbNS62+jV+AOKwJWzl2Wx7Pn1N+B4uCZ0fDc4vRwOqp4iLzA0v9rQ6rUi5Gq0ff2R18mt +jNyRrKRZmLEQbNN820IUkeZ9BZP7t1d4+fgUDjamOGrmju+kJsJQGtvmeqnMMP8Sdv4fc Ep8QBnT8U7Ck1cwRzeAZZ3K0MZlsWg7T9WgF5R6p2zAdXrKWxJHTHQr5jeRVyTmX2YR0qy C/ZLoZ1L05ypbfepmF2iRB4RFXeOcRG62yJgIFLSIN5KP8BdCMF1AqTBmW0ZWg== 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=494cfc7c54ee4bcb4937242c4ffae916151092dd commit 494cfc7c54ee4bcb4937242c4ffae916151092dd Author: Sergey A. Osokin AuthorDate: 2022-01-06 15:45:30 +0000 Commit: Sergey A. Osokin CommitDate: 2022-01-06 15:55:50 +0000 security/boringssl: update to the recent commit The following commit [1], enables SHA-512 ARM acceleration when available, so the patch-crypto_cpu_aarch64_linux.c needs to be reviewed and updated. References: [1] https://boringssl.googlesource.com/boringssl/+/1e15682f1a4bb64c48b84884976a2b5c4201e878%5E%21/#F5 --- security/boringssl/Makefile | 5 ++--- security/boringssl/distinfo | 6 +++--- ...64-linux.c => patch-crypto_cpu_aarch64_linux.c} | 23 +++++++++++++--------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index 815a71d24774..3de7280cd4d7 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -1,6 +1,5 @@ PORTNAME= boringssl -PORTVERSION= 0.0.0.0.2021.12.21.01 -PORTREVISION= 3 +PORTVERSION= 0.0.0.0.2022.01.05.01 CATEGORIES= security MAINTAINER= osa@FreeBSD.org @@ -21,7 +20,7 @@ CPE_VENDOR= google USE_GITHUB= yes GH_ACCOUNT= google -GH_TAGNAME= 9bcc12d +GH_TAGNAME= 295b313 GH_TUPLE= golang:crypto:c07d793c2f9a:golang_crypto/vendor/golang.org/x/crypto \ golang:net:04defd469f4e:golang_net/vendor/golang.org/x/net \ golang:sys:04245dca01da:golang_sys/vendor/golang.org/x/sys \ diff --git a/security/boringssl/distinfo b/security/boringssl/distinfo index e2ac64e11294..0dd914cbdba4 100644 --- a/security/boringssl/distinfo +++ b/security/boringssl/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1641280446 -SHA256 (google-boringssl-0.0.0.0.2021.12.21.01-9bcc12d_GH0.tar.gz) = 529e77f24d8a1e5286ab9cd1fc649e8ffe484d7d149c4889650067bc2537f274 -SIZE (google-boringssl-0.0.0.0.2021.12.21.01-9bcc12d_GH0.tar.gz) = 30725757 +TIMESTAMP = 1641475926 +SHA256 (google-boringssl-0.0.0.0.2022.01.05.01-295b313_GH0.tar.gz) = b85cf7a822752612438333c9910957b9a085a303136b81f88c0dbb7e4676ae42 +SIZE (google-boringssl-0.0.0.0.2022.01.05.01-295b313_GH0.tar.gz) = 30725404 SHA256 (golang-crypto-c07d793c2f9a_GH0.tar.gz) = bd1e0856c43287c6ebd20d59e2b4f2ffa91c5cc275dbb02bb2cfc822e6dc18a4 SIZE (golang-crypto-c07d793c2f9a_GH0.tar.gz) = 1732023 SHA256 (golang-net-04defd469f4e_GH0.tar.gz) = 6009a6f0989341df975799276ff1c49af650d4a4ed3fd6db3501b91eb601810d diff --git a/security/boringssl/files/patch-crypto_cpu-aarch64-linux.c b/security/boringssl/files/patch-crypto_cpu_aarch64_linux.c similarity index 79% rename from security/boringssl/files/patch-crypto_cpu-aarch64-linux.c rename to security/boringssl/files/patch-crypto_cpu_aarch64_linux.c index 479b9e76a46d..68403a2b75dd 100644 --- a/security/boringssl/files/patch-crypto_cpu-aarch64-linux.c +++ b/security/boringssl/files/patch-crypto_cpu_aarch64_linux.c @@ -1,6 +1,6 @@ ---- crypto/cpu-aarch64-linux.c.orig 2019-12-02 17:52:12 UTC -+++ crypto/cpu-aarch64-linux.c -@@ -14,49 +14,46 @@ +--- crypto/cpu_aarch64_linux.c.orig 2022-01-05 15:30:33.000000000 -0500 ++++ crypto/cpu_aarch64_linux.c 2022-01-06 10:24:03.703277000 -0500 +@@ -14,10 +14,8 @@ #include @@ -9,19 +9,20 @@ +#if defined(OPENSSL_AARCH64) -#include -- + #include - #include "internal.h" +@@ -26,41 +24,41 @@ -- 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. @@ -30,6 +31,7 @@ - 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 @@ -65,10 +67,13 @@ OPENSSL_armcap_P |= ARMV8_SHA1; } - if (hwcap & kSHA256) { -+ if(ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) { ++ 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_STATIC_ARMCAP + +-#endif // OPENSSL_AARCH64 && OPENSSL_LINUX && !OPENSSL_STATIC_ARMCAP +#endif // OPENSSL_AARCH64