diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-09-14 20:11:26 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-09-15 06:13:36 +1000 |
commit | 00df97ff68a49a756d4b977cd02283690f5dfa34 (patch) | |
tree | 639d9aeb176e866b78543bbe4581a19c05586fd9 | |
parent | e7907c1cb938b96dd33d27c2fea72c4e08c6b2f6 (diff) |
upstream commit
take fingerprint of correct key for
AuthorizedPrincipalsCommand
Upstream-ID: 553581a549cd6a3e73ce9f57559a325cc2cb1f38
-rw-r--r-- | auth2-pubkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 5e1b88900..a08354c7e 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-pubkey.c,v 1.56 2016/09/14 05:42:25 djm Exp $ */ | 1 | /* $OpenBSD: auth2-pubkey.c,v 1.57 2016/09/14 20:11:26 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -681,7 +681,7 @@ match_principals_command(struct passwd *user_pw, const struct sshkey *key) | |||
681 | error("%s: sshkey_fingerprint failed", __func__); | 681 | error("%s: sshkey_fingerprint failed", __func__); |
682 | goto out; | 682 | goto out; |
683 | } | 683 | } |
684 | if ((key_fp = sshkey_fingerprint(cert->signature_key, | 684 | if ((key_fp = sshkey_fingerprint(key, |
685 | options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL) { | 685 | options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL) { |
686 | error("%s: sshkey_fingerprint failed", __func__); | 686 | error("%s: sshkey_fingerprint failed", __func__); |
687 | goto out; | 687 | goto out; |