From nobody Thu Aug 24 13:41:10 2023 X-Original-To: dev-commits-src-branches@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 4RWkkZ40V7z4rB8X; Thu, 24 Aug 2023 13:41:10 +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 4RWkkZ2RX1z3gSl; Thu, 24 Aug 2023 13:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884470; 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=Db/ebM1U2BtmMk7fiEV6LVmZXzzvsgTvYZ11P2ELApM=; b=SsUCLDWOZVsFfb3CgxAEBFAMAgmTBFPXzrc0KjVNXjdK5R/BFVjK3IW8EitE0F4J+YRCv4 ONDCkgwYXxmUUnyKpabQogwaeXBBq4I27F/SIp2ShNIL+StlOpXuUXKON/Dhdh9EwBzH4I pSEQmlGLlqCuk9xiQtEd3x0Vqj9aJ1BkjKikNZYhdiLU5EgqH0uekp4hCqDxdVoSKfVRJY OUxxskORFhpoBe30YyKYiRcSkN1iHp85EpIagDlUCYiUFKkwcEZ8KSYG5EhgiXji49gPk7 rZSE4vEI7IfhPvQaQ4ScvBKAqdPxMRgXZy7ZQyZX3vXqrfbI08qZWhhjWzwiZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692884470; 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=Db/ebM1U2BtmMk7fiEV6LVmZXzzvsgTvYZ11P2ELApM=; b=w/5ja77pS0mhlXDf4xq8D1GROOdbYRO0h9ZqvxlQPZFhyggDyWTn2H9QPxLNEBgnNONUfg ikv4c3ykwM2yDPp0r+qA97CwvdoO+G32bWbCm+sZp5BywAi1IFeaylst+dK81EzlY+YAUH IZES525OpElkamrfyiuDaICJOShhrMPftZ2zB/Qsrgm5g2nAIRwaF4lrXq7Iuc1G0ixMMG H9lmaEjlpRpSC+8V5cGgeRUa4IZK+dDOc7ogzMly1lfyzp+7Ovc5AXsZzxpvAgSJ4K0I2r MNnj13T8sq+0YxBh4pBoG2h8en4EpY4AtoHacpq98x6lNiqD+gJlQP+aD4XQNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692884470; a=rsa-sha256; cv=none; b=WUCbtSCPeK88gdeuatuEEa8MMHqzKGtRbV0j7SQWg6dj6l8rn2lFJJS242alCVoUsV5qZs yXjEiq+NsQ473Zt22BBkHNQogVUAoy3RMtc/ypQQeHrxrDmXY9WjVEo71aVShZU9O9W6G2 8LU08Q80RpbJHQzNlxppEMxAJGIr2MKvP2dGxcCuYddQTfBAX1Aoe6L+624zMy1oHoMozz K0WCMjO+kvY0i1Nq320knMrPUeVxXgEIahlvX1/2pHZkgs9eAIjwhxYZ2aw7ulK5WUiz85 rwL5x09hgK2fIIkSgPkfZrOOHBW1xdU0axpxrkiLxc7DJzaMu38MC+8h+4dkCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RWkkZ1Xv7zTdM; Thu, 24 Aug 2023 13:41:10 +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 37ODfAAL023670; Thu, 24 Aug 2023 13:41:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ODfAIY023667; Thu, 24 Aug 2023 13:41:10 GMT (envelope-from git) Date: Thu, 24 Aug 2023 13:41:10 GMT Message-Id: <202308241341.37ODfAIY023667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a4db69370ed5 - stable/13 - ossl: Add missing labels to bsaes-armv7.S List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a4db69370ed526e3d840e1b7ef223ba8dc403d18 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a4db69370ed526e3d840e1b7ef223ba8dc403d18 commit a4db69370ed526e3d840e1b7ef223ba8dc403d18 Author: Mark Johnston AuthorDate: 2023-08-07 14:17:16 +0000 Commit: Mark Johnston CommitDate: 2023-08-24 13:33:00 +0000 ossl: Add missing labels to bsaes-armv7.S There is a bug in the OpenSSL script which generates this file; the bug is in the process of being fixed upstream. Specifically, when generating the output, bsaes-armv7.pl strips some labels that are used when the output asm is compiled with __KERNEL__ defined, resulting in a build error. As a step towards adding armv7 support to ossl(4), manually patch the generated asm. The upstream fix will be imported later. Reviewed by: andrew, jhb, emaste MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D41303 (cherry picked from commit 454c425dbed1d341025c71a8645011a980e20ccd) --- sys/crypto/openssl/arm/bsaes-armv7.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/crypto/openssl/arm/bsaes-armv7.S b/sys/crypto/openssl/arm/bsaes-armv7.S index 55223764a03c..6f19a097768f 100644 --- a/sys/crypto/openssl/arm/bsaes-armv7.S +++ b/sys/crypto/openssl/arm/bsaes-armv7.S @@ -1129,7 +1129,7 @@ bsaes_cbc_encrypt: vstmia r4, {q7} .align 2 - +0: #endif vld1.8 {q15}, [r8] @ load IV @@ -1389,7 +1389,7 @@ bsaes_ctr32_encrypt_blocks: vstmia r12, {q7} @ save last round key .align 2 - add r12, r3, #248 +0: add r12, r3, #248 vld1.8 {q0}, [r8] @ load counter adrl r8, .LREVM0SR @ borrow r8 vldmia r12, {q4} @ load round0 key @@ -1624,7 +1624,7 @@ bsaes_xts_encrypt: vstmia r12, {q7} .align 2 - sub sp, #0x90 @ place for tweak[9] +0: sub sp, #0x90 @ place for tweak[9] #endif vld1.8 {q8}, [r0] @ initial tweak @@ -2110,7 +2110,7 @@ bsaes_xts_decrypt: vstmia r4, {q7} .align 2 - sub sp, #0x90 @ place for tweak[9] +0: sub sp, #0x90 @ place for tweak[9] #endif vld1.8 {q8}, [r0] @ initial tweak adr r2, .Lxts_magic