diff options
| author | mouring <mouring> | 2001-07-04 05:00:11 +0000 |
|---|---|---|
| committer | mouring <mouring> | 2001-07-04 05:00:11 +0000 |
| commit | 9c8f2e992746dd1e51eb87d4c6aebebc717bb35a (patch) | |
| tree | 8c92c04cc048b71311e02b8d7ca043d51e20932c /ssh-keygen.c | |
| parent | 6b1b29db9b836b9db4cf917af1edb2e70c79e062 (diff) | |
| download | openssh-9c8f2e992746dd1e51eb87d4c6aebebc717bb35a.tar.gz | |
- markus@cvs.openbsd.org 2001/06/27 05:35:42
[ssh-keygen.c]
use cyberflex_inq_class to inquire class.
Diffstat (limited to 'ssh-keygen.c')
| -rw-r--r-- | ssh-keygen.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 8ae26119..cd5d5e55 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.66 2001/06/26 02:47:07 markus Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.67 2001/06/27 05:35:42 markus Exp $"); #include <openssl/evp.h> #include <openssl/pem.h> @@ -416,10 +416,6 @@ do_upload(struct passwd *pw, int reader) error("load failed"); goto done; } -{ - prv->type = KEY_RSA; - key_write(prv, stderr); -} for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) elements[i] = NULL; COPY_RSA_KEY(q, 0); @@ -439,6 +435,10 @@ do_upload(struct passwd *pw, int reader) error("screset failed."); goto done; } + if ((cla = cyberflex_inq_class(fd)) < 0) { + error("cyberflex_inq_class failed"); + goto done; + } if (cyberflex_verify_AUT0(fd, cla, AUT0, sizeof(AUT0)) < 0) { error("cyberflex_verify_AUT0 failed"); goto done; |