From nobody Fri Apr 14 05:20:23 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 4PyPsg5MDzz45RS5; Fri, 14 Apr 2023 05:20:23 +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 4PyPsg4cDLz3Ngs; Fri, 14 Apr 2023 05:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681449623; 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=Hn4fBS1mcJExh/c5VVLYMVmYhUbAFcqvEzPohPMDCHU=; b=WihJ/f6Ei8yXWaSjpI6cXyYDV1fKJ5TTXo/yEjYXga2FmR2/nAzqIhj3+4T5VtRqClV0bi T7k+hy+THdISOXp7zxWCogX+5fJbHXVV3oQL4RioOvO44USPHmwOka0RhWVVwJIM1C5SpC jpYcnGq6wFK93nyTSZJBqzggNvoAGMhtmWhrRsNRZR+JgpKRVJyEOmR7yS2bFF9hX/1MXe BHHqL0NjtNSmniWX4TUYzb6cEImP76NRDquez8P9q0Z/GBl3TYhZYoiPXxm0nEk6aJZ93w ZYXXG2mnM4jm94hp5iN4Vk2W08ZT79fs8+/XbQKksd+QH5C4aDcckeihT/kctw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681449623; 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=Hn4fBS1mcJExh/c5VVLYMVmYhUbAFcqvEzPohPMDCHU=; b=UZTk+ar/ooTrygXndmXvsUks1ox6zHG4tGO6mAmPKDEs1tl6SMbMet+tjqXzVJwIbmir2h tQXAjKoHBDYH+0QAevwpTglkDkky7rvdkJk4TEk5iUaT+I+fp5oB/bU36Ebp2DCdiYFirE dQ7jQk9sUWgIwBc+TosqrGtvjBw0dYQ3Uz4RtzBFtxnRCMewadASWXDfwueUjPWfodWNDh f8FRepO5uEo/5NzttnIcGPivy/VzAksyBovrIxytQdRKXUhiwfVvR+T14PaPAieK86Tjtz d2oCw89BqrQMkVLg7h/zcm6Viqw9Jp2jnRkcZ1Sn+yiRWtCCC5x+uJi9txjyNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681449623; a=rsa-sha256; cv=none; b=AWtyvwzLA8+QB33ctNP1JQNqWPkppWt+w1ZJgWX1qlZ9uiJteJH0EIER2E8y8BIKFSBbsY zxCt5bpC0uhkx+DMf3DfvdX9Sgl30QJjCu/unYX9j78O6PBpwuE0cITphvDw4JL4LNCF5E OGOLrMqqyhGG5gpjYMZQnQDPc6A5qnQX6sw1/rbEhRThCg9vfeI5TETqsaNN0wyN/CL6i4 +wvf4pG/7OBjFOhoWYgdEDFAFI8mMD+6y5JhBIAHARg7RKnOVdNzEAS9EwalYmcFvC8gvn IHxTpJO+NGcYST/uNXoNq8WkaQHJzsA9EUL7UjvfSdrhXhJXjnvEwNfQ5ycERQ== 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 4PyPsg3bcdz1BXn; Fri, 14 Apr 2023 05:20:23 +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 33E5KNSZ029088; Fri, 14 Apr 2023 05:20:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33E5KNBU029087; Fri, 14 Apr 2023 05:20:23 GMT (envelope-from git) Date: Fri, 14 Apr 2023 05:20:23 GMT Message-Id: <202304140520.33E5KNBU029087@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8dd1299ca599 - stable/13 - Move ve_check_hash prototype to libsecureboot-priv.h 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8dd1299ca599cf7844a4b34c3c6b41df6287c4ff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8dd1299ca599cf7844a4b34c3c6b41df6287c4ff commit 8dd1299ca599cf7844a4b34c3c6b41df6287c4ff Author: Simon J. Gerraty AuthorDate: 2021-12-19 00:34:58 +0000 Commit: Gordon Bergling CommitDate: 2023-04-14 05:19:10 +0000 Move ve_check_hash prototype to libsecureboot-priv.h Reviewed by: stevek (cherry picked from commit 623ecf23325691a0cc13991e160b5f5d11471830) --- lib/libsecureboot/h/libsecureboot.h | 3 --- lib/libsecureboot/libsecureboot-priv.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libsecureboot/h/libsecureboot.h b/lib/libsecureboot/h/libsecureboot.h index 33f98bca0479..79b5cc46ee97 100644 --- a/lib/libsecureboot/h/libsecureboot.h +++ b/lib/libsecureboot/h/libsecureboot.h @@ -66,9 +66,6 @@ int ve_self_tests(void); void fingerprint_info_add(const char *, const char *, const char *, const char *, struct stat *); -int ve_check_hash(br_hash_compat_context *, const br_hash_class *, - const char *, const char *, size_t); - char * hexdigest(char *, size_t, unsigned char *, size_t); int verify_fd(int, const char *, off_t, struct stat *); int verify_open(const char *, int); diff --git a/lib/libsecureboot/libsecureboot-priv.h b/lib/libsecureboot/libsecureboot-priv.h index bdf0c5c0c9bb..713ba6266cc5 100644 --- a/lib/libsecureboot/libsecureboot-priv.h +++ b/lib/libsecureboot/libsecureboot-priv.h @@ -38,6 +38,9 @@ typedef struct { size_t hash_size; } hash_data; +int ve_check_hash(br_hash_compat_context *, const br_hash_class *, + const char *, const char *, size_t); + size_t ve_trust_anchors_add(br_x509_certificate *, size_t); size_t ve_forbidden_anchors_add(br_x509_certificate *, size_t); void ve_forbidden_digest_add(hash_data *digest, size_t);