From nobody Mon Dec 20 14:02:17 2021 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 E54AF18FCAA8; Mon, 20 Dec 2021 14:02:17 +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 4JHh9P32SWz3G6B; Mon, 20 Dec 2021 14:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2B80D173DD; Mon, 20 Dec 2021 14:02:17 +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 1BKE2HZC042845; Mon, 20 Dec 2021 14:02:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKE2HYT042844; Mon, 20 Dec 2021 14:02:17 GMT (envelope-from git) Date: Mon, 20 Dec 2021 14:02:17 GMT Message-Id: <202112201402.1BKE2HYT042844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: e951219f29ca - stable/13 - libmd: Only define SHA256_Transform_c when using the ARM64 ifunc. 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/stable/13 X-Git-Reftype: branch X-Git-Commit: e951219f29ca4e407be59bf8ea87a7281d047270 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640008937; 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=cytROG96Rf7l91QvMhhVq/jneqi9cN2WYz7sgiKsjA8=; b=oucTIotNOJn/FFR5lU5Sdz8FOfhw2CAkVbjWxXJUkpaJpiDhZafZdHGLuNU2o335xBKS7V eLeCbyHWJsSA//RqFCG8Pqdj8sFfqpRbHnewnSfVpPmBc8qIec4i1YBYVPUaZnzI5I1cX8 RBOJK664ZZOZGkybDQ+4ko3/1fecxgbLrlwRPzr2KdLMGXYYVcLKGEfBcMk/xQGc806zI+ 4XkCVcKh8sBF+eoNvqLgLCY4H2HSPyYNpCnUx3QgfZk6vCcKWsRTh0MK0LEFqzJkD3AfgV fK5norKZEVBqk9E9WLKOZ1OC3CK24oZHrG+UA5O3pPAR998icMTksbJTONj1Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640008937; a=rsa-sha256; cv=none; b=kMOxzyyWN38S49AOME+6w6WyqSO8zxztrhN/ANRyaqPEMtWDbcEYnVjVAsodcCd5iMvLZo WiNONwARYkdYxt5NKa1FcjovHeYvOQMdMI0X5OBbsOICwoW27AXongICS0fHBB6BNEJ9ox ZroK9f20AanDIMs1dArQOMhEh1+T2+n5OnoxQjRmyOvcwM3kE3MKOpBNCm+Mu6yBd/dtIT RdDugO6TQokR+/W1MLJY0At1anHbxDQvLJoiuhFNx8ZtHT1y/W/APyRaX79i2cxn3uM9hu FASj3bF8Qd0jc+rlK8s69MxPn7SjPux8nQ9pUUjNREjJBmcIrLKKNQhxUvtM5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e951219f29ca4e407be59bf8ea87a7281d047270 commit e951219f29ca4e407be59bf8ea87a7281d047270 Author: John Baldwin AuthorDate: 2021-12-08 22:25:02 +0000 Commit: Andrew Turner CommitDate: 2021-12-20 11:09:26 +0000 libmd: Only define SHA256_Transform_c when using the ARM64 ifunc. GCC 9 doesn't define a SHA256_Transform symbol when the stub just wraps SHA256_Transform_c resulting in an undefined symbol for _libmd_SHA256_Transform in libmd.so. Discussed with: andrew, jrtc27 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D31945 (cherry picked from commit a6765c4b449d79c6ee24dd7c37deb2239f6281a4) --- sys/crypto/sha2/sha256c.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/crypto/sha2/sha256c.c b/sys/crypto/sha2/sha256c.c index 63805c97a4bb..57ae9e7a6ab3 100644 --- a/sys/crypto/sha2/sha256c.c +++ b/sys/crypto/sha2/sha256c.c @@ -138,7 +138,11 @@ static const uint32_t K[64] = { * the 512-bit input block to produce a new state. */ static void +#if defined(ARM64_SHA2) SHA256_Transform_c(uint32_t * state, const unsigned char block[64]) +#else +SHA256_Transform(uint32_t * state, const unsigned char block[64]) +#endif { uint32_t W[64]; uint32_t S[8]; @@ -213,12 +217,6 @@ DEFINE_UIFUNC(static, void, SHA256_Transform, return (SHA256_Transform_c); } -#else -static void -SHA256_Transform(uint32_t * state, const unsigned char block[64]) -{ - SHA256_Transform_c(state, block); -} #endif static unsigned char PAD[64] = {