summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:20:15 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:20:15 +1100
commita1db12bac433cb4caaf12fac18d3ee7cdb78d18c (patch)
tree13711ce1bdf6130ef75597e10cdb07b1bad484aa
parent70972eb388575578955a8f0e4d3f85e231d3fb7e (diff)
- markus@cvs.openbsd.org 2002/01/09 13:49:27
[ssh-keygen.c] append \n only for public keys
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0df400e9..84864f78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -100,6 +100,9 @@
- stevesk@cvs.openbsd.org 2002/01/05 21:51:56
[ssh.1 sshd.8]
some missing and misplaced periods
+ - markus@cvs.openbsd.org 2002/01/09 13:49:27
+ [ssh-keygen.c]
+ append \n only for public keys
20020121
@@ -7248,4 +7251,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1751 2002/01/22 12:19:55 djm Exp $
+$Id: ChangeLog,v 1.1752 2002/01/22 12:20:15 djm Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index f8c7316d..07d4cff5 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.89 2001/12/29 21:56:01 stevesk Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.90 2002/01/09 13:49:27 markus Exp $");
#include <openssl/evp.h>
#include <openssl/pem.h>
@@ -354,7 +354,8 @@ do_convert_from_ssh2(struct passwd *pw)
exit(1);
}
key_free(k);
- fprintf(stdout, "\n");
+ if (!private)
+ fprintf(stdout, "\n");
fclose(fp);
exit(0);
}