===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v
retrieving revision 1.66
retrieving revision 1.70
diff -u -r1.66 -r1.70
--- src/usr.bin/ssh/ssh-keygen.c	2001/06/26 02:47:07	1.66
+++ src/usr.bin/ssh/ssh-keygen.c	2001/06/29 07:06:34	1.70
@@ -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.70 2001/06/29 07:06:34 markus 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);
@@ -381,7 +381,7 @@
 	do { \
 		len = BN_num_bytes(prv->rsa->x); \
 		elements[i] = xmalloc(len); \
-error("#bytes %d", len); \
+		debug("#bytes %d", len); \
 		if (BN_bn2bin(prv->rsa->x, elements[i]) < 0) \
 			goto done; \
 	} while(0)
@@ -399,7 +399,7 @@
         u_char atr[256];
 	u_char AUT0[] = {0xad, 0x9f, 0x61, 0xfe, 0xfa, 0x20, 0xce, 0x63};
 	int len, status = 1, i, fd = -1, ret;
-	int cla = 0x00;
+	int r1 = 0, r2 = 0, cla = 0x00;
 
 	if (!have_identity)
 		ask_filename(pw, "Enter file in which the key is");
@@ -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);
@@ -427,26 +423,40 @@
 	len = BN_num_bytes(prv->rsa->n);
         fd = scopen(reader, 0, NULL);
         if (fd < 0) {
-                error("scopen failed %d.", fd);
+                error("scopen failed");
 		goto done;
         }
         ret = screset(fd, atr, NULL);
         if (ret <= 0) {
-                error("screset failed.");
+                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;
 	}
 	key_fid[0] = 0x00;
 	key_fid[1] = 0x12;
-	if (cyberflex_load_rsa_priv(fd, cla, key_fid, 5, 8*len, elements) < 0)
+	if (cyberflex_load_rsa_priv(fd, cla, key_fid, 5, 8*len, elements,
+	    &r1, &r2) < 0) {
+		error("cyberflex_load_rsa_priv failed: %s", get_r1r2s(r1, r1));
 		goto done;
+	}
+	if (r1 != 0x90 && r1 != 0x61)
+		goto done;
 	log("cyberflex_load_rsa_priv done");
 	key_fid[0] = 0x73;
 	key_fid[1] = 0x68;
-	if (cyberflex_load_rsa_pub(fd, cla, key_fid, len, elements[5]) < 0)
+	if (cyberflex_load_rsa_pub(fd, cla, key_fid, len, elements[5],
+	    &r1, &r2) < 0) {
+		error("cyberflex_load_rsa_pub failed: %s", get_r1r2s(r1, r1));
+		goto done;
+	}
+	if (r1 != 0x90 && r1 != 0x61)
 		goto done;
 	log("cyberflex_load_rsa_pub done");
 	status = 0;