diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-10-19 03:12:42 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-10-22 10:58:06 +1100 |
commit | a4fc253f5f44f0e4c47aafe2a17d2c46481d3c04 (patch) | |
tree | 7dd188b98c360f500a92d169f5c6b94243ce4706 /ssh-keygen.c | |
parent | 83b3d99d2b47321b7ebb8db6f6ea04f3808bc069 (diff) |
upstream: when printing certificate contents "ssh-keygen -Lf
/path/certificate", include the algorithm that the CA used to sign the cert.
OpenBSD-Commit-ID: 1ea20b5048a851a7a0758dcb9777a211a2c0dddd
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 46b3af5a8..e9f405847 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.322 2018/09/14 04:17:44 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.323 2018/10/19 03:12:42 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 |
@@ -2003,8 +2003,9 @@ print_cert(struct sshkey *key) | |||
2003 | printf(" Type: %s %s certificate\n", sshkey_ssh_name(key), | 2003 | printf(" Type: %s %s certificate\n", sshkey_ssh_name(key), |
2004 | sshkey_cert_type(key)); | 2004 | sshkey_cert_type(key)); |
2005 | printf(" Public key: %s %s\n", sshkey_type(key), key_fp); | 2005 | printf(" Public key: %s %s\n", sshkey_type(key), key_fp); |
2006 | printf(" Signing CA: %s %s\n", | 2006 | printf(" Signing CA: %s %s (using %s)\n", |
2007 | sshkey_type(key->cert->signature_key), ca_fp); | 2007 | sshkey_type(key->cert->signature_key), ca_fp, |
2008 | key->cert->signature_type); | ||
2008 | printf(" Key ID: \"%s\"\n", key->cert->key_id); | 2009 | printf(" Key ID: \"%s\"\n", key->cert->key_id); |
2009 | printf(" Serial: %llu\n", (unsigned long long)key->cert->serial); | 2010 | printf(" Serial: %llu\n", (unsigned long long)key->cert->serial); |
2010 | printf(" Valid: %s\n", valid); | 2011 | printf(" Valid: %s\n", valid); |