summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.c10
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index fb250af5..67bcb492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,9 @@
- markus@cvs.openbsd.org 2001/06/27 04:48:53
[auth.c match.c sshd.8]
tridge@samba.org
+ - markus@cvs.openbsd.org 2001/06/27 05:35:42
+ [ssh-keygen.c]
+ use cyberflex_inq_class to inquire class.
20010629
- (bal) Removed net_aton() since we don't use it any more
@@ -5913,4 +5916,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1363 2001/07/04 04:56:44 mouring Exp $
+$Id: ChangeLog,v 1.1364 2001/07/04 05:00:11 mouring Exp $
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;