diff options
author | markus@openbsd.org <markus@openbsd.org> | 2020-03-06 18:23:17 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-03-13 13:18:09 +1100 |
commit | 7b4f70ddeb59f35283d77d8d9c834ca58f8cf436 (patch) | |
tree | 3388678f48281fce4da216122e9044b6d7d9ff62 | |
parent | 05efe270df1e925db0af56a806d18b5063db4b6d (diff) |
upstream: sshkey_cert_check_authority requires reason to be set;
ok djm
OpenBSD-Commit-ID: 6f7a6f19540ed5749763c2f9530c0897c94aa552
-rw-r--r-- | sshkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.101 2020/03/06 18:21:28 markus Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.102 2020/03/06 18:23:17 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. | 4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. |
@@ -3078,8 +3078,8 @@ sshkey_cert_check_authority(const struct sshkey *k, | |||
3078 | u_int i, principal_matches; | 3078 | u_int i, principal_matches; |
3079 | time_t now = time(NULL); | 3079 | time_t now = time(NULL); |
3080 | 3080 | ||
3081 | if (reason != NULL) | 3081 | if (reason == NULL) |
3082 | *reason = NULL; | 3082 | return SSH_ERR_INVALID_ARGUMENT; |
3083 | 3083 | ||
3084 | if (want_host) { | 3084 | if (want_host) { |
3085 | if (k->cert->type != SSH2_CERT_TYPE_HOST) { | 3085 | if (k->cert->type != SSH2_CERT_TYPE_HOST) { |