diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -102,6 +102,9 @@ | |||
102 | - markus@cvs.openbsd.org 2001/06/29 07:06:34 | 102 | - markus@cvs.openbsd.org 2001/06/29 07:06:34 |
103 | [ssh-keygen.c] | 103 | [ssh-keygen.c] |
104 | new error handling for cyberflex_* | 104 | new error handling for cyberflex_* |
105 | - markus@cvs.openbsd.org 2001/06/29 07:11:01 | ||
106 | [ssh-keygen.c] | ||
107 | initialize early | ||
105 | 108 | ||
106 | 20010629 | 109 | 20010629 |
107 | - (bal) Removed net_aton() since we don't use it any more | 110 | - (bal) Removed net_aton() since we don't use it any more |
@@ -5929,4 +5932,4 @@ | |||
5929 | - Wrote replacements for strlcpy and mkdtemp | 5932 | - Wrote replacements for strlcpy and mkdtemp |
5930 | - Released 1.0pre1 | 5933 | - Released 1.0pre1 |
5931 | 5934 | ||
5932 | $Id: ChangeLog,v 1.1368 2001/07/04 05:06:59 mouring Exp $ | 5935 | $Id: ChangeLog,v 1.1369 2001/07/04 05:08:39 mouring Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index f1e6d53c7..bcb7ab2c3 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.70 2001/06/29 07:06:34 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.71 2001/06/29 07:11:01 markus Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -405,6 +405,8 @@ do_upload(struct passwd *pw, int reader) | |||
405 | int len, status = 1, i, fd = -1, ret; | 405 | int len, status = 1, i, fd = -1, ret; |
406 | int r1 = 0, r2 = 0, cla = 0x00; | 406 | int r1 = 0, r2 = 0, cla = 0x00; |
407 | 407 | ||
408 | for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) | ||
409 | elements[i] = NULL; | ||
408 | if (!have_identity) | 410 | if (!have_identity) |
409 | ask_filename(pw, "Enter file in which the key is"); | 411 | ask_filename(pw, "Enter file in which the key is"); |
410 | if (stat(identity_file, &st) < 0) { | 412 | if (stat(identity_file, &st) < 0) { |
@@ -416,8 +418,6 @@ do_upload(struct passwd *pw, int reader) | |||
416 | error("load failed"); | 418 | error("load failed"); |
417 | goto done; | 419 | goto done; |
418 | } | 420 | } |
419 | for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) | ||
420 | elements[i] = NULL; | ||
421 | COPY_RSA_KEY(q, 0); | 421 | COPY_RSA_KEY(q, 0); |
422 | COPY_RSA_KEY(p, 1); | 422 | COPY_RSA_KEY(p, 1); |
423 | COPY_RSA_KEY(iqmp, 2); | 423 | COPY_RSA_KEY(iqmp, 2); |