upstream commit

take fingerprint of correct key for
AuthorizedPrincipalsCommand

Upstream-ID: 553581a549cd6a3e73ce9f57559a325cc2cb1f38

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 5e1b88900941012a92310b418f4a7d614aa3c4b1..a08354c7e3985437c0645d0768e393a381b8155b 100644 (file)
--- 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;