From nobody Fri Feb 02 21:04:53 2024 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 4TRSvp0mlmz58GhZ; Fri, 2 Feb 2024 21:04:54 +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 4TRSvn4nlqz53xb; Fri, 2 Feb 2024 21:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907893; 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=tqIo0PmTHu2S0z7iwdfkm12fQ3tLTli9sVi4g4zCLL0=; b=wNiN6YVb7q18nEB4Ae9GiUb0Iuxe8Z0YsPB017nU1iqispOzlElrx7TVr0Iz+dVUqjagwi 5SviQCoF/Y3RzWoBFMlCvEPfuTvOUxOgpByRoY15fALNm7axr75yTpju2bSvUh/jeIJYtn i/TSWeGDZNpRmYk79GsIWRGuNh0d1x3rK+s3K25Hyq+r+AMy6TPQ+xpMNLCzPnSDMC5TYj SVge/5jjeQpBQObFQlz7eyCrFGj+3OcDAFtYkbIrh75SqrlwLq9Seiifbflz064GC9DWro jo0rtr4HliB6sX6Z+Yqo9fDzVy1oyL8jUyF+yEOcCwVLsLBU541jtM6X9+KbAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907893; 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=tqIo0PmTHu2S0z7iwdfkm12fQ3tLTli9sVi4g4zCLL0=; b=q/WZugjcHLZkGXzRanMIV+W0XGHEKKDaUr6e4ZfZhe5kDthrw+SqdnfJeGxFQucVDRT65K YFD4GONq/qPm28yUZTb/GeZDR9eQTSCsKpfaq6koN4//9DOaISsskTi8MzBZXDvxccUimg ft85mb1CqDGEZknpMOIFJ4SVbBAe2P8Q/V0cvWURZbKk47vUXFbQS1HsGuaAL07agfpMe8 09yRyTzBlHpPDhxbV7YNE/FjxDw9UG/I8MrCM4X2jE2w4XPGbIpJk+dWAIqcJQoBjhtskt +oxHSIc9TMiu8QfV/mSpt2eESsvAkwDlbfzolfrfHvVFagY9+/Rdq3+u+nIbsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706907893; a=rsa-sha256; cv=none; b=QpxBWoudvcAUqUrGd8AfJ020bVqWStrl/KUclkqEemvWbKWhkMgKaWyajDhvQ6R8Mykizs U2rlxDOi2AA7+K4t/pMQzXckrrI8YpK3t1wj42xVXvirbW+9L9JD0ZgtQOlZkD3apNBdvS /6U9faGgTbujIDxpQE716G7U/Kb6wwXb+hG0I3sm69Hn/iradDwENWhH3ZBvO9b55WCJTf q3DaWDWRUpSt3tSEW7OxJ58xjXzCOs2MGfCt1h2sOcnKTmraJkWbcpHICsRrTEI234AXLf KTlbFp9Q4T5ZUD7wLe+7JpHfv+npzRT6okfFpZ/h+d+sVuATRd70iTn9+BO3wg== 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 4TRSvn3qyWzlsd; Fri, 2 Feb 2024 21:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 412L4r74056306; Fri, 2 Feb 2024 21:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412L4rij056303; Fri, 2 Feb 2024 21:04:53 GMT (envelope-from git) Date: Fri, 2 Feb 2024 21:04:53 GMT Message-Id: <202402022104.412L4rij056303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fd577b59b2d7 - main - libsa: Move hash functions up a level 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd577b59b2d78a32f40fdc3847666728d8a897db Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd577b59b2d78a32f40fdc3847666728d8a897db commit fd577b59b2d78a32f40fdc3847666728d8a897db Author: Warner Losh AuthorDate: 2024-01-31 23:54:19 +0000 Commit: Warner Losh CommitDate: 2024-02-02 21:01:03 +0000 libsa: Move hash functions up a level This should have no functional change. Move compiling the sha256, sha512 and md5 hash functions up into libsa to allow them to be used elsewhere in the boot loader when geli isn't configured. Since libsa is a .a, these won't wind up in any boot loader that doesn't reference them, so should be a nop. Sponsored by: Netflix --- stand/libsa/Makefile | 9 +++++++++ stand/libsa/geli/Makefile.inc | 11 ----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index f7d7778d5653..bc85a3dcb0de 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -180,6 +180,15 @@ SRCS+= explicit_bzero.c crc32_libkern.c .include "${SASRC}/zfs/Makefile.inc" .endif +# Crypto hashing functions +# sha256 and sha512 from sys/crypto +.PATH: ${SYSDIR}/crypto/sha2 +SRCS+= sha256c.c sha512c.c + +# md5 from libmd +.PATH: ${SRCTOP}/lib/libmd +SRCS+= md5c.c + .if ${DO32:U0} == 0 MAN=libsa.3 .endif diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc index 0d9fcb90bbd8..07600d5287bd 100644 --- a/stand/libsa/geli/Makefile.inc +++ b/stand/libsa/geli/Makefile.inc @@ -5,16 +5,6 @@ # Our password input method SRCS+= pwgets.c -# sha256 and sha512 from sys/crypto -.PATH: ${SYSDIR}/crypto/sha2 -CFLAGS.sha256.c+= -DWEAK_REFS -CFLAGS.sha512.c+= -DWEAK_REFS -SRCS+= sha256c.c sha512c.c - -# md5 from libmd -.PATH: ${SRCTOP}/lib/libmd -SRCS+= md5c.c - # AES implementation from sys/crypto .PATH: ${SYSDIR}/crypto/rijndael .for i in rijndael-alg-fst.c rijndael-api-fst.c rijndael-api.c @@ -23,7 +13,6 @@ CFLAGS.${i}+= -DNDEBUG SRCS+= ${i} .endfor - # local GELI Implementation .PATH: ${SYSDIR}/geom/eli .for i in gelidev.c geli_metadata.c