diff options
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 22946587f..51b003405 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.63 2001/06/23 15:12:20 itojun Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.64 2001/06/23 17:05:22 markus Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -187,9 +187,11 @@ do_convert_private_ssh2_from_blob(char *blob, int blen) | |||
187 | { | 187 | { |
188 | Buffer b; | 188 | Buffer b; |
189 | Key *key = NULL; | 189 | Key *key = NULL; |
190 | char *type, *cipher; | ||
191 | u_char *sig, data[10] = "abcde12345"; | ||
190 | int magic, rlen, ktype, i1, i2, i3, i4; | 192 | int magic, rlen, ktype, i1, i2, i3, i4; |
193 | u_int slen; | ||
191 | u_long e; | 194 | u_long e; |
192 | char *type, *cipher; | ||
193 | 195 | ||
194 | buffer_init(&b); | 196 | buffer_init(&b); |
195 | buffer_append(&b, blob, blen); | 197 | buffer_append(&b, blob, blen); |
@@ -264,16 +266,11 @@ do_convert_private_ssh2_from_blob(char *blob, int blen) | |||
264 | error("do_convert_private_ssh2_from_blob: " | 266 | error("do_convert_private_ssh2_from_blob: " |
265 | "remaining bytes in key blob %d", rlen); | 267 | "remaining bytes in key blob %d", rlen); |
266 | buffer_free(&b); | 268 | buffer_free(&b); |
267 | #ifdef DEBUG_PK | ||
268 | { | ||
269 | u_int slen; | ||
270 | u_char *sig, data[10] = "abcde12345"; | ||
271 | 269 | ||
272 | key_sign(key, &sig, &slen, data, sizeof(data)); | 270 | /* try the key */ |
273 | key_verify(key, sig, slen, data, sizeof(data)); | 271 | key_sign(key, &sig, &slen, data, sizeof(data)); |
274 | xfree(sig); | 272 | key_verify(key, sig, slen, data, sizeof(data)); |
275 | } | 273 | xfree(sig); |
276 | #endif | ||
277 | return key; | 274 | return key; |
278 | } | 275 | } |
279 | 276 | ||
@@ -312,6 +309,9 @@ do_convert_from_ssh2(struct passwd *pw) | |||
312 | strstr(line, ": ") != NULL) { | 309 | strstr(line, ": ") != NULL) { |
313 | if (strstr(line, SSH_COM_PRIVATE_BEGIN) != NULL) | 310 | if (strstr(line, SSH_COM_PRIVATE_BEGIN) != NULL) |
314 | private = 1; | 311 | private = 1; |
312 | if (strstr(line, " END ") != NULL) { | ||
313 | break; | ||
314 | } | ||
315 | /* fprintf(stderr, "ignore: %s", line); */ | 315 | /* fprintf(stderr, "ignore: %s", line); */ |
316 | continue; | 316 | continue; |
317 | } | 317 | } |