summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-08-27 09:46:04 +0000
committerDamien Miller <djm@mindrot.org>2020-08-27 19:47:35 +1000
commitd6f45cdde031acdf434bbb27235a1055621915f4 (patch)
tree39b030ef21d4470b9fbaba89a6f6ff12dbddb90b
parentb969072cc3d62d05cb41bc6d6f3c22c764ed932f (diff)
upstream: debug()-print a little info about FIDO-specific key
fields via "ssh-keygen -vyf /path/key" OpenBSD-Commit-ID: cf315c4fe77db43947d111b00155165cb6b577cf
-rw-r--r--ssh-keygen.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 664724276..64cee4de0 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.418 2020/08/27 01:08:45 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.419 2020/08/27 09:46:04 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -815,10 +815,14 @@ do_print_public(struct passwd *pw)
815 prv = load_identity(identity_file, &comment); 815 prv = load_identity(identity_file, &comment);
816 if ((r = sshkey_write(prv, stdout)) != 0) 816 if ((r = sshkey_write(prv, stdout)) != 0)
817 error("sshkey_write failed: %s", ssh_err(r)); 817 error("sshkey_write failed: %s", ssh_err(r));
818 sshkey_free(prv);
819 if (comment != NULL && *comment != '\0') 818 if (comment != NULL && *comment != '\0')
820 fprintf(stdout, " %s", comment); 819 fprintf(stdout, " %s", comment);
821 fprintf(stdout, "\n"); 820 fprintf(stdout, "\n");
821 if (sshkey_is_sk(prv)) {
822 debug("sk_application: \"%s\", sk_flags 0x%02x",
823 prv->sk_application, prv->sk_flags);
824 }
825 sshkey_free(prv);
822 free(comment); 826 free(comment);
823 exit(0); 827 exit(0);
824} 828}