diff options
author | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
commit | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (patch) | |
tree | 13e783343edf688afffb4a8e02dc9685342b98a6 /ssh-keygen.c | |
parent | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (diff) | |
parent | ff0095389ba9a9e4599e6051c8d5bae6777c4d64 (diff) |
merge 5.5p1
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index dd662c907..37e516ff2 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.184 2010/03/07 22:16:01 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.185 2010/03/15 19:40:02 stevesk 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 |
@@ -1393,7 +1393,8 @@ do_show_cert(struct passwd *pw) | |||
1393 | SSH_FP_MD5, SSH_FP_HEX); | 1393 | SSH_FP_MD5, SSH_FP_HEX); |
1394 | 1394 | ||
1395 | printf("%s:\n", identity_file); | 1395 | printf("%s:\n", identity_file); |
1396 | printf(" %s certificate %s\n", key_type(key), key_fp); | 1396 | printf(" %s %s certificate %s\n", key_type(key), |
1397 | key_cert_type(key), key_fp); | ||
1397 | printf(" Signed by %s CA %s\n", | 1398 | printf(" Signed by %s CA %s\n", |
1398 | key_type(key->cert->signature_key), ca_fp); | 1399 | key_type(key->cert->signature_key), ca_fp); |
1399 | printf(" Key ID \"%s\"\n", key->cert->key_id); | 1400 | printf(" Key ID \"%s\"\n", key->cert->key_id); |