From nobody Sun Dec 19 00:35:05 2021 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 848F618ED6D3; Sun, 19 Dec 2021 00:35:05 +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 4JGkJT1xcPz4bGC; Sun, 19 Dec 2021 00:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 23826191A7; Sun, 19 Dec 2021 00:35:05 +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 1BJ0Z5Ms039983; Sun, 19 Dec 2021 00:35:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BJ0Z5Vx039982; Sun, 19 Dec 2021 00:35:05 GMT (envelope-from git) Date: Sun, 19 Dec 2021 00:35:05 GMT Message-Id: <202112190035.1BJ0Z5Vx039982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 623ecf233256 - main - Move ve_check_hash prototype to libsecureboot-priv.h 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 623ecf23325691a0cc13991e160b5f5d11471830 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639874105; 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=l+qYlhS6dRWsHs1Jnud48hAvnXk//gCMGls2uezI+p4=; b=kItJjm4nDqbHwSpGktI015WjJJQo4xiACVpRVwOXLldwyrQ0kO15UmI2foKEC2qAYFMDfU JFcqkG7cGagXrzCgR1eEhW9IMCwiXEvRFCVcTxHDGpoTyPph1zNrA68wEUGkdP9Sok6Yeq 131Op008JHsB3/k3jR2eL/RQwhYHqX6graqNnQoDIZt+YVBxhjSN5KLkSGxYc/86t0VytR oztrm3837qWhymOyDSASH1hQIVis6oQh0fcvxaHnS9s6dZZXwKvf6GkRNfcld5tQ45mAlT dSNhMdAYzKnXQ9vugd91MuB7BCo1GgafdUOFXbNpb+l7Zyzr8gcLt4kVZXynww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639874105; a=rsa-sha256; cv=none; b=jt0ADdbQwakPwoXm8DYJpSkwf+P0geRzf16Ub76Fxh6wUXlMSe1Wdza5cmN2n3WvBCOwKH jzHFdiVZJRIzW06kbdZ5YEujYrI3CInGufDWpMlEU7Ua/mslpSJvXMkTtwuBhLzxtsNPqR 5I0V4iIJNwPO7EzwSNjofSklLOqymA+F+wmBX8iTkH0CZjT/Qa/73U9lcZLQSZTCqpGNnI 02UdgdLWClJ43E/18dilfMsc25hLgSUecP91CSjhvzLzjO0pCGiNKQs+zhXofe2Rs2KDXy 3dnNpaYzHORYyV5tc39fgeQLHY0kxKkoNeMmCWurJX/q9TALdkCXqUaZzezXew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=623ecf23325691a0cc13991e160b5f5d11471830 commit 623ecf23325691a0cc13991e160b5f5d11471830 Author: Simon J. Gerraty AuthorDate: 2021-12-19 00:34:58 +0000 Commit: Simon J. Gerraty CommitDate: 2021-12-19 00:34:58 +0000 Move ve_check_hash prototype to libsecureboot-priv.h Reviewed by: stevek --- 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);