From nobody Sun Sep 22 07:36:45 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 4XBHxn4Xp3z5XYH0; Sun, 22 Sep 2024 07:36:45 +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 4XBHxn1BwYz44hq; Sun, 22 Sep 2024 07:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726990605; 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=5oxfBQLes+yrDz1Qf3hVOEWCe5Ctt+DbFQMohJRAg80=; b=qUr/jbU8D5l4eC2fwetH8p88B+AdmGSo3VFMFNQVHKO8zu1aXMUuoUDdWcCVV6YsxzVpAt Ud5sEkWbSRPjg6cMCbe0nkFfgP7jNUwaBsfPpsnGk03tr8UEWlkOvgGM9mh3bgx1UpRi+6 ljQ0ygPUABVryBpc3UGupbgoljSj/5R71ai5q0qYy2lOZBePEby50toCPiJJXuDvel3CUm 7J8HiZ+ZW4vXyVBwZ4OIMDyxAQ2r9ZcvanfyCQyOc4KCcw8r8jHO9NxixI1+utXmFEkcg6 Zh+JQGg8gVFsBkUJQnNKrY4OLrQhqQp+jOj7JiI/oRiJgDbw2DlApRj+KUlVdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726990605; a=rsa-sha256; cv=none; b=dW5QOEprkZb9WUDN8lVYggZbNR0VR7+DmUlEC3Rmz9n4//yPD1OwVXrT1SxmH0MMd6fPuv 24eGVTE/qj2mWP0PkoHQbsK8nOPRgGqTtlYyfOK1fFdmrb7QKwrPUdQSOQZi66N2d4wIkl c34AEFi6QHwcsNC0y/W8KDCb04lOBXzqmbOp95cTRtFKZjEgYvkKd2d3Rq8R6fTomr7O3y duwmkglUKpVzpZNEJhHI67oZhUT5+yfsYWomQQ7zlB4sYt2dTSZ7ku437l7aIGxKWJn6Fv w9KsyCA0z22/5TV+tHPb6P3MjuaOynuJ+pFlQBKiB+zRWjTYO3fJj0qQ78S4bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726990605; 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=5oxfBQLes+yrDz1Qf3hVOEWCe5Ctt+DbFQMohJRAg80=; b=AFwvpB/vDfEisnm9wLnSuo8+nIIgI3Yn78JGYBPPOZ5PyovVsH6/ad8B9nJR2PgQ4BzSO+ Xjx812Jl3YOTcsw0rlJP8c8FWcrObSQsoFGrN/ggFiIzcB9AmtakgBh5LpnfNm/XxDMjRc p/NYOp86yuniU3gmdaZ0kb0vmi2RcOM+FyteLpaFjLUtq78Nv2AxUmXiLf0BWXp4nf/Ela qEEW2MtZHWuMTZhXmJ9ZKJEO00M/2WEATPZ1ijQrbdpb5M5De9CUzs8n3KmaL2xw7FDT+E VVc/WCnEg07zdwAvEGq4R1N2JCr7b5GgrtJeYNVcOqQqqey+49CDIJlvhjsVtw== 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 4XBHxn0qJFz16qZ; Sun, 22 Sep 2024 07:36:45 +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 48M7aj3m097221; Sun, 22 Sep 2024 07:36:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48M7ajnT097218; Sun, 22 Sep 2024 07:36:45 GMT (envelope-from git) Date: Sun, 22 Sep 2024 07:36:45 GMT Message-Id: <202409220736.48M7ajnT097218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 925f15731e34 - main - loader: Make pkcs5v2 unconditionally available 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 925f15731e3480fe80f580a2f7463cb5210a95c8 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=925f15731e3480fe80f580a2f7463cb5210a95c8 commit 925f15731e3480fe80f580a2f7463cb5210a95c8 Author: Colin Percival AuthorDate: 2024-09-18 11:02:08 +0000 Commit: Colin Percival CommitDate: 2024-09-22 07:35:47 +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 --- 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 c5de2c9b8e13..dda3bfcea88f 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