From nobody Tue Jan 24 22:10:41 2023 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 4P1h4K70n2z3bf41; Tue, 24 Jan 2023 22:10:41 +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 4P1h4K68xmz4Kvw; Tue, 24 Jan 2023 22:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598241; 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=krPML/KJZAcyIU5lfNgCkvIFHXlKjOObpKD3NiA8xxI=; b=rIK6ZMXZZs4z0zWj08/UbQvH3w0AhjS9q5yfCpFxIc344jxmiuZAuqo5ZhESaxrr1Fddgb P84mQ+6hb8IE9yiwLQwd/X0zQvfQNtHsASHphwSpx3zgcKU1uxP4BjYbY2dBlnI2fAqJ8x VT4C+zIJno9sVJEmFg6b1hBbIzOq/Xa9r75wi6L9BZe0WFisFmS7CMEezmLr89JpaxG7FX Kfyr8+movkIpqkJ3EcCp/bxJXygLf/owycAcvrHiIJtFxSynvKAxCCz7tfqdOqRk180UPz BMdlQYzJgVgxaOxa/acY8+ccH1llvaXYuUg3PnFop/NkYEe0lHJoO8Ewwd7hoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598241; 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=krPML/KJZAcyIU5lfNgCkvIFHXlKjOObpKD3NiA8xxI=; b=b/u5LSFRHu1MBfYoIK9Q35sIAjlzARpvwW8KEEHLjTaBzIlmSWNdfRvk1FDUJeD6FAT0AW QbNh2kPYD48QqXS739zAfKOWC3thR6X91oISGCMs+gLVb4CuyaACugx49aVEUFzDsAhyfY ovUZJfs2c/8DITkEQedqIhKps3iWWfdZBWeGbDI+MO1E5VA0VhiVJ3AFkK5P9CjdFPvhHA JpZ9J3qM8dQyMXRN65/cxUGCJV76QuekBhTjEfyRZgj4HmWvWkamZsNhn/VOHJUjAumYNS vlkqLq1hwqEkyVNiJmYtl2fbli4s+haNMLb8zsvvNtFVSqN+cP756SYJrxT7xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598241; a=rsa-sha256; cv=none; b=bjPnwccK2pt63VYEqhABSG3sCtKIkVObxwPPUIj9U7qQy6/PEXO4Q/H5S8WmbjN84lUOcA GMoT0B/CgHOx+hjOWvy2K7EUeeu40jzN4KQG1c9Qc53NYf/NJl92IlLMzsvFfMwGfzThlT F6YYBNwJklbEUqISDzY2zQFshqpYL45gISEyczHgOqSziDwTkvCp9c5SfjS+hmJc/2ExdP RRLSIEims32oCyPoDb7Ebof9gWik2k1aTKaIP35vn2yMV6j5ZN7HdUCJiuGJDTzunVEwL/ 5FqmGEHoYKdHXEodaGvFdAhmuwly8J0mNrxzzKCesmYJW6w/T1mFnf2OAzcE1g== 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 4P1h4K5DrRzQFL; Tue, 24 Jan 2023 22:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMAfEH080404; Tue, 24 Jan 2023 22:10:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAfSr080403; Tue, 24 Jan 2023 22:10:41 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:41 GMT Message-Id: <202301242210.30OMAfSr080403@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: 165e199aebeb - stable/13 - stand: geli CFLAGS tightening 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 165e199aebeb4622ba0e7a84e376c7d9653748fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=165e199aebeb4622ba0e7a84e376c7d9653748fd commit 165e199aebeb4622ba0e7a84e376c7d9653748fd Author: Warner Losh AuthorDate: 2022-07-08 16:02:17 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:22 +0000 stand: geli CFLAGS tightening Only add -DWEAK_REFS to sha256.c and sha512.c instead of everything. Remove redundant include that's not needed. Minor formatting tweak. Sponsored by: Netflix (cherry picked from commit eaf7aabddcde9bf9eecffb41ba6569de0f5fa645) stand geli: Restore include path to LDRSRC. Various GELI sources need bootstrap.h and disk.h. In theory they shouldn't need anything outside of libsa, but disk.h and bootstrap.h are currently required. This fixes the build with MK_LOADER_ZFS=no. Obtained from: CheriBSD Fixes: eaf7aabddcde stand: geli CFLAGS tightening Sponsored by: DARPA Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D35861 (cherry picked from commit bb7ddd077c2528b37399304d7a9bf70b25c42b47) --- stand/libsa/geli/Makefile.inc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc index 734bcf6be5e6..88a3bad82a0e 100644 --- a/stand/libsa/geli/Makefile.inc +++ b/stand/libsa/geli/Makefile.inc @@ -3,14 +3,13 @@ .PATH: ${SASRC}/geli -CFLAGS+= -I${LDRSRC} - # Our password input method -SRCS+= pwgets.c +SRCS+= pwgets.c # sha256 and sha512 from sys/crypto .PATH: ${SYSDIR}/crypto/sha2 -CFLAGS+= -DWEAK_REFS +CFLAGS.sha256.c+= -DWEAK_REFS +CFLAGS.sha512.c+= -DWEAK_REFS SRCS+= sha256c.c sha512c.c # md5 from libmd @@ -27,11 +26,11 @@ SRCS+= ${i} # local GELI Implementation .PATH: ${SYSDIR}/geom/eli +.for i in geliboot.c geliboot_crypto.c gelidev.c geli_metadata.c +CFLAGS.${i}+= -I${LDRSRC} +SRCS+= ${i} +.endfor SRCS+= \ - geliboot.c \ - geliboot_crypto.c \ - gelidev.c \ - geli_metadata.c \ g_eli_hmac.c \ g_eli_key.c \ g_eli_key_cache.c \