summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-11-19 01:12:32 +0000
committerDamien Miller <djm@mindrot.org>2015-11-19 12:13:38 +1100
commit964ab3ee7a8f96bdbc963d5b5a91933d6045ebe7 (patch)
tree7b70e6167003e3d705e02322eb943644cbad6c21
parentf96516d052dbe38561f6b92b0e4365d8e24bb686 (diff)
upstream commit
trailing whitespace Upstream-ID: 31fe0ad7c4d08e87f1d69c79372f5e3c5cd79051
-rw-r--r--ssh-keygen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 14dc261f1..8183c2fa0 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.281 2015/11/19 01:08:55 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.282 2015/11/19 01:12:32 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
@@ -1655,10 +1655,10 @@ do_ca_sign(struct passwd *pw, int argc, char **argv)
1655 fclose(f); 1655 fclose(f);
1656 1656
1657 if (!quiet) { 1657 if (!quiet) {
1658 sshkey_format_cert_validity(public->cert, 1658 sshkey_format_cert_validity(public->cert,
1659 valid, sizeof(valid)); 1659 valid, sizeof(valid));
1660 logit("Signed %s key %s: id \"%s\" serial %llu%s%s " 1660 logit("Signed %s key %s: id \"%s\" serial %llu%s%s "
1661 "valid %s", sshkey_cert_type(public), 1661 "valid %s", sshkey_cert_type(public),
1662 out, public->cert->key_id, 1662 out, public->cert->key_id,
1663 (unsigned long long)public->cert->serial, 1663 (unsigned long long)public->cert->serial,
1664 cert_principals != NULL ? " for " : "", 1664 cert_principals != NULL ? " for " : "",
@@ -1697,7 +1697,7 @@ parse_absolute_time(const char *s)
1697 char buf[32], *fmt; 1697 char buf[32], *fmt;
1698 1698
1699 /* 1699 /*
1700 * POSIX strptime says "The application shall ensure that there 1700 * POSIX strptime says "The application shall ensure that there
1701 * is white-space or other non-alphanumeric characters between 1701 * is white-space or other non-alphanumeric characters between
1702 * any two conversion specifications" so arrange things this way. 1702 * any two conversion specifications" so arrange things this way.
1703 */ 1703 */