From nobody Sun Dec 10 20:14:28 2023 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 4SpGLX36K8z54LgW; Sun, 10 Dec 2023 20:14:28 +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 4SpGLX2WwRz4Hfg; Sun, 10 Dec 2023 20:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702239268; 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=345AZnCuKY9lPETI/m4JadtRPTVSdPKq0gHJn689EeI=; b=F2Mn63dS0ZrQ+JYml1r253PL6mM0EYMyyCGMRe4uCqvCowRnsAJFCanC+lKkZjaGtIe205 MfQNHrssfoOBQq4qJX4j75zNtPxILtyJgTyxg7lBISgd5b8k2YCgKnmY1cdEHxRjv9HxP4 OmjRUmpp8M/kcky0wDB91/+m7MexxQ+Hc9hTKWxXP5wUF4THrydsGFcU4VLOjXC04c3RqV +Lss2X3RY6ZgT5oLP14llOF7GiJeivhsxqE3wnxi4k4A25mxR3b9Rk38pjanXoOSmXQlwE TINYds1sqKnEUzHuITvltvr4eo2vOOrFo6lJ03kSVXraQdtE6h3rJXM6gtOwUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702239268; a=rsa-sha256; cv=none; b=tbPAmJSk35yxpZxpFQhy7I/tvQV32FT+eXBU1gUahRhzScMRp9tdlKEXRgu9jwz4lcxnkj vLq1Znq8viVJap19juTFPrAx+8n++hkN0QbPZCMYF5erW0Z6wpCPpdgHgAUPvO2AidZflD soBGybZSn187wImjAjoqZNsoXF3pvzxG5lDfrDwPDx6renEzG/AHeAAOVt9kQ8wFoMapme UHY8RntvqERxOFsAOU7qlVfx8UcD0vSq9/bhSv/m02awBSABw+MJxVZY2uRzEuefSTvzv1 uawrHDyp7DfMnZx0IWHcDygh9dJBD9+3uLPMHzfC/M7ppi0WBan1vuly2G3psw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702239268; 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=345AZnCuKY9lPETI/m4JadtRPTVSdPKq0gHJn689EeI=; b=dqAsPTVgtrUnY6X9yT9HUOtkk83UxGwiPQMzd+NvtJGb44IBJOxOX+Njk0v+xenWp4c3N1 sKoTuQHZFQjAMY4PzupPNqbTs/03Dc0vBzlZKFxxEgs2tIQVFP9J51J6EneTaEhhNMg52S zhgsVPjTjH3OB9U+GtvN4Mzlz4S+WbuotOuy3aIUhBHrpefvcUmgbDIX4lps4CgRxg5LbW MNitHS5WGJXlScvB3zKJ4fxEkTew8G/dqR8WHFBjSFEGVkFfokPjILYkpBlFsaFICeH7j8 RvO2CES6QYyjwicEJNNA9ARbEKWIo/zhoUbMxAoy17T9KHBg7aCAmwAXv9u77g== 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 4SpGLX1Y5Qz12NC; Sun, 10 Dec 2023 20:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BAKESg3060392; Sun, 10 Dec 2023 20:14:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BAKESjE060389; Sun, 10 Dec 2023 20:14:28 GMT (envelope-from git) Date: Sun, 10 Dec 2023 20:14:28 GMT Message-Id: <202312102014.3BAKESjE060389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 4b9d605768ac - main - libsecureboot: be more verbose about validation failures 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b9d605768acabc460aa6dcfe8a1f8db35b16794 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4b9d605768acabc460aa6dcfe8a1f8db35b16794 commit 4b9d605768acabc460aa6dcfe8a1f8db35b16794 Author: Stéphane Rochoy AuthorDate: 2023-12-04 09:57:43 +0000 Commit: Ed Maste CommitDate: 2023-12-10 20:13:56 +0000 libsecureboot: be more verbose about validation failures Reviewed by: imp, sjg Pull Request: https://github.com/freebsd/freebsd-src/pull/916 --- lib/libbearssl/Makefile.inc | 1 + lib/libbearssl/Makefile.libsa.inc | 3 +++ lib/libsecureboot/vets.c | 14 +++++++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/libbearssl/Makefile.inc b/lib/libbearssl/Makefile.inc index 764984de9067..453630d038cd 100644 --- a/lib/libbearssl/Makefile.inc +++ b/lib/libbearssl/Makefile.inc @@ -1,6 +1,7 @@ BEARSSL?= ${SRCTOP}/contrib/bearssl BEARSSL_SRC= ${BEARSSL}/src +BEARSSL_TOOLS= ${BEARSSL}/tools CFLAGS+= -I${BEARSSL}/inc CFLAGS+= ${NO_WDEPRECATED_NON_PROTOTYPE} diff --git a/lib/libbearssl/Makefile.libsa.inc b/lib/libbearssl/Makefile.libsa.inc index c31d3f85975a..c171e141f0db 100644 --- a/lib/libbearssl/Makefile.libsa.inc +++ b/lib/libbearssl/Makefile.libsa.inc @@ -83,3 +83,6 @@ SRCS+= \ x509/x509_decoder.c \ x509/x509_minimal.c \ +# We want find_error_name(). +SRCS+= \ + ${BEARSSL_TOOLS}/errors.c \ diff --git a/lib/libsecureboot/vets.c b/lib/libsecureboot/vets.c index 4a2aba433191..c86b198c45c5 100644 --- a/lib/libsecureboot/vets.c +++ b/lib/libsecureboot/vets.c @@ -568,9 +568,17 @@ verify_signer_xcs(br_x509_certificate *xcs, ve_error_set("Validation failed, certificate not valid as of %s", gdate(date, sizeof(date), ve_utc)); break; - default: - ve_error_set("Validation failed, err = %d", err); - break; + default: { + const char *err_desc = NULL; + const char *err_name = find_error_name(err, &err_desc); + + if (err_name == NULL) + ve_error_set("Validation failed, err = %d", + err); + else + ve_error_set("Validation failed, %s (%s)", + err_desc, err_name); + break; } } } else { tpk = mc.vtable->get_pkey(&mc.vtable, &usages);