From: markus@openbsd.org <markus@openbsd.org>
Date: Fri, 6 Mar 2020 18:23:17 +0000 (+0000)
Subject: upstream: sshkey_cert_check_authority requires reason to be set;
X-Git-Tag: V_8_3_P1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b4f70ddeb59f35283d77d8d9c834ca58f8cf436;p=thirdparty%2Fopenssh-portable.git

upstream: sshkey_cert_check_authority requires reason to be set;

ok djm

OpenBSD-Commit-ID: 6f7a6f19540ed5749763c2f9530c0897c94aa552
---

diff --git a/sshkey.c b/sshkey.c
index de57c2ad4..6eba16ecf 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.101 2020/03/06 18:21:28 markus Exp $ */
+/* $OpenBSD: sshkey.c,v 1.102 2020/03/06 18:23:17 markus Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -3078,8 +3078,8 @@ sshkey_cert_check_authority(const struct sshkey *k,
 	u_int i, principal_matches;
 	time_t now = time(NULL);
 
-	if (reason != NULL)
-		*reason = NULL;
+	if (reason == NULL)
+		return SSH_ERR_INVALID_ARGUMENT;
 
 	if (want_host) {
 		if (k->cert->type != SSH2_CERT_TYPE_HOST) {