From nobody Tue Mar 21 19:05:03 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 4Ph1JJ1hyvz40f63; Tue, 21 Mar 2023 19:05:04 +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 4Ph1JJ15lgz44Bb; Tue, 21 Mar 2023 19:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679425504; 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=0qXNmWUmk440m6pq492vEVzfE/veoEqH9/7H9kmLQh8=; b=X2h+KZnJTPqqbfxsm51rlDIE6oMNlce0lPIDh9XbjTKVXfNq7JevGDkiQLS3T5CUnV7V35 Gs1Z7sJDN3xbGk4m6L/kPrFTNaY1WrISNrwUvR5cpHO6I9W5IAggTY+YpmH6KDfmHAxbiS MNVP0WRy6rrwo6FvRj/7Yh7mT9vHqsSadRUbo1FzM9R+R7LqScICBkM6cpMK5RqGIfov5a PZopera9bxEdREBOZ5Ge/lm6OG6jz0OSdrwfDiaHJQa35onzfPb0TeZj0RvUGgm4aqX42A 7Rf/qJR7RH80bQvGsBxalEr7jlie8rVof7u9pC7GUtgpRyeyJ/YNDdNWK4RlYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679425504; 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=0qXNmWUmk440m6pq492vEVzfE/veoEqH9/7H9kmLQh8=; b=pJtpENlqOECFmQ9FfOSbTZXMhoPF+kMO8hJmIIL5sDidSCxhF7ykS6fFFl0bF+IpLdA/yK t0OM82+GnntelOW/G7kyIczMlGgI+P7RcVpbiu6dUjrOAlekZeVdVjAOcyvqXxcqNG26QZ 6fq8g2zhVxjjmdfzr8pdy/bHt0Ut55423h9kAXqRvUEG+1Ky4GGFm8DVBPgoLdJebXREaV e5SSRwuOYbUGgK2juIPTnd3MxRwT/zBWVYuCLpz8DSesoYTGXPt990ic4PHVNKhwcBeyn5 F9K5mLg8R4cngGhrgVttjmCT91Xf0/+nljIk5ARgO8dNXHA1SCCfIT4gR790vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679425504; a=rsa-sha256; cv=none; b=eGqyHfJrQzya2yVHsDCabdVmIB9JQWD4duRag9528vklGgHeg1aE0BQCYFyMFe9Zh0ioVP LG1x+n84dsXj4pFD3BgE/PQCgeuTqaDDSVCv/525Q9eazGmy87AKo1cTxLV5wyeXwpvjeP TuHB5Ej0tPk7UGqpNepGacgzSHoCyVhGs5lvXaIwN2CQ/kBxvCaBL6Dd+KeV5BCp4pXtuP azhzq7goRYysKsNfP17oS1a2UvxHzjlFi8dWC8zmj3/i8kcyQXMyGgLBNQqEyjdJx1XVR4 UBZ9kve6/BGcJ7C+jylvk4Aqq1SR6YcZpgmOMXaTKFJhfwlENVXTcoqMLNzepA== 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 4Ph1JJ03ZJzNry; Tue, 21 Mar 2023 19:05:04 +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 32LJ534w088584; Tue, 21 Mar 2023 19:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LJ53fV088583; Tue, 21 Mar 2023 19:05:03 GMT (envelope-from git) Date: Tue, 21 Mar 2023 19:05:03 GMT Message-Id: <202303211905.32LJ53fV088583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Kornel=20Dul=C4=99ba?= Subject: git: 19a4869d66f5 - main - OpenSSL: aes/asm/bsaes-armv7.pl: Replace adrl with add 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: kd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19a4869d66f59bf37cf42f657dcfad7c431784bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kd: URL: https://cgit.FreeBSD.org/src/commit/?id=19a4869d66f59bf37cf42f657dcfad7c431784bf commit 19a4869d66f59bf37cf42f657dcfad7c431784bf Author: Kornel Dulęba AuthorDate: 2023-03-21 17:18:59 +0000 Commit: Kornel Dulęba CommitDate: 2023-03-21 19:04:04 +0000 OpenSSL: aes/asm/bsaes-armv7.pl: Replace adrl with add "adrl" is a pseudo-instruction used to calculate an address relative to PC. It's not recognized by clang resulting in a compilation error. I've stumbled upon it when trying to integrate the bsaes-armv7 assmebly logic into FreeBSD kernel, which uses clang as it's default compiler. Note that this affect the build only if BSAES_ASM_EXTENDED_KEY is defined, which is not the default option in OpenSSL. The solution here is to replace it with an add instruction. This mimics what has already been done in !BSAES_ASM_EXTENDED_KEY logic. Because of that I've marked this as trivial CLA. No objections from: jkim Obtained from: OpenSSL commit 27093ba73372935fe4ef91d0a45ce6ea90a1ac8e Differential Revision: https://reviews.freebsd.org/D39091 --- crypto/openssl/crypto/aes/asm/bsaes-armv7.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl b/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl index 2b9f241ce8b0..e2a84b380940 100755 --- a/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl +++ b/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl @@ -1444,7 +1444,7 @@ bsaes_ctr32_encrypt_blocks: .align 2 0: add r12, $key, #248 vld1.8 {@XMM[0]}, [$ctr] @ load counter - adrl $ctr, .LREVM0SR @ borrow $ctr + add $ctr, $const, #.LREVM0SR-.LM0 @ borrow $ctr vldmia r12, {@XMM[4]} @ load round0 key sub sp, #0x10 @ place for adjusted round0 key #endif