summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-02-26 20:45:47 +0000
committerDamien Miller <djm@mindrot.org>2015-02-27 07:46:23 +1100
commitf43d17269194761eded9e89f17456332f4c83824 (patch)
tree5059ee3593a1e995b73729972c4bf054e1d3b406
parent6e6458b476ec854db33e3e68ebf4f489d0ab3df8 (diff)
upstream commit
don't printf NULL key comments; reported by Tom Christensen
-rw-r--r--ssh-keygen.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 4a5c4028..a3c2362a 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.265 2015/02/24 15:24:05 naddy Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.266 2015/02/26 20:45:47 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1276,7 +1276,8 @@ do_change_passphrase(struct passwd *pw)
identity_file, ssh_err(r));
exit(1);
}
- printf("Key has comment '%s'\n", comment);
+ if (comment)
+ printf("Key has comment '%s'\n", comment);
/* Ask the new passphrase (twice). */
if (identity_new_passphrase) {