From nobody Sun Nov 06 14:23:20 2022 X-Original-To: dev-commits-src-branches@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 4N4xRX4h2bz4hJXN; Sun, 6 Nov 2022 14:23:20 +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 4N4xRX448zz3PqT; Sun, 6 Nov 2022 14:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667744600; 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=3SPpqvXXFwO+q0YymO4iBj7yOCeXSmT1mspXu7FWnh8=; b=ftlTzvVRlbUwMjSvG7WdB86HLOnBJP8NtskH0HTs6SxwLIfoTjV5GNT2+klivDcsMQUI4C nkIFzbmfisi0weH40Ri+zOYxpkRgyt+lVeh168pWYfUwW1mvOJTIpwDKhoBKjj1ikbwCsn iB2ZWyHAf9eHPa301Yx+H3yp8mpa0yg9pGv+RS0qzJ2YKTQhHhRRaPaclvsqIQTLPcmlcO V9YXaHvbBdEu+olP/FoqkW+3iFb9DZaNs+leiVrmsKKIG6dcrLgNYV8VWXipTi6dX43L5x Mmbp7yDkUBJ06/QDtgBH2hYFxo0urA/cNOOQIEQchIq1bKmjBEV7QanzsMZYpQ== 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 4N4xRX37tqzPSK; Sun, 6 Nov 2022 14:23:20 +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 2A6ENKOs082911; Sun, 6 Nov 2022 14:23:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A6ENKfM082910; Sun, 6 Nov 2022 14:23:20 GMT (envelope-from git) Date: Sun, 6 Nov 2022 14:23:20 GMT Message-Id: <202211061423.2A6ENKfM082910@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: 495850ff5ad3 - releng/12.4 - ssh: correct parse_cert_times case for hex "to" time List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 495850ff5ad3e9457ab099237f16c912e77f8ff4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667744600; 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=3SPpqvXXFwO+q0YymO4iBj7yOCeXSmT1mspXu7FWnh8=; b=nublIuMZ+bN82RRfzxB6EleEMglrkpSLn20TGzpWa1d+9ncamerTTFg+32LAC80mp3TQKl dtyvYq3GyfRIppfd+ankAOb36+fB/HsXfysj8XmrM0m+49xWYGiYgGbcIgrzVJZwjUS200 V0hIpbuW014/dMnqrR5TW1U6zRx3zbiQ6cHoOkdiV9QkRH5IKWjRvsrrS+1PcOMA/CsPF9 mGM18ejN3TKT4gXVCFircWhLdn959aGVtXUxPGo/rkhelkOcGSxA/O6PJw7Dts87KpAS4E 9lnqp7fxo6nalW5stvqqx6ACn/dwxnSZ+JYix5XA+TP8xCrRvTjz/i+BUbU73Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667744600; a=rsa-sha256; cv=none; b=FyP8+03zofDEb8m81ONlB+wA+3tmXjmFyI+eAj3rpokUDfbNyvWS+XIFjOtyGkrNzLUc+D csRynAA3omU58a9Cyaed1Gw+aPw0GLcNihjBh3V6ZphCnj42s5skLLUueYwPEq8jZ3cfgS MOkAe4hXlJd97r0s/yXzaGsujMo6l5hRjE8PAowyPTQYiIvUXkX08PxJplu+KRqrW3S2kc Nit/mw58I4MYFEIfSp3h53EH+yrf4JFbEOkDQOmyVccqfAcWQ9LmY3/5l5Wy/wKkyIvu7Y qXq4MU+PqFR0LVBj2uTgR6UgczS+5iqwQlUD2NjEjrlEgtscEIx7HFpqhr7/Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=495850ff5ad3e9457ab099237f16c912e77f8ff4 commit 495850ff5ad3e9457ab099237f16c912e77f8ff4 Author: Ed Maste AuthorDate: 2022-11-03 13:44:52 +0000 Commit: Ed Maste CommitDate: 2022-11-06 14:21:36 +0000 ssh: correct parse_cert_times case for hex "to" time This appeared to be a copy-paste error from the "from" time case above. Reported by: Coverity Scan CID: 1500407 Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37252 (cherry picked from commit 0657b2325df3d85967870a928d58b24ffcf3f1ea) (cherry picked from commit 4718d86b3b1aac3f58c19fce34932fd88486af94) (cherry picked from commit a841c0c240b705d14a5846a28f91501bf89e2bb9) Approved by: re (gjb) --- crypto/openssh/ssh-keygen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssh/ssh-keygen.c b/crypto/openssh/ssh-keygen.c index 9b2beda05f0c..1255957d0e67 100644 --- a/crypto/openssh/ssh-keygen.c +++ b/crypto/openssh/ssh-keygen.c @@ -1975,7 +1975,7 @@ parse_cert_times(char *timespec) cert_valid_to = parse_relative_time(to, now); else if (strcmp(to, "forever") == 0) cert_valid_to = ~(u_int64_t)0; - else if (strncmp(from, "0x", 2) == 0) + else if (strncmp(to, "0x", 2) == 0) parse_hex_u64(to, &cert_valid_to); else if (parse_absolute_time(to, &cert_valid_to) != 0) fatal("Invalid to time \"%s\"", to);