From nobody Mon Apr 17 00:25:48 2023 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 4Q07BN4ty6z44xV7; Mon, 17 Apr 2023 00:25:48 +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 4Q07BN3b5Kz4QdP; Mon, 17 Apr 2023 00:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681691148; 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=Fh6mZTb4mokGHcBDd8T5P841MLCk9ylFVtRSlkwkuCA=; b=mP1KLKtzbFMwl18TuenIzgLr5c1BK7n0N5IDD5tBWk7gw67ubWXCyTabFl1+VBe4R00p+k nKxH77ogd2lAVeHW/nSRclijuklKcnhTQsAqFsdgvvBHJg1fBlVaxW1SVUmuPwhnw+OE1w kXaDzy/nOKU2SpLpwDn7H6dgMsCpVDecy86DUOQCZGg/ttkZsFVcSFREtCs/jbVDAhjJ7W /fT0V5hMVbf9ZjWy0S/UuPAWWW2/AX6SNOyqXPjOaPuWMXEvcK8l9gT50b+/i8OEdu7ivg fk2kMO/mLKicvayePvf/X5fStHQftqiUkLcQWm8n/7gTG+K3YF2RNXo+vnpLTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681691148; 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=Fh6mZTb4mokGHcBDd8T5P841MLCk9ylFVtRSlkwkuCA=; b=C0TUlJ6as7T6IljmQ4NBCPHNjWGnHHtQi39ss9a+hrtUrkWbdWSWYDmbCB5HJzRSdXaPRO 3tY/Cicvw2EeZR27MOv4gesVe1zthwmWjboINmqEGmLOLClKcSOVETGlqLknTDOdb816MR r8SV2Gxpq3xRr8hFgBBbxHqSJ17QGB2yLRbtWuh7kYLSDQK7EFe4OvL3Gcz0mgHJE0lEUw toz61I+BIUvrqbTTazan68j8HlH6+KcI/3FzAvTY9XifLWDPpzDsfq16Ju47dN9MlI/UQZ 4naVav048L0W1oAAY/t8KKvfjUvBtpU9K+3cTxU0oZKQHRGRcVcgZsktJYfxwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681691148; a=rsa-sha256; cv=none; b=OUUinn2AyREyPnkVbN1P1HJMsUCbyXKQt8xopCg87dM8euR43hxt790ChthRiR9EzpNUaA Uoxa1lFBG2UuLJgRewbE6VQVgMxmXG78ObkGgaPZPnx3Jr+chQhtz7lVAlabcrDcVCo4SD 7Bf0v1b5K1SL6o5VK0INUIUAHZ2+PJCakcEZwIG9+ti32ZBqUNTCaAd49NjMCOMzOQnfUD qoWusEwaO1nJJOjO4Sp1jt/zyBzhUcay5MovTrgzOhmZUTF7jowDz0U+JwkcC3tzpQh4dh 2eiB5ifvXm/cf7j2vkC8W68T5v25Gal5ATzFPKnEhZ7Wh7G/kWEUcHwszlHavQ== 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 4Q07BN2hGZz17Yb; Mon, 17 Apr 2023 00:25:48 +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 33H0PmDU054486; Mon, 17 Apr 2023 00:25:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H0Pmg1054485; Mon, 17 Apr 2023 00:25:48 GMT (envelope-from git) Date: Mon, 17 Apr 2023 00:25:48 GMT Message-Id: <202304170025.33H0Pmg1054485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 2e6a433811fb - main - veriexec: allow sha512 fingerprint in manifest parser 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: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e6a433811fb09e644d8105d4654bcce27f84905 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=2e6a433811fb09e644d8105d4654bcce27f84905 commit 2e6a433811fb09e644d8105d4654bcce27f84905 Author: Stephen J. Kiernan AuthorDate: 2023-04-16 23:25:27 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-04-16 23:25:27 +0000 veriexec: allow sha512 fingerprint in manifest parser MAC/veriexec already supports SHA512 fingerprints, therefore the veriexec program should also. Reviewed by: sjg --- sbin/veriexec/manifest_parser.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/veriexec/manifest_parser.y b/sbin/veriexec/manifest_parser.y index 5889650f824b..5e024d97f0dc 100644 --- a/sbin/veriexec/manifest_parser.y +++ b/sbin/veriexec/manifest_parser.y @@ -56,6 +56,7 @@ static struct verified_exec_params *params = &oparams; # define SHA_DIGEST_LENGTH br_sha1_SIZE # define SHA256_DIGEST_LENGTH br_sha256_SIZE # define SHA384_DIGEST_LENGTH br_sha384_SIZE +# define SHA512_DIGEST_LENGTH br_sha512_SIZE #endif static int fmode; @@ -72,9 +73,8 @@ struct fingerprint_type { static const struct fingerprint_type fingerprint_table[] = { { "sha1", SHA_DIGEST_LENGTH }, { "sha256", SHA256_DIGEST_LENGTH }, -#if MAXFINGERPRINTLEN > 32 { "sha384", SHA384_DIGEST_LENGTH }, -#endif + { "sha512", SHA512_DIGEST_LENGTH }, { NULL, 0 } };