diff options
author | Damien Miller <djm@mindrot.org> | 2002-01-22 23:20:15 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-01-22 23:20:15 +1100 |
commit | a1db12bac433cb4caaf12fac18d3ee7cdb78d18c (patch) | |
tree | 13711ce1bdf6130ef75597e10cdb07b1bad484aa | |
parent | 70972eb388575578955a8f0e4d3f85e231d3fb7e (diff) |
- markus@cvs.openbsd.org 2002/01/09 13:49:27
[ssh-keygen.c]
append \n only for public keys
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -100,6 +100,9 @@ | |||
100 | - stevesk@cvs.openbsd.org 2002/01/05 21:51:56 | 100 | - stevesk@cvs.openbsd.org 2002/01/05 21:51:56 |
101 | [ssh.1 sshd.8] | 101 | [ssh.1 sshd.8] |
102 | some missing and misplaced periods | 102 | some missing and misplaced periods |
103 | - markus@cvs.openbsd.org 2002/01/09 13:49:27 | ||
104 | [ssh-keygen.c] | ||
105 | append \n only for public keys | ||
103 | 106 | ||
104 | 107 | ||
105 | 20020121 | 108 | 20020121 |
@@ -7248,4 +7251,4 @@ | |||
7248 | - Wrote replacements for strlcpy and mkdtemp | 7251 | - Wrote replacements for strlcpy and mkdtemp |
7249 | - Released 1.0pre1 | 7252 | - Released 1.0pre1 |
7250 | 7253 | ||
7251 | $Id: ChangeLog,v 1.1751 2002/01/22 12:19:55 djm Exp $ | 7254 | $Id: ChangeLog,v 1.1752 2002/01/22 12:20:15 djm Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index f8c7316dd..07d4cff55 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.89 2001/12/29 21:56:01 stevesk Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.90 2002/01/09 13:49:27 markus Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -354,7 +354,8 @@ do_convert_from_ssh2(struct passwd *pw) | |||
354 | exit(1); | 354 | exit(1); |
355 | } | 355 | } |
356 | key_free(k); | 356 | key_free(k); |
357 | fprintf(stdout, "\n"); | 357 | if (!private) |
358 | fprintf(stdout, "\n"); | ||
358 | fclose(fp); | 359 | fclose(fp); |
359 | exit(0); | 360 | exit(0); |
360 | } | 361 | } |