From nobody Wed Mar 26 21:37:17 2025 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 4ZNKrG0Kdwz5rFCL; Wed, 26 Mar 2025 21:37:18 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZNKrF6ckQz496B; Wed, 26 Mar 2025 21:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743025037; 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=Kf867IQYmpfll1AGxhOgBNP4JL3LOxZqmd7Cm03/b0g=; b=G93C0xy+3dthDXWiVrFr8NSQoDSEFVg3iWYS0c9YK0pqsC9Mel1S4QDmfXKtf9jl5mN3QC YEgGZx5QZywgPYSkNwmE9Q78yK3SpH7G128GKuue4xVbf+ZX5DjDYxDK7E8SJ0YF0iR7a4 Zv6osGjpuLiyCGY0wCNK2BwOYmzu7E8IbNGKzOGzG5vzX0UkCiYJuhcKCJNpWgrM6La/pF aX1FBoZLChB/zkRjIGKHzsiujSkTUPUSAq2xAyYeYoTRo0vmrocIvB3/GOzeQoaCYpi/vV U+yjLHVvrNtZOMDGLbKEKvkBWP6ZLa6MhvbB/H0iGo/a4vKftahB8dfWD8Houw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743025037; a=rsa-sha256; cv=none; b=E7J8UeWJ4wcLAwldgqOYt9mJRaOoPa/ZluqfVSrIunmDrxP9uvbppDqkfAraCnd6oSR7Qm jjpPCHA59NS0nxMby6oPfbwzMVFeffmkiigY1cr2F8323e8MCalXP/BVZUmHJeExEUl0wN rThd3Sujzxicljw3kkYZr2LUxpodHahmlIp5mN1YURcGb6mg1LTlL6C0zBFljWQi5EkvES Y4GfIXGkxMH+mNiXHZnVt5hWohFPJIe65mgJgKW8OabT088Xmr8Qa1o8CTG+/K9FtZAYo3 QiyM3bRZQ9fHh6ai/9rYKNUePdDm2sCogy6pUreq4Iu9tDA79ipkcUhAVLfaPg== 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=1743025037; 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=Kf867IQYmpfll1AGxhOgBNP4JL3LOxZqmd7Cm03/b0g=; b=g/DxzbViTsO1c40UWIYF6Jj4WFUpqx0A2A8JJxGxVNj6b0LsjACRq2nrPUQB08DmgdtL9h wSzz+HxNYqSuddq/5aIDO+sNB2V3/usPZ+9DrQq/Fb2EjrdrQfPg60/y+sYQ5K1QEu5RZt hm0SnRsa0lwFIKI7LCjcMmGta0JIUoN+3eB5tLFI8IAZfIblytKdS88Q2jCyGZbxQCWAeL Fo1Rg/bi7fhRGnXs0syvW7fL232wF8l/hcNvk86llkc0Lc/bkDRJNSsWceSZvZe0V1xOiN Rjsv7I6UUuLrhixNHOcyRlI5UoKkq7K3qTRG0UkALetprQuULimix1HtL7fbOw== 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 4ZNKrF5sBLzCKN; Wed, 26 Mar 2025 21:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52QLbHo9009003; Wed, 26 Mar 2025 21:37:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52QLbHdm009000; Wed, 26 Mar 2025 21:37:17 GMT (envelope-from git) Date: Wed, 26 Mar 2025 21:37:17 GMT Message-Id: <202503262137.52QLbHdm009000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: c15ed41118c9 - stable/13 - dumpon: provide diag info when `PEM_read_RSA_PUBKEY` fails 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c15ed41118c9174160a1a854355320558b48928d Auto-Submitted: auto-generated The branch stable/13 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=c15ed41118c9174160a1a854355320558b48928d commit c15ed41118c9174160a1a854355320558b48928d Author: Enji Cooper AuthorDate: 2023-05-27 01:02:34 +0000 Commit: Enji Cooper CommitDate: 2025-03-26 21:36:43 +0000 dumpon: provide diag info when `PEM_read_RSA_PUBKEY` fails This change modifies dumpon to print out the last error from OpenSSL when `PEM_read_RSA_PUBKEY` fails. This allows end-users to diagnose why reading in RSA pubkey files fails so they can adjust the usage to meet the needs of the command. MFC after: 1 week (cherry picked from commit 52b63df9b6dfc157fb0b9f61a770b64e3663dee9) --- sbin/dumpon/dumpon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index d12df7bf0c4d..ca25d38c09e8 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -267,7 +267,8 @@ genkey(const char *pubkeyfile, struct diocskerneldump_arg *kdap) fclose(fp); fp = NULL; if (pubkey == NULL) - errx(1, "Unable to read data from %s.", pubkeyfile); + errx(1, "Unable to read data from %s: %s", pubkeyfile, + ERR_error_string(ERR_get_error(), NULL)); /* * RSA keys under ~1024 bits are trivially factorable (2018). OpenSSL