From nobody Sat May 27 01:05:28 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 4QSk9h6Q2tz4V1Br; Sat, 27 May 2023 01:05: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 4QSk9h5hz0z3tmy; Sat, 27 May 2023 01:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685149528; 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=gejlFYYODVmolsKy1zdkf6fGBHL9soodWS0IG8c9WCY=; b=uMsThyhUEN7x1zIb0uqn0s7nkB/HzxI6hK5p/eIEAgPsWK0/TWgjv5kHkKSfba2EYLmgAX tOWOqAV05TFLZDClsWuaQfK9go/IFJuOCo7QRIUKnJRDArqeWErhMOCzhDsuZy9vn+uIVU 7Dfk911GC7+ycnXEtljui1B7D9mInK2U+tRK2B3S+MZih0osDa1QGu1PSzjnFClkfUTwSF kjPpc3C+suUYO12Z4GbrtQPyRV2zDVwEFDGLJ+A1npzKhGLtUON4iQXPYbIL3ghXm4Wvk/ ETVpmp9BDFJFfaGFuERY2l1OMVf1ZAy4eabYxWa+WKEyz/rHr++EaDmWboM4OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685149528; 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=gejlFYYODVmolsKy1zdkf6fGBHL9soodWS0IG8c9WCY=; b=SjqMvrL8f0QxrCS0IlTqvwKJD/47u0amXOMuXUMEenMh1QoczsqCJFqhcyna00G4SsJi2Q 2Y4Xbox524yGgzZUGtIu7rL+5IFj2v05nL6lfgfBynxwSirC+8lu9wTDaWKnx0CPR1A8hw kfRC8qMBHSiPZRGj7xP0z9QB67pWm10VCS8JfQEdt66k9wRHTpU7I4WdFZd2hwB3iAA0Pq F5wVG1/EhutcQd41x3ZosrdRodjzCHizlgsPWuWO7oDjnP/TrEB+QFlGfJ3pI/uUJRece4 ocbciaqT3kV1HsH+AVeAWGrJX70fTX1Aux2pmr6+ImxTkAP4qNELjrN1VTBYOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685149528; a=rsa-sha256; cv=none; b=gyU9AgFmH9Vcu67F4e/Vgl83D1dmV20i8ptDOAz/zttD+4dD3kIUOmh2IdTi0MYsSCdSwz 0gjQDzVz71IbiY+5jn9TC/OGDd8G7Xb3NOXJOI5OyoKAyxccLkS1NqHp01bPMYBSNGBA+F pjCQ0QnS1O0OKUfu7IgdEPdUH0Ukta0cTgQ0b0Y0TQGj6A7AN7lTQUg9ITT3CdDnSpjlsA OnMcJ0P/WrngYVW66lfcqvpUadMWd2yKgtBI6auPZxVzRzfzk5m9GJY7YORcoW7TKTKBX+ BrOeDrZq92jSl3q5ONErNISWtwgQFYlPEZGSl1bv6XZZzohPbSHVDtOEqSY/Bg== 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 4QSk9h4kzczTKv; Sat, 27 May 2023 01:05:28 +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 34R15SPR090348; Sat, 27 May 2023 01:05:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34R15S6h090347; Sat, 27 May 2023 01:05:28 GMT (envelope-from git) Date: Sat, 27 May 2023 01:05:28 GMT Message-Id: <202305270105.34R15S6h090347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 52b63df9b6df - main - 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: 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52b63df9b6dfc157fb0b9f61a770b64e3663dee9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=52b63df9b6dfc157fb0b9f61a770b64e3663dee9 commit 52b63df9b6dfc157fb0b9f61a770b64e3663dee9 Author: Enji Cooper AuthorDate: 2023-05-27 01:02:34 +0000 Commit: Enji Cooper CommitDate: 2023-05-27 01:05:04 +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 --- 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 626350427595..c530c9ad59ed 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -270,7 +270,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