diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -3,6 +3,9 @@ | |||
3 | - markus@cvs.openbsd.org 2001/04/23 21:57:07 | 3 | - markus@cvs.openbsd.org 2001/04/23 21:57:07 |
4 | [ssh-keygen.1 ssh-keygen.c] | 4 | [ssh-keygen.1 ssh-keygen.c] |
5 | allow public key for -e, too | 5 | allow public key for -e, too |
6 | - markus@cvs.openbsd.org 2001/04/23 22:14:13 | ||
7 | [ssh-keygen.c] | ||
8 | remove debug | ||
6 | 9 | ||
7 | 20010424 | 10 | 20010424 |
8 | - OpenBSD CVS Sync | 11 | - OpenBSD CVS Sync |
@@ -5242,4 +5245,4 @@ | |||
5242 | - Wrote replacements for strlcpy and mkdtemp | 5245 | - Wrote replacements for strlcpy and mkdtemp |
5243 | - Released 1.0pre1 | 5246 | - Released 1.0pre1 |
5244 | 5247 | ||
5245 | $Id: ChangeLog,v 1.1166 2001/04/24 16:56:58 mouring Exp $ | 5248 | $Id: ChangeLog,v 1.1167 2001/04/24 16:59:28 mouring Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 8daa52833..166ec6231 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.59 2001/04/23 21:57:07 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.60 2001/04/23 22:14:13 markus Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -298,12 +298,12 @@ do_convert_from_ssh2(struct passwd *pw) | |||
298 | strstr(line, ": ") != NULL) { | 298 | strstr(line, ": ") != NULL) { |
299 | if (strstr(line, SSH_COM_PRIVATE_BEGIN) != NULL) | 299 | if (strstr(line, SSH_COM_PRIVATE_BEGIN) != NULL) |
300 | private = 1; | 300 | private = 1; |
301 | fprintf(stderr, "ignore: %s", line); | 301 | /* fprintf(stderr, "ignore: %s", line); */ |
302 | continue; | 302 | continue; |
303 | } | 303 | } |
304 | if (escaped) { | 304 | if (escaped) { |
305 | escaped--; | 305 | escaped--; |
306 | fprintf(stderr, "escaped: %s", line); | 306 | /* fprintf(stderr, "escaped: %s", line); */ |
307 | continue; | 307 | continue; |
308 | } | 308 | } |
309 | *p = '\0'; | 309 | *p = '\0'; |