From nobody Fri Nov 18 03:20:34 2022 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 4ND29G5Z0vz4dMLM; Fri, 18 Nov 2022 03:20:34 +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 4ND29G4RCNz43kY; Fri, 18 Nov 2022 03:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668741634; 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=Jmupepi90kjVhKOUe7lL3yngZiz/PMIqf6YcW5Wdx64=; b=cvR8yx5ZBBfLiqPg5zkKmftsRAT/atF8GWD/u81/AtBKSPypJ8h3o3NvXbV7eJzcyNfPT1 LKYtBCtg3duVMV2/bCrJftLkffOM6ZMrzUL8k7jvR+8qzJAXCt+nYiwAmmqI7wSI35H/dU 16AiyNZWNdZv02g+4IWqoN+yWEuNg5PWt/l8FVU/C586JtxOB0+Kv1Y73rIZPtmXpvPX6V pW5aTnm6V9Q5zk5Afj82/WIwE6TiqtdRfFtGNrGySqaThgIHzzlae+v9JcnyRvvMPPnYv7 +6n67svgdsQ1KyCVa0qw+Qei3rqIIUAHDr0NcIWf76Qpxt4z6971/kjdg2hQ4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668741634; 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=Jmupepi90kjVhKOUe7lL3yngZiz/PMIqf6YcW5Wdx64=; b=XscBccaz50pSu5BHnkSD51qHvA/FOvNW1TWQb46mSH4rvxX5y+5jCUrkJcLJSn+3Kv9unM ++ZqOlx/45yEpCGyWGYFsyF4hoPIGry5qSg4V5IcbqBZMTG8uW5nE4mvqDsJBG1Y6a6k8B FU17yA3rNq+oZME5BSu8ID9wxiN482JxH5f+t3JfaxmkC8If4ERke4rc9Z2+tfZOdrrdM2 ABczUue6PZJsgJLX+XrfST6vONDHtCR/+BilNFqiM+HO1g3Ox66hEarKUsDOOo3H/CeO5h uB9YvnpyFw9953kcLS8jKY5mqp+hCoYzQfCeDqULndIYNB/C8w7y5QPPH9LZ4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668741634; a=rsa-sha256; cv=none; b=KOgAboNQxwtQdXW/k/nVeoInsTidiGW525RVRX6jyugAE4+eYCBNFiYeyf3kQet3JR1wEX NpwuqmJPW0s+v7fWxFdSwQVSBRQHFFO5Xic4l/SIVo/xRwiipOTRllnkXE78HViqrgE9Sg DCgdN4QIX81+F0+IGkJdFZSsm1bkd6wcAHXjfR3AK1+MY1ScqMi6UW9SLHLr7RK5hxZgSx wECGVjNsskP+lLig3ZmY1dUU4xTf7IPHNNNJGw1sYMziJiZTobPg4Nn7MVPVIQolHkc6Ak LK3TORPdeNHmEbGw6uR2friF5OHOx0i4Otlzr/cE4pViQdBw01rnY55MvL0Wzg== 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 4ND29G2x5Nz15NB; Fri, 18 Nov 2022 03:20:34 +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 2AI3KYai045121; Fri, 18 Nov 2022 03:20:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AI3KYdF045120; Fri, 18 Nov 2022 03:20:34 GMT (envelope-from git) Date: Fri, 18 Nov 2022 03:20:34 GMT Message-Id: <202211180320.2AI3KYdF045120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: 3beee54141b3 - stable/12 - OpenSSL: Regen assembly file for OpenSSSL 1.1.1s 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: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3beee54141b3afacb830c515e8ca82a79a7ee81c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=3beee54141b3afacb830c515e8ca82a79a7ee81c commit 3beee54141b3afacb830c515e8ca82a79a7ee81c Author: Jung-uk Kim AuthorDate: 2022-11-01 23:12:09 +0000 Commit: Jung-uk Kim CommitDate: 2022-11-18 03:16:20 +0000 OpenSSL: Regen assembly file for OpenSSSL 1.1.1s (cherry picked from commit f443d0802a21279387596ec2c9644d3e91ca0431) --- secure/lib/libcrypto/aarch64/aesv8-armx.S | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/secure/lib/libcrypto/aarch64/aesv8-armx.S b/secure/lib/libcrypto/aarch64/aesv8-armx.S index cd33ebf8e258..42478451e9f8 100644 --- a/secure/lib/libcrypto/aarch64/aesv8-armx.S +++ b/secure/lib/libcrypto/aarch64/aesv8-armx.S @@ -600,17 +600,17 @@ aes_v8_ctr32_encrypt_blocks: #ifndef __ARMEB__ rev w8, w8 #endif + orr v1.16b,v0.16b,v0.16b add w10, w8, #1 + orr v18.16b,v0.16b,v0.16b + add w8, w8, #2 orr v6.16b,v0.16b,v0.16b rev w10, w10 - mov v6.s[3],w10 - add w8, w8, #2 - orr v1.16b,v6.16b,v6.16b + mov v1.s[3],w10 b.ls .Lctr32_tail rev w12, w8 - mov v6.s[3],w12 sub x2,x2,#3 // bias - orr v18.16b,v6.16b,v6.16b + mov v18.s[3],w12 b .Loop3x_ctr32 .align 4 @@ -637,11 +637,11 @@ aes_v8_ctr32_encrypt_blocks: aese v1.16b,v16.16b aesmc v5.16b,v1.16b ld1 {v2.16b},[x0],#16 - add w9,w8,#1 + orr v0.16b,v6.16b,v6.16b aese v18.16b,v16.16b aesmc v18.16b,v18.16b ld1 {v3.16b},[x0],#16 - rev w9,w9 + orr v1.16b,v6.16b,v6.16b aese v4.16b,v17.16b aesmc v4.16b,v4.16b aese v5.16b,v17.16b @@ -650,6 +650,8 @@ aes_v8_ctr32_encrypt_blocks: mov x7,x3 aese v18.16b,v17.16b aesmc v17.16b,v18.16b + orr v18.16b,v6.16b,v6.16b + add w9,w8,#1 aese v4.16b,v20.16b aesmc v4.16b,v4.16b aese v5.16b,v20.16b @@ -665,22 +667,20 @@ aes_v8_ctr32_encrypt_blocks: aese v5.16b,v21.16b aesmc v5.16b,v5.16b eor v19.16b,v19.16b,v7.16b - mov v6.s[3], w9 + rev w9,w9 aese v17.16b,v21.16b aesmc v17.16b,v17.16b - orr v0.16b,v6.16b,v6.16b + mov v0.s[3], w9 rev w10,w10 aese v4.16b,v22.16b aesmc v4.16b,v4.16b - mov v6.s[3], w10 - rev w12,w8 aese v5.16b,v22.16b aesmc v5.16b,v5.16b - orr v1.16b,v6.16b,v6.16b - mov v6.s[3], w12 + mov v1.s[3], w10 + rev w12,w8 aese v17.16b,v22.16b aesmc v17.16b,v17.16b - orr v18.16b,v6.16b,v6.16b + mov v18.s[3], w12 subs x2,x2,#3 aese v4.16b,v23.16b aese v5.16b,v23.16b