From: djm <djm@openbsd.org>
Date: Fri, 29 Oct 2021 03:20:46 +0000 (+0000)
Subject: ssh-keygen: make verify-time argument parsing optional
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=81aa2d714a748cd7b7dfc278669b0d51ad2e30f2;p=openbsd

ssh-keygen: make verify-time argument parsing optional

From Fabian Stelzer
---

diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index d7dcf858451..0e4d00013b2 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.439 2021/10/28 02:54:18 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.440 2021/10/29 03:20:46 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2657,11 +2657,13 @@ sig_process_opts(char * const *opts, size_t nopts, uint64_t *verify_timep,
 	size_t i;
 	time_t now;
 
-	*verify_timep = 0;
+	if (verify_timep != NULL)
+		*verify_timep = 0;
 	if (print_pubkey != NULL)
 		*print_pubkey = 0;
 	for (i = 0; i < nopts; i++) {
-		if (strncasecmp(opts[i], "verify-time=", 12) == 0) {
+		if (verify_timep &&
+		    strncasecmp(opts[i], "verify-time=", 12) == 0) {
 			if (parse_absolute_time(opts[i] + 12,
 			    verify_timep) != 0 || *verify_timep == 0) {
 				error("Invalid \"verify-time\" option");
@@ -2675,7 +2677,7 @@ sig_process_opts(char * const *opts, size_t nopts, uint64_t *verify_timep,
 			return SSH_ERR_INVALID_ARGUMENT;
 		}
 	}
-	if (*verify_timep == 0) {
+	if (verify_timep && *verify_timep == 0) {
 		if ((now = time(NULL)) < 0) {
 			error("Time is before epoch");
 			return SSH_ERR_INVALID_ARGUMENT;