upstream: fix parsing of hex cert expiry time; was checking whether the

start time began with "0x", not the expiry time.

from Ed Maste

OpenBSD-Commit-ID: 6269242c3e1a130b47c92cfca4d661df15f05739

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 9b2beda05f0c800def22d185f1cf67a3f769d91e..5469037aa3815a093640435853ee5ed116e255af 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.459 2022/08/11 01:56:51 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.460 2022/11/07 04:04:40 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -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);