- markus@cvs.openbsd.org 2002/01/09 13:49:27

     [ssh-keygen.c]
     append \n only for public keys

diff --git a/ChangeLog b/ChangeLog
index dffb633d60708518c894982dcd1d06153c20c4db..a6c79b6e7a4fc2971bfd50aca71b432289349fad 100644 (file)
--- 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

diff --git a/ssh-keygen.c b/ssh-keygen.c
index f8c7316dd1aac4973e5ed5687a52ec62038e1acf..07d4cff552165753b75fb69b1580869df577e7d3 100644 (file)
--- 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);
 }