[openssh-commits] [openssh] 12/22: upstream: sshkey_cert_check_authority requires reason to be set;
git+noreply at mindrot.org
git+noreply at mindrot.org
Fri Mar 13 13:18:49 AEDT 2020
This is an automated email from the git hooks/post-receive script.
djm pushed a commit to branch master
in repository openssh.
commit 7b4f70ddeb59f35283d77d8d9c834ca58f8cf436
Author: markus at openbsd.org <markus at openbsd.org>
Date: Fri Mar 6 18:23:17 2020 +0000
upstream: sshkey_cert_check_authority requires reason to be set;
ok djm
OpenBSD-Commit-ID: 6f7a6f19540ed5749763c2f9530c0897c94aa552
---
sshkey.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sshkey.c b/sshkey.c
index de57c2ad..6eba16ec 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) {
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list