From nobody Fri Jun 30 06:52:51 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 4QsmGr0hcbz4kXSS; Fri, 30 Jun 2023 06:52:52 +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 4QsmGq6kfDz3JT9; Fri, 30 Jun 2023 06:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688107972; 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=BfUT5bew5D7ORKqJbFBQxQYO/LNXt5veexN71+W+jS4=; b=K2/zux9tJHoWhzJ7ezlUHTZ28LndIXOj/zLyOvLveHJ5ykrUt4BXk+hXaEhVueBPwo7OEb AdMThpI5ENGE/Lb1lBknOjEzrfPEGwQ1ehrnZOj9IJ9EAyj3Pc2fyBJ4Gdb2ZX34P/ZXGw pwsx/x/RhjEEKKz8SGaaZJ3R3j8AO1rt/p3YOO8xX5vUJDQXyyCP8lHZu2snOHnKzFL1eH 0pnCFjfy6Oo32NnO0C1c8tJcDOLfE83qmXOzZwdpnbAR7apEOKp5bZ6RTKLPea0z2u5yxW KBYx78Iwan4Cc6YTqmKlWvKlsuldbUYE/eWcfW2cMrceLCRBbJSjMBdlO++Zmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688107972; 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=BfUT5bew5D7ORKqJbFBQxQYO/LNXt5veexN71+W+jS4=; b=ZqiJm0zjh8jPisi49af4tVTHe6wMP0hryMeuAYjKPkGQxQ565OJwDK5dw3OyX5w3j3BA5A uO14G2qxFTjGuerJRwBowGlN7gY8v0xHMOnhvgY2bbZUkp2pk4cFJsxiZCSE4BptMKSj62 E1QsJaIKu4CCC65apywlNrc4ifv5vYu+pOXlnbKISXUdwjqp7duWOUg4zd6FMjL1x66VXF Jsfg0ZWJuxRdw5SUL7sUBbDrK4LW6cB2OYpRP9T1E8ZJOJ6/QV/59+MUwticZcg2H1V2Vr VZLsvY37QFikyTmVRrAdSJZdswsX0678tbGZB00G3EjmnC1+r3BLX0IBp4+Kig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688107972; a=rsa-sha256; cv=none; b=Y4aDj28tD+Y6DuqkiANGysBxK2BlXgDIQoEWX5pR/BgA+SbMKKljUhu6p9Bs/8EpEbibHB UA1uOOYaKjtA4UHjcCeQaALGU15ZXN2s8zlF+jLpep64lml+CM7Lqu8cHMqe3fb5upVsmi xULYq0oY1JC06lvtvCtaxCNrGSOcyo86seGivVDSLJ5Hs/MvuSRCLZsNIGJjWwQpEu/FFf VUK0GJZ4uuI0oK3OJGlHvN3h5KKvcvJBoPZGmYut5SQVRuG26+vmuTSseFSzeN0Edk8Mdq y4nfm86VOjtzJZbd8x9JbZ86fR1PS1SaLdFTBrGkBD0BiHEsp6kvh149PBgSAQ== 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 4QsmGq5gj1zpfv; Fri, 30 Jun 2023 06:52:51 +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 35U6qpGE027127; Fri, 30 Jun 2023 06:52:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U6qpgP027126; Fri, 30 Jun 2023 06:52:51 GMT (envelope-from git) Date: Fri, 30 Jun 2023 06:52:51 GMT Message-Id: <202306300652.35U6qpgP027126@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: 56f3f2d2491e - main - libsecureboot: avoid set but not used errors 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56f3f2d2491e30f369f9461c3cb2a366bdffbe1d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=56f3f2d2491e30f369f9461c3cb2a366bdffbe1d commit 56f3f2d2491e30f369f9461c3cb2a366bdffbe1d Author: Simon J. Gerraty AuthorDate: 2023-06-30 06:52:17 +0000 Commit: Simon J. Gerraty CommitDate: 2023-06-30 06:52:17 +0000 libsecureboot: avoid set but not used errors Reviewed by: stevek --- lib/libsecureboot/openpgp/opgp_sig.c | 22 ++++++++++++---------- lib/libsecureboot/vets.c | 7 +++++-- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lib/libsecureboot/openpgp/opgp_sig.c b/lib/libsecureboot/openpgp/opgp_sig.c index eec3469e3457..7f4e6fb98fd1 100644 --- a/lib/libsecureboot/openpgp/opgp_sig.c +++ b/lib/libsecureboot/openpgp/opgp_sig.c @@ -464,20 +464,22 @@ verify_asc(const char *sigfile, int flags) size_t n; unsigned char *fdata, *sdata; size_t fbytes, sbytes; - + + fdata = NULL; if ((sdata = read_file(sigfile, &sbytes))) { n = strlcpy(pbuf, sigfile, sizeof(pbuf)); - if ((cp = strrchr(pbuf, '.'))) - *cp = '\0'; - if ((fdata = read_file(pbuf, &fbytes))) { - if (openpgp_verify(pbuf, fdata, fbytes, sdata, - sbytes, flags)) { - free(fdata); - fdata = NULL; + if (n < sizeof(pbuf)) { + if ((cp = strrchr(pbuf, '.'))) + *cp = '\0'; + if ((fdata = read_file(pbuf, &fbytes))) { + if (openpgp_verify(pbuf, fdata, fbytes, sdata, + sbytes, flags)) { + free(fdata); + fdata = NULL; + } } } - } else - fdata = NULL; + } free(sdata); return (fdata); } diff --git a/lib/libsecureboot/vets.c b/lib/libsecureboot/vets.c index 4375dfa76a89..12191097ff8c 100644 --- a/lib/libsecureboot/vets.c +++ b/lib/libsecureboot/vets.c @@ -241,11 +241,14 @@ x509_cn_get(br_x509_certificate *xc, char *buf, size_t len) mc.vtable->start_cert(&mc.vtable, xc->data_len); mc.vtable->append(&mc.vtable, xc->data, xc->data_len); mc.vtable->end_cert(&mc.vtable); - /* we don' actually care about cert status - just its name */ + /* we don't actually care about cert status - just its name */ err = mc.vtable->end_chain(&mc.vtable); - if (!cn.status) + if (!cn.status) { buf = NULL; + if (err == 0) /* keep compiler happy */ + buf = NULL; + } return (buf); }