===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v
retrieving revision 1.66
retrieving revision 1.69
diff -u -r1.66 -r1.69
--- src/usr.bin/ssh/ssh-keygen.c	2001/06/26 02:47:07	1.66
+++ src/usr.bin/ssh/ssh-keygen.c	2001/06/28 19:57:35	1.69
@@ -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.69 2001/06/28 19:57:35 stevesk Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -190,7 +190,7 @@
 	Buffer b;
 	Key *key = NULL;
 	char *type, *cipher;
-	u_char *sig, data[10] = "abcde12345";
+	u_char *sig, data[] = "abcde12345";
 	int magic, rlen, ktype, i1, i2, i3, i4;
 	u_int slen;
 	u_long e;
@@ -260,7 +260,7 @@
 		buffer_get_bignum_bits(&b, key->rsa->iqmp);
 		buffer_get_bignum_bits(&b, key->rsa->q);
 		buffer_get_bignum_bits(&b, key->rsa->p);
-		generate_additional_parameters(key->rsa);
+		rsa_generate_additional_parameters(key->rsa);
 		break;
 	}
 	rlen = buffer_len(&b);
@@ -412,10 +412,6 @@
 		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 @@
                 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;