- jakob@cvs.openbsd.org 2001/07/31 09:28:44

[openssh.git] / ssh-keygen.c

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 8ae261193f77205c8b38214f0e273e02284c25e7..003357321cb8dfa4abdd70e0030f546742d1f226 100644 (file)
--- 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.73 2001/07/26 20:04:27 rees Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -194,7 +194,7 @@ do_convert_private_ssh2_from_blob(char *blob, int blen)
        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;
@@ -264,7 +264,7 @@ do_convert_private_ssh2_from_blob(char *blob, int blen)
                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);
@@ -385,7 +385,7 @@ do_print_public(struct passwd *pw)
        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)
@@ -400,11 +400,12 @@ do_upload(struct passwd *pw, int reader)
        struct stat st;
        u_char *elements[NUM_RSA_KEY_ELEMENTS];
        u_char key_fid[2];
-        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 sw = 0, cla = 0x00;
 
+       for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++)
+               elements[i] = NULL;
        if (!have_identity)
                ask_filename(pw, "Enter file in which the key is");
        if (stat(identity_file, &st) < 0) {
@@ -416,12 +417,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);
        COPY_RSA_KEY(p, 1);
        COPY_RSA_KEY(iqmp, 2);
@@ -429,28 +424,42 @@ do_upload(struct passwd *pw, int reader)
        COPY_RSA_KEY(dmp1, 4);
        COPY_RSA_KEY(n, 5);
        len = BN_num_bytes(prv->rsa->n);
-        fd = scopen(reader, 0, NULL);
-        if (fd < 0) {
-                error("scopen failed %d.", fd);
+       fd = sectok_open(reader, 0, &sw);
+       if (fd < 0) {
+               error("sectok_open failed");
+               goto done;
+       }
+       ret = sectok_reset(fd, 0, NULL, &sw);
+       if (ret <= 0) {
+               error("sectok_reset failed");
                goto done;
-        }
-        ret = screset(fd, atr, NULL);
-        if (ret <= 0) {
-                error("screset failed.");
+       }
+       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,
+           &sw) < 0) {
+               error("cyberflex_load_rsa_priv failed: %s", sectok_get_sw(sw));
+               goto done;
+       }
+       if (!sectok_swOK(sw))
                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],
+           &sw) < 0) {
+               error("cyberflex_load_rsa_pub failed: %s", sectok_get_sw(sw));
+               goto done;
+       }
+       if (!sectok_swOK(sw))
                goto done;
        log("cyberflex_load_rsa_pub done");
        status = 0;
@@ -459,9 +468,10 @@ done:
        if (prv)
                key_free(prv);
        for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++)
-               xfree(elements[i]);
+               if (elements[i])
+                       xfree(elements[i]);
        if (fd != -1)
-               scclose(fd);
+               sectok_close(fd);
        exit(status);
 #endif
 }