upstream: sshkey_cert_check_authority requires reason to be set;
ok djm OpenBSD-Commit-ID: 6f7a6f19540ed5749763c2f9530c0897c94aa552
This commit is contained in:
parent
05efe270df
commit
7b4f70ddeb
6
sshkey.c
6
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) 2000, 2001 Markus Friedl. All rights reserved.
|
||||||
* Copyright (c) 2008 Alexander von Gernler. 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;
|
u_int i, principal_matches;
|
||||||
time_t now = time(NULL);
|
time_t now = time(NULL);
|
||||||
|
|
||||||
if (reason != NULL)
|
if (reason == NULL)
|
||||||
*reason = NULL;
|
return SSH_ERR_INVALID_ARGUMENT;
|
||||||
|
|
||||||
if (want_host) {
|
if (want_host) {
|
||||||
if (k->cert->type != SSH2_CERT_TYPE_HOST) {
|
if (k->cert->type != SSH2_CERT_TYPE_HOST) {
|
||||||
|
|
Loading…
Reference in New Issue