From nobody Mon Oct 02 16:13:46 2023 X-Original-To: dev-commits-src-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 4RzmGf71Swz4wFBx; Mon, 2 Oct 2023 16:13:46 +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 4RzmGf4hCDz4LKQ; Mon, 2 Oct 2023 16:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696263226; 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=LiJKTxyZFxnjBsPiZbOdtAXpcW729O2bMkZm/0ep2Og=; b=TmPHRDqaw0WX8bgZrmd3eybODYMPXTcKlQ06fx5j1QH36A1SGLcBmPrA0amM0mVi6T00LE +Q+x7CMWJWTiPfoxESUXJF2zITg/fX9LWKlZNj5O5X/QhdjkpKDMYoWZq7mVW0M0cVe1Yc ELDYXSB/NRelk+i31u46hQpWWbzwbwQo+AV7WAej2SccSXwVJlkOlFH2wjrgLjATak6YBj 4wcNWkB2260gAUm/WoFL+tkJmCQN2XhjDlFIODgBxNonBjzGTxssqGXPYoeBofXtLYisRU MRlEirc7sF3Wh1liSlBdVbFijRl/tKaWbz9G6h+CsMHUfB/qrBMGs10jXKKOCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696263226; a=rsa-sha256; cv=none; b=QZxIlJNsd4AaggydKE3aweKuS1Hoqrlfvdva+kns/hwJAzgXzLcYNB9KpygYMT1pS7D7gU zEnC/HUxyPDzlvClTY459qKn3+tt17CyAuN9EhA5bZIAM/9yNOHktVOdD44GHriREy4PdF G9TYA0RyvbAKJIYT+qqp2htCbukKgYM8AxWlwWm5O1ZsweCnO0CtFTpqqzVoWA+9pHb6yl oF9/hNTQ5iGH2VgoKnOAwosSCcG1Wb0j3qgSc2treNJnNKSSbfL/BU/6AejGhWp7CbetwL PghK3oDmGVljPyLuswXuQM2RwoIYXmTDBdA7kcsGzYEkif6xg7ArnpiIm6xuZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696263226; 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=LiJKTxyZFxnjBsPiZbOdtAXpcW729O2bMkZm/0ep2Og=; b=RGS5Yfhw6ae85GONu4ELsot2whMpgAoKb/D5b0++gt81deOHxgU+MxgDWnPlokR+mGfarp js3aJlC9XoRZtLzd1eo/6/zOGC2ERWAMHPfnwzOXUatHQoQuKhP3t/3HGkxELVKBP+9mEk jFuktYsgzkFzI81E7qigWeHpPGA5YqqWgi0/QK1wRQol0A98oPT7mJE0Z5Hh+8m9ilnkD0 RQ6p3nB856nIfG75YDCXkme/kUXXccc9NaQdaRjJsYHOsVqq/W8F5XZEHb5Z5WHR4gHuEB Kr/Cgh4pVsddXJfE1JidQBQRduivwTE2c9T50BSG5fpboTRG1KUKwEXHvsuVpg== 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 4RzmGf3Wlsz4Ds; Mon, 2 Oct 2023 16:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 392GDkju068964; Mon, 2 Oct 2023 16:13:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 392GDktG068961; Mon, 2 Oct 2023 16:13:46 GMT (envelope-from git) Date: Mon, 2 Oct 2023 16:13:46 GMT Message-Id: <202310021613.392GDktG068961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 417778192361 - main - aarch64: fix branch target indications in arm64cpuid.pl and keccak1600 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41777819236110907dd4cff98ef70dfd0629f744 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=41777819236110907dd4cff98ef70dfd0629f744 commit 41777819236110907dd4cff98ef70dfd0629f744 Author: Tom Cosgrove AuthorDate: 2022-02-07 14:44:56 +0000 Commit: Andrew Turner CommitDate: 2023-10-02 16:12:49 +0000 aarch64: fix branch target indications in arm64cpuid.pl and keccak1600 Add missing AARCH64_VALID_CALL_TARGET to armv8_rng_probe(). Also add these to the functions defined by gen_random(), and note that this Perl sub prints the assembler out directly, not going via the $code xlate mechanism (and therefore coming before the include of arm_arch.h). So fix this too. In KeccakF1600_int, AARCH64_SIGN_LINK_REGISTER functions as AARCH64_VALID_CALL_TARGET on BTI-only builds, so it needs to come before the 'adr' line. Change-Id: If241efe71591c88253a3e36647ced00300c3c1a3 Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/17653) Obtained from: OpenSSL 3a23f01268ec --- crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl b/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl index cf54b62c636a..40f7aa7a695a 100755 --- a/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl +++ b/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl @@ -126,8 +126,8 @@ $code.=<<___; .type KeccakF1600_int,%function .align 5 KeccakF1600_int: - adr $C[2],iotas AARCH64_SIGN_LINK_REGISTER + adr $C[2],iotas stp $C[2],x30,[sp,#16] // 32 bytes on top are mine b .Loop .align 4