From nobody Mon Aug 7 14:20:32 2023 X-Original-To: dev-commits-src-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 4RKJPs0WWPz4phGV; Mon, 7 Aug 2023 14:20:33 +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 4RKJPr6d2qz4JKZ; Mon, 7 Aug 2023 14:20:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418032; 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=0hzKWDk5MW5sa4fxmF08iydMc5zsCvxVIVcGDD89Xz8=; b=CkV85dSACF1lKEqRuVRSaj0n2te2Z7HM1h7fI20Sv0Q10xtyXOOnmsKMEweiBntV9EbYM8 Po1ZqHGXAKr5xrcm+1bocmwZIcC4SOOL/t/pmpHysmcARxUFHi3GCiRTO1VA3nkW/H6drb nP0VgmdCEP4rnARXhCxQdqVl+NJscQXLn6n8tMPWMgzLTZrTw4IlnEmnvi7c/XYH3elaw2 Spkrl/95WpyLn8KRtavW/wKMbqlNXaWpiwTt0IIpMGHB3PIUSETe+vo3FuRy8urZ9bbtWS BUVGOgpeGurXYH00X+1I087+sM+WsAgn5v2smRIdRJE5MJxu0WOrx9vJMl0HfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418032; 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=0hzKWDk5MW5sa4fxmF08iydMc5zsCvxVIVcGDD89Xz8=; b=CsjQfYGOsp5sr5LGEMvbXcQyGFhGT/X42R2bX07TremeeR05ELhgfeTMkW+kDWFV29JWlD 7sd5GLqfsTRVxcBAMG5OH2TvawNpa30ZMnUU4qzViyeNqoGgh55jdSu2umXKQyeED5XFq+ RLnFKo9RsRBATToCgTLNrV9MN7DEnnzlrpqNc9hrqnMw1kaIeY1+4ZV5ru8NN+bAw+7atd U+sRQ7Nte4hBL5YTYPmTmFsOet2TPndXewzVDXkA2uiKPEXOQgSJNfgGXhMgcvCzyF1jaB rGvyapsA0Bfs7gCdTP0mOC89+krqExMXPJ3TqhcwVo9xh1zhakEX0tQ4LXnAvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418032; a=rsa-sha256; cv=none; b=YruCoJ4JjJivgxtJW+KUBT0T+Ru1jpaKWMbJalsREXVBTYgEi9oRM7+aa3kw+dTrjdjCgc mIKOiUecBYZ83PXjAKOlRbF9Ft6KQEEH7wySdhHQaZ6PasfyvzQBhPZNE6EKaF7DFV/sRh uxsWR8CJc11xivfFYTehxB23MEXEHt+E57yT4dhxFiHPdljoZWi9PHEh9WVqusEVKWCDrV cA4qgRd4ZChe3E/MKuBQaOjMW+6Vmy6fvr2A5iqc5WzOR6GBxvMQePJ7Cpq3XhUqp65zgF p2CHR3GdMAaz8Y7jhBg5T4n8/xKgaFVLqSebiuYp5ZOmpcHC4alJvy/nCA626A== 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 4RKJPr5PLQzvVm; Mon, 7 Aug 2023 14:20:32 +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 377EKWrt020154; Mon, 7 Aug 2023 14:20:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EKWEG020144; Mon, 7 Aug 2023 14:20:32 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:20:32 GMT Message-Id: <202308071420.377EKWEG020144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 454c425dbed1 - main - ossl: Add missing labels to bsaes-armv7.S List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 454c425dbed1d341025c71a8645011a980e20ccd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=454c425dbed1d341025c71a8645011a980e20ccd commit 454c425dbed1d341025c71a8645011a980e20ccd Author: Mark Johnston AuthorDate: 2023-08-07 14:17:16 +0000 Commit: Mark Johnston CommitDate: 2023-08-07 14:17:16 +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 --- 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 2e452f75a643..b9ef9881e3e5 100644 --- a/sys/crypto/openssl/arm/bsaes-armv7.S +++ b/sys/crypto/openssl/arm/bsaes-armv7.S @@ -1130,7 +1130,7 @@ bsaes_cbc_encrypt: vstmia r4, {q7} .align 2 - +0: #endif vld1.8 {q15}, [r8] @ load IV @@ -1390,7 +1390,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 add r8, r6, #.LREVM0SR-.LM0 @ borrow r8 vldmia r12, {q4} @ load round0 key @@ -1625,7 +1625,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 @@ -2111,7 +2111,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