From nobody Mon Sep 30 19:59:42 2024 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 4XHX3L4fw2z5XZyM; Mon, 30 Sep 2024 19:59:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHX3L4CXhz4DR6; Mon, 30 Sep 2024 19:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727726382; 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=se627TDXf+L83fZiVNSr2uoxRn/XkwTEiMTbKLHmpOo=; b=KjJqIMQ4Y8KZ5QbSv6a/R/KQ0MqBlXNL7dhiLuVzIki18wEP7tviDTA6MACqk0jNJniC6b 3+bee6E77N0wLxDIZkTHoQO/ePtUPeCA6lViy427BHat2oWqKhD8HwJVK2KmORvaqep5rM ieExNX7sSF67GtmgIDo+kxTeWwMGkFiv95uWAG4X5DMYkNVpXTAxkIVc6lNeSnHcuGIjPN OU6I9LNj5wxOqqiTWt/qrXDKp/jdL8ryhyif0qxXpJnHTcespQNI6NaJtvepV3cEXC3N4b pd7kNaiSbk2sLpyD0O7EKEeSGL8yYkCVrpY5KH3nNFmBeUi96Qhf95kjOOfZXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727726382; 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=se627TDXf+L83fZiVNSr2uoxRn/XkwTEiMTbKLHmpOo=; b=OvAkig+irvFqOgFkWtajnv+o1AE3Zv9fqBd1jGC0akSes6qLPk718PD6R/pwQFWFBVjh4o JeacWZFgudXTbQFgn5bK2gkVF5AdCOo+aCtTPZI5itntVSpc2HhIdFKXYNBcswdycQZ10f uNLJIHpt3Q6XG/9mi2nVOBa2BdmFcBqApW/VLwChjsUQOiTHwr8v2rng8Cp63YqyTSkOmB dEzeHjR5r1jp8pxe/8i3RASXrfVS1wN+2BHndEShqGRRnjlA0JGZylOGF0zpubMyOB1+Of E28ueCLwr/OIlnhGX48UfnILkUZY7gqhV/i0Lg/q1kepVB4bPfq9noIUoKlWOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727726382; a=rsa-sha256; cv=none; b=AkKxKZJdtFHw5JY4PEDXiRVfgcKkDLkmPQkxhvXam1baDHzaPTHnRVoEdVJvidVvINEBtN HlRlT5hl0tiZtoxVcN7O4XlNQ7PUtNjZt3X+SZIw9LTU7cmfqh9UQtn6nrR+95CJKUYlb9 PiYBzx2A+fGsGK76I7ZpQhUtcG6R7ZRmtubiBoIa7uyiUlrI+l5vwULRPQPuxHM0gtwiY1 JNFC/JFz5j8uOECtrnZEKuDfnqjMswovxL4MnbXbPAJ9YLi8D6wbF6Q87ENOhWun0u4/bc QHOkJj5n5B4zDksnQmOMDIEyYnfmTq+t50B/g/3qvwNhYiQ+Kcwle47Ep3rnag== 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 4XHX3L3psFz16p2; Mon, 30 Sep 2024 19:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UJxgIx073187; Mon, 30 Sep 2024 19:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UJxgug073184; Mon, 30 Sep 2024 19:59:42 GMT (envelope-from git) Date: Mon, 30 Sep 2024 19:59:42 GMT Message-Id: <202409301959.48UJxgug073184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: c02bc0aa0b22 - main - libmd: re-apply masking of _Transform names 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c02bc0aa0b22009e4bc209efae99c877167e1161 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c02bc0aa0b22009e4bc209efae99c877167e1161 commit c02bc0aa0b22009e4bc209efae99c877167e1161 Author: Kyle Evans AuthorDate: 2024-09-30 19:54:42 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 19:59:31 +0000 libmd: re-apply masking of _Transform names Visibility can get complicated when, e.g., ifuncs are involved. In particular, SHA256/SHA512 on aarch64 use ifuncs for their _Transform implementations, which then exposes global symbols of the same name that break things trying to statically link both libcrypto and libmd. Revert this part of the _Transform removal to fix the pkg-static build on aarch64. Fixes: 81de655acd2 ("libmd: stop exporting Transform() symbols") --- lib/libmd/ripemd.h | 3 +++ lib/libmd/sha.h | 3 +++ sys/crypto/sha2/sha256.h | 3 +++ sys/crypto/sha2/sha512.h | 3 +++ sys/crypto/sha2/sha512t.h | 6 ++++++ 5 files changed, 18 insertions(+) diff --git a/lib/libmd/ripemd.h b/lib/libmd/ripemd.h index 07293dad0e5f..252483be0a17 100644 --- a/lib/libmd/ripemd.h +++ b/lib/libmd/ripemd.h @@ -109,6 +109,9 @@ __BEGIN_DECLS #ifndef RIPEMD160_Data #define RIPEMD160_Data _libmd_RIPEMD160_Data #endif +#ifndef RIPEMD160_Transform +#define RIPEMD160_Transform _libmd_RIPEMD160_Transform +#endif #ifndef ripemd160_block #define ripemd160_block _libmd_ripemd160_block diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h index cd4a899bee49..3d1cd8da3ae2 100644 --- a/lib/libmd/sha.h +++ b/lib/libmd/sha.h @@ -138,6 +138,9 @@ __BEGIN_DECLS #ifndef SHA1_Data #define SHA1_Data _libmd_SHA1_Data #endif +#ifndef SHA1_Transform +#define SHA1_Transform _libmd_SHA1_Transform +#endif #ifndef sha1_block #define sha1_block _libmd_sha1_block diff --git a/sys/crypto/sha2/sha256.h b/sys/crypto/sha2/sha256.h index 77237c466bd9..150f1b63b9c2 100644 --- a/sys/crypto/sha2/sha256.h +++ b/sys/crypto/sha2/sha256.h @@ -72,6 +72,9 @@ __BEGIN_DECLS #ifndef SHA256_Data #define SHA256_Data _libmd_SHA256_Data #endif +#ifndef SHA256_Transform +#define SHA256_Transform _libmd_SHA256_Transform +#endif void SHA256_Init(SHA256_CTX *); void SHA256_Update(SHA256_CTX *, const void *, size_t); diff --git a/sys/crypto/sha2/sha512.h b/sys/crypto/sha2/sha512.h index b78fde7dc22f..206b7e63dc34 100644 --- a/sys/crypto/sha2/sha512.h +++ b/sys/crypto/sha2/sha512.h @@ -71,6 +71,9 @@ __BEGIN_DECLS #ifndef SHA512_Data #define SHA512_Data _libmd_SHA512_Data #endif +#ifndef SHA512_Transform +#define SHA512_Transform _libmd_SHA512_Transform +#endif void SHA512_Init(SHA512_CTX *); void SHA512_Update(SHA512_CTX *, const void *, size_t); diff --git a/sys/crypto/sha2/sha512t.h b/sys/crypto/sha2/sha512t.h index dc8025e4a74f..26a6909cbbac 100644 --- a/sys/crypto/sha2/sha512t.h +++ b/sys/crypto/sha2/sha512t.h @@ -68,6 +68,9 @@ __BEGIN_DECLS #ifndef SHA512_224_Data #define SHA512_224_Data _libmd_SHA512_224_Data #endif +#ifndef SHA512_224_Transform +#define SHA512_224_Transform _libmd_SHA512_224_Transform +#endif #ifndef SHA512_256_Init #define SHA512_256_Init _libmd_SHA512_256_Init @@ -96,6 +99,9 @@ __BEGIN_DECLS #ifndef SHA512_256_Data #define SHA512_256_Data _libmd_SHA512_256_Data #endif +#ifndef SHA512_256_Transform +#define SHA512_256_Transform _libmd_SHA512_256_Transform +#endif void SHA512_224_Init(SHA512_CTX *); void SHA512_224_Update(SHA512_CTX *, const void *, size_t);