summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2010-04-28 08:37:00 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2010-04-28 08:37:00 +0000
commitf276912e6fa1da1174ba900a7e5d6447d71fc8e7 (patch)
treef6bc9905e05497f1cb98b09c2e6df135d3c6abbf /ssh-keygen.c
parent5fe13e2e9be32fe8299a3a2da8e829bb2af78918 (diff)
Vendor import of OpenSSH 5.5p1vendor/openssh/5.5p1
Notes
svn path=/vendor-crypto/openssh/dist/; revision=207311 svn path=/vendor-crypto/openssh/5.5p1/; revision=207312; tag=vendor/openssh/5.5p1
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index dd662c907602..37e516ff2f1a 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.184 2010/03/07 22:16:01 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.185 2010/03/15 19:40:02 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1393,7 +1393,8 @@ do_show_cert(struct passwd *pw)
SSH_FP_MD5, SSH_FP_HEX);
printf("%s:\n", identity_file);
- printf(" %s certificate %s\n", key_type(key), key_fp);
+ printf(" %s %s certificate %s\n", key_type(key),
+ key_cert_type(key), key_fp);
printf(" Signed by %s CA %s\n",
key_type(key->cert->signature_key), ca_fp);
printf(" Key ID \"%s\"\n", key->cert->key_id);