From: djm@openbsd.org Date: Wed, 14 Sep 2016 20:11:26 +0000 (+0000) Subject: upstream commit X-Git-Tag: V_7_4_P1~108 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00df97ff68a49a756d4b977cd02283690f5dfa34;p=thirdparty%2Fopenssh-portable.git upstream commit take fingerprint of correct key for AuthorizedPrincipalsCommand Upstream-ID: 553581a549cd6a3e73ce9f57559a325cc2cb1f38 --- 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 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.56 2016/09/14 05:42:25 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.57 2016/09/14 20:11:26 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -681,7 +681,7 @@ match_principals_command(struct passwd *user_pw, const struct sshkey *key) error("%s: sshkey_fingerprint failed", __func__); goto out; } - if ((key_fp = sshkey_fingerprint(cert->signature_key, + if ((key_fp = sshkey_fingerprint(key, options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL) { error("%s: sshkey_fingerprint failed", __func__); goto out;