diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -86,6 +86,9 @@ | |||
86 | - markus@cvs.openbsd.org 2001/06/27 04:48:53 | 86 | - markus@cvs.openbsd.org 2001/06/27 04:48:53 |
87 | [auth.c match.c sshd.8] | 87 | [auth.c match.c sshd.8] |
88 | tridge@samba.org | 88 | tridge@samba.org |
89 | - markus@cvs.openbsd.org 2001/06/27 05:35:42 | ||
90 | [ssh-keygen.c] | ||
91 | use cyberflex_inq_class to inquire class. | ||
89 | 92 | ||
90 | 20010629 | 93 | 20010629 |
91 | - (bal) Removed net_aton() since we don't use it any more | 94 | - (bal) Removed net_aton() since we don't use it any more |
@@ -5913,4 +5916,4 @@ | |||
5913 | - Wrote replacements for strlcpy and mkdtemp | 5916 | - Wrote replacements for strlcpy and mkdtemp |
5914 | - Released 1.0pre1 | 5917 | - Released 1.0pre1 |
5915 | 5918 | ||
5916 | $Id: ChangeLog,v 1.1363 2001/07/04 04:56:44 mouring Exp $ | 5919 | $Id: ChangeLog,v 1.1364 2001/07/04 05:00:11 mouring Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 8ae261193..cd5d5e559 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.66 2001/06/26 02:47:07 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.67 2001/06/27 05:35:42 markus Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -416,10 +416,6 @@ do_upload(struct passwd *pw, int reader) | |||
416 | error("load failed"); | 416 | error("load failed"); |
417 | goto done; | 417 | goto done; |
418 | } | 418 | } |
419 | { | ||
420 | prv->type = KEY_RSA; | ||
421 | key_write(prv, stderr); | ||
422 | } | ||
423 | for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) | 419 | for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) |
424 | elements[i] = NULL; | 420 | elements[i] = NULL; |
425 | COPY_RSA_KEY(q, 0); | 421 | COPY_RSA_KEY(q, 0); |
@@ -439,6 +435,10 @@ do_upload(struct passwd *pw, int reader) | |||
439 | error("screset failed."); | 435 | error("screset failed."); |
440 | goto done; | 436 | goto done; |
441 | } | 437 | } |
438 | if ((cla = cyberflex_inq_class(fd)) < 0) { | ||
439 | error("cyberflex_inq_class failed"); | ||
440 | goto done; | ||
441 | } | ||
442 | if (cyberflex_verify_AUT0(fd, cla, AUT0, sizeof(AUT0)) < 0) { | 442 | if (cyberflex_verify_AUT0(fd, cla, AUT0, sizeof(AUT0)) < 0) { |
443 | error("cyberflex_verify_AUT0 failed"); | 443 | error("cyberflex_verify_AUT0 failed"); |
444 | goto done; | 444 | goto done; |