From 7eaf21ab1e2fc8124876db3bd195c465d6f12cc7 Mon Sep 17 00:00:00 2001
From: Markus Friedl <markus@cvs.openbsd.org>
Date: Wed, 27 Jun 2001 05:35:43 +0000
Subject: use cyberflex_inq_class to inquire class.

---
 usr.bin/ssh/ssh-keygen.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 69eb4bb0e82..758ab65a1b3 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/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>
@@ -412,10 +412,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);
@@ -435,6 +431,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;
-- 
cgit v1.2.3