From nobody Mon Jan 8 14:46:13 2024 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 4T7xhP6v93z55wnB; Mon, 8 Jan 2024 14:46:13 +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 4T7xhP581Rz4DD8; Mon, 8 Jan 2024 14:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704725173; 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=W4gdkqbkNu2fqUmMgKb9g9qzgVZKowRQkaZbexIBCbw=; b=Qm7wrum3YSuzUE1kpN0W6s7HLl8ZcJ9UzhunMyErKRBMQALttYYMNLqLP+bDGdOnUOnUHP VuPYoZCdW0U4fquIP2sThE3Xlb0/Gya7eQX4M5PJ+wnLkELEFvpjUiLZFC1YJRV2u4Vbef EIaAkBeO5i4OsUWyz5bqolH2OjFB09CaJy0Mt3GFbvblOoF911/VNJssEguGvgZu8ZC2Fk D9TUH6oDp+X5aAROqyfQvbasvHcVq/b+LGsnPYkDp/OUVXnPygctV8/W6XCJEuZ1C9M8Pj 4yOgzb2BwXOjfEMbGMB4UVGV9w71IGKbglFhLG176fGt3B1QBf+qiMPA9bRGlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704725173; 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=W4gdkqbkNu2fqUmMgKb9g9qzgVZKowRQkaZbexIBCbw=; b=oQhexjhRhIs/ISw015yZGU+y/S7dC1GHeiQ0PbJdGzAhWDSKkitnGuWL80/p3VZoMDUhue tOr0vVBfVBRmYwtRc0NhB8xuqDOt6OIhpfjcHjyxkl/knGt2YI58VyTEKIiY/gqh9p9JHb h6n+yDbTVyFJzAA2cn9UXhOiK5Xr7DWQ0lBB59JH5THlc6PQS89qXZ/MDDTVSm40Q534Tt 3ZWhqIazHMC4EXNEQVahjqI6gbl2HVa3SLNNqvpB5Qdc4bo0+NlvxQzubjNBAe6+xSkC7g mBRXGoScCevQ6OX7Fv/o0ePVcQ08K/Bgfe9/xZCLVvzvk63IMEjwcZwE4CjGng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704725173; a=rsa-sha256; cv=none; b=FQj81/ok5lRPBxMEM9l/DyQZlunr7ZiIvuWbGEIVJNTannpICknLB2dNZfJ8n7hxW8i3Oe 7moiRIdXwE/uUQjKiBvkrWWgOBnosOPOL+SUyDxp4AOibXujlrEo7tmP9EBYtpa/RxM/3s ovJSHlxgzcVSO2ToJN2tWWyqW4X5lJVlhbMXGAm9SpMbeiMfQ/z4ZVweyHDld+TyAVkYlw wPVL1M+z1lE58JSO2KThZuy3dWOculyb+eBamxHx4l2ibJlPZRqHO5MI1B9Ge1pcXqx3Oz 5RGLyex9G5RMflMDzy56IuTq/058GeCnYYMIBkXh2RhkPvmq8jjnW+uojqiq0Q== 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 4T7xhP4DnBz1B3Z; Mon, 8 Jan 2024 14:46:13 +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 408EkDld034394; Mon, 8 Jan 2024 14:46:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 408EkDUL034391; Mon, 8 Jan 2024 14:46:13 GMT (envelope-from git) Date: Mon, 8 Jan 2024 14:46:13 GMT Message-Id: <202401081446.408EkDUL034391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a13066579c6f - stable/14 - libsecureboot: be more verbose about validation failures 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a13066579c6f0b80786472505f115cadbf301c25 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a13066579c6f0b80786472505f115cadbf301c25 commit a13066579c6f0b80786472505f115cadbf301c25 Author: Stéphane Rochoy AuthorDate: 2023-12-04 09:57:43 +0000 Commit: Ed Maste CommitDate: 2024-01-07 19:39:17 +0000 libsecureboot: be more verbose about validation failures Reviewed by: imp, sjg Pull Request: https://github.com/freebsd/freebsd-src/pull/916 (cherry picked from commit 4b9d605768acabc460aa6dcfe8a1f8db35b16794) --- 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);