From nobody Sun Sep 29 15:25:17 2024 X-Original-To: dev-commits-src-branches@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 4XGp1B2Btbz5XpCl; Sun, 29 Sep 2024 15:25:18 +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 4XGp1965LGz4l32; Sun, 29 Sep 2024 15:25:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727623517; 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=mGmTRRai800NPkGxQSyqey1+zTWcrDU49EsPm9zoAOU=; b=Qsgj/6DuGt8VeBeWx+kqEzQzNqMz7thJ5w9vqQUTnYM3q/Smk/fF2YZL6sLaPa1/rCBqgp 7Pt7LLMjNvEnclDphYbqSb7pMdiE8umnbEOkbAfqLTzXgN33IQG0qICYBADT1lGNKs05Ho pZDEU+qD13c+Sf4bTGAvbJr9mGWl4x8fLieQI8LLYyGdTYhR7gBmhMpu5snw4n4pTdUgul lCZ3j9DGvFvh02NbJ6IWxNzlCGAayz8dTg7zuC1OPkTPIK42F/2AjDHUNay2/L6RjJ1LzJ FuXYdwHtsO+oLQvuzP3l2i2i6AzrGY1ecV5wvArL8OEFJRnhz3vNiXqwKR+EZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727623517; 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=mGmTRRai800NPkGxQSyqey1+zTWcrDU49EsPm9zoAOU=; b=OP3Rsrfbv8P6VC/rg6QKorCyOMyQzSrFpRXqTRezprb0l2YGEWqnEmRNRla/sJDapS7Fg1 ycD3i1vyx7/7NccLyaKLXyEbVEUNsRWuciC7N+x4quX/jPdoI1w2gQUNkIucs5rga/h2zn TNPuYypiRKYmlAfOOzgO6Y9bVGsctGgxD9dJgyAHV2af3d7b2fug8dMqAT5zQ1Tn7lw1fQ K9DNHnGtvhJQl40e3BPAiPb+qeq4vMvSyz82b9lklpfm2gKeTidlbCdhB7J8QPy9QKk+xD Dp1hySUE+pw1RYAeVjZfNmtoqdMvRVuPo9Tk6y2vLLubjW3yjY5IZImEZp1D+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727623517; a=rsa-sha256; cv=none; b=WSB7Z8PuQPfd91pxblZlBoxZlHXEZXSVNlzVhcYnTsRe8Fujj4sh6Y0UTQ5WhEnKGjefIA TqABVZfjWPWInVD/6kGV3oJh8NyhqDa0OyICrNDIX0Mr/rgKc3aAGH0zoscZCR1e5A3E0V e2CsssZAFIE1DUi2aI2EI8QswlJ7vo77dDibEXiSIC710ARAIXTuILywkuKYLTv25GVGlv +jkIJi1jdem7K0GHLNGmLotzjW22J/m0rbRYbYu66IcChXapehHcrQUSa2Fs61Ng+ppXGn 3PhmBkKWQZO1T5BdzslqV+a34U0rWaM/G1SXHGfrjIm2mJpTMryqZ1i1Ea+OaA== 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 4XGp195N3qz1CxS; Sun, 29 Sep 2024 15:25:17 +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 48TFPHEr030504; Sun, 29 Sep 2024 15:25:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48TFPHb7030501; Sun, 29 Sep 2024 15:25:17 GMT (envelope-from git) Date: Sun, 29 Sep 2024 15:25:17 GMT Message-Id: <202409291525.48TFPHb7030501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f216bddf84e6 - stable/14 - loader: Make pkcs5v2 unconditionally available List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f216bddf84e67b80bb0f55fcc93dde0c7a557f60 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f216bddf84e67b80bb0f55fcc93dde0c7a557f60 commit f216bddf84e67b80bb0f55fcc93dde0c7a557f60 Author: Colin Percival AuthorDate: 2024-09-18 11:02:08 +0000 Commit: Colin Percival CommitDate: 2024-09-29 15:24:52 +0000 loader: Make pkcs5v2 unconditionally available This was previously only available if GELI support was included, but I want to use it for processing entropy from EFI Reviewed by: imp MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D46634 (cherry picked from commit 925f15731e3480fe80f580a2f7463cb5210a95c8) --- stand/libsa/Makefile | 4 ++++ stand/libsa/geli/Makefile.inc | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index bc85a3dcb0de..1b37812a3226 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -164,6 +164,10 @@ CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS .PATH: ${SYSDIR}/libkern SRCS+= explicit_bzero.c crc32_libkern.c +# Bits from GELI which are reused elsewhere +.PATH: ${SYSDIR}/geom/eli +SRCS+= g_eli_hmac.c pkcs5v2.c + # Maybe GELI .if ${MK_LOADER_GELI} == "yes" .include "${SASRC}/geli/Makefile.inc" diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc index 07600d5287bd..8300359a465a 100644 --- a/stand/libsa/geli/Makefile.inc +++ b/stand/libsa/geli/Makefile.inc @@ -21,10 +21,8 @@ SRCS+= ${i} .endfor SRCS+= geliboot.c \ geliboot_crypto.c \ - g_eli_hmac.c \ g_eli_key.c \ g_eli_key_cache.c \ - pkcs5v2.c \ # aes .PATH: ${SYSDIR}/opencrypto