From nobody Fri Jul 08 17:50:02 2022 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 5555E17D0205; Fri, 8 Jul 2022 17:50:03 +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 4Lfglv1MGcz486W; Fri, 8 Jul 2022 17:50:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302603; 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=Bdo8Xwmhdy9BlkX1K7F1xYM5Q+NnXZrwUHKfdCpt0uA=; b=KdoAWYWI4oWrUbIe8z++4qPjemw32d0pHpo2peiDAn18wVbYcLJOS0QnkLF4U1ni2VoQ9B 7/f8VwhyY/QQ08GaVdbhlcmPd0i8HGcraRCHKXEWxVx10httF31yFpMcoVV+xPrPdgaymf Cm0VjqRSBA9upno5mnH65fc4AQK9HpIwbaHNBwVeqXPvx99xDx+z47NKfNwR+CNB/LTCv7 7HyZb9AbHUOnKPaPHMEjWpFyJF/Tlv5j9ye+U2AyOFJtR0UO5Hot9iZ6BxmUx3OnFTPbhM 29v+QMBwguy2QVzWQzGDTt4b4MxK9fgWcpvTYt5Vn+63LLoDibw2I0WCGTUHzg== 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 4Lfglv0T4mzFqT; Fri, 8 Jul 2022 17:50:03 +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 268Ho2GU066401; Fri, 8 Jul 2022 17:50:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 268Ho24B066399; Fri, 8 Jul 2022 17:50:02 GMT (envelope-from git) Date: Fri, 8 Jul 2022 17:50:02 GMT Message-Id: <202207081750.268Ho24B066399@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: eaf7aabddcde - main - stand: geli CFLAGS tightening 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: eaf7aabddcde9bf9eecffb41ba6569de0f5fa645 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302603; 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=Bdo8Xwmhdy9BlkX1K7F1xYM5Q+NnXZrwUHKfdCpt0uA=; b=KPT5CH3AORKekp+Qopp0UadK5Ndd8UjMPBYtYu9gu6/gwopTCtm5VDO0SOM8nZ3/DdJf1N esulUxYne8uSA7tqNvpiHRXhEnOjJfYfxtyUvg7ZsQZ+M528kX66WlsndurPOjJ+rnFIMD j5l6792y+stqfHq7LboYW8nBQXA7xFPWaFF7i7oyAkdK0hBI4KBvqzSwfPpGzTRsPK70Xo TKNsIByROGJqsOJ6boJsfbWizuV/VNpoyFMQ0vGaXcFFIt9ah8wRGYom3btjSrBVd5TyCJ WgW4KKt3B5q3UeFFMKrw4acOlpeLeza9RolWXQlxczDptAhbtJ5sBZ78kEPICQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657302603; a=rsa-sha256; cv=none; b=pCFRza3hARdCfj5KcZ4cdV40FkhOQYxAS1NaBdGPEU6ndomAfd6EKcYJmWUG2AuVcs/5BT H8bmuOHwCLMTgLxYlXAJgpVyOsQCnMomFi9GRIZx/xJ8uGSlxO1Rvgm8AXSfBjYd0EM6BN xyMd1lhxeYKnaeXiP+C+Ba3oWi06PuqVCzSGs/mBMkYxO07VMTeasemK/sn+M2KjQtrCp4 pzhOPNxyArONf/BhYg7Dlbsy7IgiDJSHhjsoINRSGq6TiE/cMwA3/um+FAjKo86C2E+JaJ Yv2wTIJbtQfupq9cJXnPX+LoTx3eIcjqdnIjuQODdwi3krDX98Keri/4uThwnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=eaf7aabddcde9bf9eecffb41ba6569de0f5fa645 commit eaf7aabddcde9bf9eecffb41ba6569de0f5fa645 Author: Warner Losh AuthorDate: 2022-07-08 16:02:17 +0000 Commit: Warner Losh CommitDate: 2022-07-08 17:47:36 +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 --- stand/libsa/geli/Makefile.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc index 734bcf6be5e6..841eea397807 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