From nobody Thu Nov 03 14:13:48 2022 X-Original-To: dev-commits-src-main@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 4N35Mw5LZWz4h6FF; Thu, 3 Nov 2022 14:13:48 +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 4N35Mw4qgpz3c8P; Thu, 3 Nov 2022 14:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667484828; 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=Yaeycz2+gWuERmqa5qf8a6uiOVNadtrG+dC17ZkJy50=; b=jbqm+b1FlVrnhkDAJU0v7ygovCeU+Fg4C/WW1LbgzDvso3rPN8HAVHzk4mrXuCoHwGRJ+3 UUtluuRoGZt3nTLVmrZUA+oh05st11M4Pld38/FwNnra0BIMcoAySphFsMp7Mjpsh+wq2N Q5GfR1+ImJxm9BDwmovtvU7nGlZ2wPNcUZpndTiRdMPU/fD93cpflF/hZuiQ1kDng0AlJ7 dJLirQZYiXaeySdHeMzHH9CxfeX0LMk9Su56/XjuESDHcnh/VZ6pZ3iArGy5E0BUFz2NFe OO/WyN2X5f5hcfbFI8I6U7+erH9iP0OmvIaCCSoAzDZflUVety2QEwhy8TvBaA== 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 4N35Mw3sk0zfCn; Thu, 3 Nov 2022 14:13:48 +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 2A3EDmYo060831; Thu, 3 Nov 2022 14:13:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A3EDmN1060830; Thu, 3 Nov 2022 14:13:48 GMT (envelope-from git) Date: Thu, 3 Nov 2022 14:13:48 GMT Message-Id: <202211031413.2A3EDmN1060830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0657b2325df3 - main - ssh: correct parse_cert_times case for hex "to" time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0657b2325df3d85967870a928d58b24ffcf3f1ea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667484828; 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=Yaeycz2+gWuERmqa5qf8a6uiOVNadtrG+dC17ZkJy50=; b=JnLTuZTC0c7tqqFXNv2EYzyhjYakipJ1QnD+sXz/i0qGAbbE+T9KdLkoGWWy7tx4RJVd1j 5C8te7bynJHoMU27yvgW6VcYd5LIumORF7ETgHyuB/PEJjfEBBWvTbZIpazEqYvzmkq3vU sTWAhxizYnBlXoaoo6Hp6fZzoJVujQB4FC7EVA3RgK2n/2Ila3oy6zXgn+7Dy0OYOvNRyw IKLxDOylKnOXClLuQq49KPA0/NHApqUOSEh8KIzvI3xfvt209CfF0xJN4d7xklX3JBW6dA 66cM3bEwoONpFIIesPnhn/UrP2+BpZaFYv+Ak86J+aRROxyh8sTYVSnalh6QBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667484828; a=rsa-sha256; cv=none; b=yjtAtVzKp3pHlH82SdWKpI7rrXaHKFbuiq1V6XT6xJYd2fbk6/cL3PiFs5T7fdyDRj3fn3 FHRhX9+Os0BTmwJyIu7piCkJ9BoRqOXSd3Xos7g6x6HYsuvnUFHBu+IC0VAKnzbdgkYWyQ +wnIsbxFELMN632QLyf9+gscEKGkB0AtAANXe80OXi4FKHB8hDloBi/muYiYM6SdC9T8Oc P/OedEXUXVZJRb/+bIxxu1JOzD223ffgcxe9OutcpjRLg50Ykf4SIb9Glv3Nwsn1WjdSBE WNuyW/i7Gqwg2oE2tAGjmGZuoPBjwBd/G84jzBcwh9lZxTEG0ZZX6i42+ODJTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0657b2325df3d85967870a928d58b24ffcf3f1ea commit 0657b2325df3d85967870a928d58b24ffcf3f1ea Author: Ed Maste AuthorDate: 2022-11-03 13:44:52 +0000 Commit: Ed Maste CommitDate: 2022-11-03 14:10:28 +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 --- 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);