From nobody Tue Apr 16 20:12:33 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 4VJwFF62C8z5H0V3; Tue, 16 Apr 2024 20:12:33 +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 4VJwFF1XShz4sWj; Tue, 16 Apr 2024 20:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298353; 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=KCJoPQ3dNkdfL0socol7TK0vFs4TiTY1TbNRYTvh8GE=; b=qZsASmIoyUlQCOoaFJG9+V8LDK/UWmdvSYf87ILR53G2DJORCG8CVUuikcoGFgImoNe1aF rT9c6d3fyN7WjqSS1bcrFn9oGvZ6wURYcdq9a+BeuycpOM9tDy2AuA8/VaMw8TmKFsEVnM eB+Yxjg58Hnx0CMlyCSAzp7q7WdKhaJ6q2nxAPvH9EdoBfr5l7mDQj0JhAyWzdOxkQnFW4 OSSmZ9NhYnMRzlWzKDs+9PdZp9ClTvBaAQYUOJG4Bt5XKMHQeiNHa43/yakI+rMYrn1deE 2yrFNJYeBfEeOZFaYCpsYblizaL97veOfRvVGkwohL0bz4leFqxHYu01dKrqWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298353; a=rsa-sha256; cv=none; b=B1CJ/C+5Z9M8d/fkS1qWsFEkx82eYvQ6y1u6+WlZ1EL3ttXLUUQptm6+r7XTQ0Q45sHMId GvB9zs2Z3qbQKYv4S5XfWUNW976WlKFEzhlH73BjVP+zsDenlge8vKT9KZd6r7fyxNK0gf oZhEdURj9J6tc3ZXgcv0rfYl0LqJybZU8N2yuWwbRuOT3U9vjtlqAUER+y/IE2zcgAlFXA u31qjPm1Gdh14WmEAsE+bmy4Jrdjhops5EvFFXULhYSwv1iLh1aggD2ILXTeZrwELQboHX bpVVDIITHNUBtX8rWYEYmxpVSmDIzzTXQiPHZlvOZn/wRfmLPa2gCVQuZ+iuVA== 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=1713298353; 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=KCJoPQ3dNkdfL0socol7TK0vFs4TiTY1TbNRYTvh8GE=; b=BTMJlEkRUysFrhkQkIE6ZLqf/BR38DxdGNgb2XUoFKWPxklXZdt+4Pj6t4WcupmJ0JiBNB 1F3xfYx9Khw6Ydht9xV7cd2+OlP+7YtjYjUMAuBVhjstDCx7CGxKRjj8p7evYtQefO1h05 /9h+4fIJ3rHzf8/p2YnIsoNMWn9n6arWqsQnLYGA6ctjyQ1e+LW+cAflwDu5/JwhVwOmeN hbqKGoITKEAhOdY2fiDwGVcuiPpmb1AMNA0EHTP5xrqsh7X1yQXL3dzj4hTEyPF+s+swvn chj2o5aLztwYCTBXc3YSJ5IWjrjink45LJ8IzRqxKSnRWdfYEa3b8f4Xa43X5Q== 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 4VJwFF18C7zxdb; Tue, 16 Apr 2024 20:12:33 +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 43GKCXQV037244; Tue, 16 Apr 2024 20:12:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKCXIi037241; Tue, 16 Apr 2024 20:12:33 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:12:33 GMT Message-Id: <202404162012.43GKCXIi037241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 12138b85bb0f - stable/14 - 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 12138b85bb0f5fa7fc72d99f17ae34e94dfae26e Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=12138b85bb0f5fa7fc72d99f17ae34e94dfae26e commit 12138b85bb0f5fa7fc72d99f17ae34e94dfae26e Author: Warner Losh AuthorDate: 2024-01-31 23:54:19 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:22 +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 (cherry picked from commit fd577b59b2d78a32f40fdc3847666728d8a897db) --- 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