summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index b9fd10abc..c95e4ab29 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.204 2010/10/28 11:22:09 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.205 2011/01/11 06:13:10 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
@@ -1480,7 +1480,8 @@ do_ca_sign(struct passwd *pw, int argc, char **argv)
1480 if (!quiet) { 1480 if (!quiet) {
1481 logit("Signed %s key %s: id \"%s\" serial %llu%s%s " 1481 logit("Signed %s key %s: id \"%s\" serial %llu%s%s "
1482 "valid %s", key_cert_type(public), 1482 "valid %s", key_cert_type(public),
1483 out, public->cert->key_id, public->cert->serial, 1483 out, public->cert->key_id,
1484 (unsigned long long)public->cert->serial,
1484 cert_principals != NULL ? " for " : "", 1485 cert_principals != NULL ? " for " : "",
1485 cert_principals != NULL ? cert_principals : "", 1486 cert_principals != NULL ? cert_principals : "",
1486 fmt_validity(cert_valid_from, cert_valid_to)); 1487 fmt_validity(cert_valid_from, cert_valid_to));
@@ -1705,8 +1706,10 @@ do_show_cert(struct passwd *pw)
1705 printf(" Signing CA: %s %s\n", 1706 printf(" Signing CA: %s %s\n",
1706 key_type(key->cert->signature_key), ca_fp); 1707 key_type(key->cert->signature_key), ca_fp);
1707 printf(" Key ID: \"%s\"\n", key->cert->key_id); 1708 printf(" Key ID: \"%s\"\n", key->cert->key_id);
1708 if (!v00) 1709 if (!v00) {
1709 printf(" Serial: %llu\n", key->cert->serial); 1710 printf(" Serial: %llu\n",
1711 (unsigned long long)key->cert->serial);
1712 }
1710 printf(" Valid: %s\n", 1713 printf(" Valid: %s\n",
1711 fmt_validity(key->cert->valid_after, key->cert->valid_before)); 1714 fmt_validity(key->cert->valid_after, key->cert->valid_before));
1712 printf(" Principals: "); 1715 printf(" Principals: ");