From d6e049cd59712b42ceb6d7cdfec254706c0480a2 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Wed, 4 Jul 2001 05:08:39 +0000 Subject: [PATCH] - markus@cvs.openbsd.org 2001/06/29 07:11:01 [ssh-keygen.c] initialize early --- ChangeLog | 5 ++++- ssh-keygen.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf2ed5c36..4627ec9eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,9 @@ - markus@cvs.openbsd.org 2001/06/29 07:06:34 [ssh-keygen.c] new error handling for cyberflex_* + - markus@cvs.openbsd.org 2001/06/29 07:11:01 + [ssh-keygen.c] + initialize early 20010629 - (bal) Removed net_aton() since we don't use it any more @@ -5929,4 +5932,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1368 2001/07/04 05:06:59 mouring Exp $ +$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 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.70 2001/06/29 07:06:34 markus Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.71 2001/06/29 07:11:01 markus Exp $"); #include #include @@ -405,6 +405,8 @@ do_upload(struct passwd *pw, int reader) int len, status = 1, i, fd = -1, ret; int r1 = 0, r2 = 0, cla = 0x00; + for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) + elements[i] = NULL; if (!have_identity) ask_filename(pw, "Enter file in which the key is"); if (stat(identity_file, &st) < 0) { @@ -416,8 +418,6 @@ do_upload(struct passwd *pw, int reader) error("load failed"); goto done; } - for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) - elements[i] = NULL; COPY_RSA_KEY(q, 0); COPY_RSA_KEY(p, 1); COPY_RSA_KEY(iqmp, 2);