=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v retrieving revision 1.25.2.4 retrieving revision 1.41 diff -u -r1.25.2.4 -r1.41 --- src/usr.bin/ssh/ssh-keygen.c 2001/03/12 15:44:16 1.25.2.4 +++ src/usr.bin/ssh/ssh-keygen.c 2001/01/21 19:05:57 1.41 @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.25.2.4 2001/03/12 15:44:16 jason Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.41 2001/01/21 19:05:57 markus Exp $"); #include #include @@ -124,7 +124,7 @@ #define SSH_COM_PUBLIC_BEGIN "---- BEGIN SSH2 PUBLIC KEY ----" #define SSH_COM_PUBLIC_END "---- END SSH2 PUBLIC KEY ----" #define SSH_COM_PRIVATE_BEGIN "---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----" -#define SSH_COM_PRIVATE_KEY_MAGIC 0x3f6ff9eb +#define SSH_COM_PRIVATE_KEY_MAGIC 0x3f6ff9eb void do_convert_to_ssh2(struct passwd *pw) @@ -528,7 +528,6 @@ public = key_new(KEY_RSA1); if (!load_public_key(identity_file, public, NULL)) { printf("%s is not a valid key file.\n", identity_file); - printf("Comments are only supported in RSA1 keys\n"); exit(1); }