/* -*-c-*-
*
- * $Id: keyutil.c,v 1.6 2000/06/17 11:28:22 mdw Exp $
+ * $Id: keyutil.c,v 1.11 2000/12/06 20:33:27 mdw Exp $
*
* Simple key manager program
*
/*----- Revision history --------------------------------------------------*
*
* $Log: keyutil.c,v $
+ * Revision 1.11 2000/12/06 20:33:27 mdw
+ * Make flags be macros rather than enumerations, to ensure that they're
+ * unsigned.
+ *
+ * Revision 1.10 2000/10/08 12:02:21 mdw
+ * Use @MP_EQ@ instead of @MP_CMP@.
+ *
+ * Revision 1.9 2000/08/15 21:40:49 mdw
+ * Minor formatting change in listing attributes.
+ *
+ * Revision 1.8 2000/07/29 09:59:13 mdw
+ * Support Lim-Lee primes in Diffie-Hellman parameter generation.
+ *
+ * Revision 1.7 2000/07/01 11:18:51 mdw
+ * Use new interfaces for key manipulation.
+ *
* Revision 1.6 2000/06/17 11:28:22 mdw
* Use secure memory interface from MP library. `rand_getgood' is
* deprecated.
key *p; /* Parameters key-data */
} keyopts;
-enum {
- f_bogus = 1, /* Error in parsing */
- f_lock = 2, /* Passphrase-lock private key */
- f_quiet = 4 /* Don't show a progress indicator */
-};
+#define f_bogus 1u /* Error in parsing */
+#define f_lock 2u /* Passphrase-lock private key */
+#define f_quiet 4u /* Don't show a progress indicator */
+#define f_limlee 8u /* Generate Lim-Lee primes */
+#define f_subgroup 16u /* Generate a subgroup */
/* --- @dolock@ --- *
*
static void alg_rsa(keyopts *k)
{
- rsa_param rp;
+ rsa_priv rp;
key_data *kd;
/* --- Sanity checking --- */
{
grand *g = fibrand_create(rand_global.ops->word(&rand_global));
- mpmont mm;
+ rsa_pub rpp;
mp *m = mprand_range(MP_NEW, rp.n, g, 0);
mp *c;
- /* --- Encrypt the plaintext --- */
-
- mpmont_create(&mm, rp.n);
- c = mpmont_exp(&mm, MP_NEW, m, rp.e);
- mpmont_destroy(&mm);
-
- /* --- Decrypt the ciphertext --- */
-
- c = rsa_decrypt(&rp, c, c, g);
+ rpp.n = rp.n;
+ rpp.e = rp.e;
+ c = rsa_qpubop(&rpp, MP_NEW, m);
+ c = rsa_qprivop(&rp, c, c, g);
- /* --- Check everything went OK --- */
-
- if (MP_CMP(c, !=, m))
+ if (!MP_EQ(c, m))
die(EXIT_FAILURE, "test encryption failed");
mp_drop(c);
mp_drop(m);
mpkey(kd, "d-mod-q", rp.dq, KCAT_PRIV | KF_BURN);
dolock(k, kd, "private");
- mp_drop(rp.p); mp_drop(rp.q); mp_drop(rp.n); mp_drop(rp.q_inv);
- mp_drop(rp.e); mp_drop(rp.d); mp_drop(rp.dp); mp_drop(rp.dq);
+ rsa_privfree(&rp);
}
static void alg_dsaparam(keyopts *k)
/* --- Allocate the parameters --- */
- if (dsa_seed(&dp, k->qbits, k->bits, 0, p, sz,
- (k->f & f_quiet) ? 0 : pgen_ev, 0))
+ if (dsa_gen(&dp, k->qbits, k->bits, 0, p, sz,
+ (k->f & f_quiet) ? 0 : pgen_ev, 0))
die(EXIT_FAILURE, "DSA parameter generation failed");
/* --- Store the parameters --- */
if (!copyparam(k, pl)) {
dh_param dp;
key_data *kd = &k->k->k;
+ int rc;
if (!k->bits)
k->bits = 1024;
/* --- Choose a large safe prime number --- */
- if (dh_gen(&dp, k->qbits, k->bits, 0, &rand_global,
- (k->f & f_quiet) ? 0 : pgen_ev, 0))
+ if (k->f & f_limlee) {
+ mp **f;
+ size_t nf;
+ if (!k->qbits)
+ k->qbits = 256;
+ rc = dh_limlee(&dp, k->qbits, k->bits,
+ (k->f & f_subgroup) ? DH_SUBGROUP : 0,
+ 0, &rand_global, (k->f & f_quiet) ? 0 : pgen_ev, 0,
+ (k->f & f_quiet) ? 0 : pgen_evspin, 0, &nf, &f);
+ if (!rc) {
+ dstr d = DSTR_INIT;
+ size_t i;
+ for (i = 0; i < nf; i++) {
+ if (i)
+ dstr_puts(&d, ", ");
+ mp_writedstr(f[i], &d, 10);
+ mp_drop(f[i]);
+ }
+ key_putattr(k->kf, k->k, "factors", d.buf);
+ dstr_destroy(&d);
+ }
+ } else
+ rc = dh_gen(&dp, k->qbits, k->bits, 0, &rand_global,
+ (k->f & f_quiet) ? 0 : pgen_ev, 0);
+
+ if (rc)
die(EXIT_FAILURE, "Diffie-Hellman parameter generation failed");
key_structure(kd);
static void alg_bbs(keyopts *k)
{
- bbs_param bp;
+ bbs_priv bp;
key_data *kd;
/* --- Sanity checking --- */
mpkey(kd, "q", bp.q, KCAT_PRIV | KF_BURN);
dolock(k, kd, "private");
- mp_drop(bp.p); mp_drop(bp.q); mp_drop(bp.n);
+ bbs_privfree(&bp);
}
/* --- The algorithm tables --- */
{ "rand-id", OPTF_ARGREQ, 0, 'r' },
{ "lock", 0, 0, 'l' },
{ "quiet", 0, 0, 'q' },
+ { "lim-lee", 0, 0, 'L' },
+ { "subgroup", 0, 0, 'S' },
{ 0, 0, 0, 0 }
};
- int i = mdwopt(argc, argv, "+a:b:B:p:e:c:t:r:lq", opt, 0, 0, 0);
+ int i = mdwopt(argc, argv, "+a:b:B:p:e:c:t:r:lqLS", opt, 0, 0, 0);
if (i < 0)
break;
case 'q':
k.f |= f_quiet;
break;
+ case 'L':
+ k.f |= f_limlee;
+ break;
+ case 'S':
+ k.f |= f_subgroup;
+ break;
/* --- Other things are bogus --- */
/* --- Listing flags --- */
-enum {
- f_newline = 2, /* Write newline before next entry */
- f_attr = 4, /* Written at least one attribute */
- f_utc = 8 /* Emit UTC time, not local time */
-};
+#define f_newline 2u /* Write newline before next entry */
+#define f_attr 4u /* Written at least one attribute */
+#define f_utc 8u /* Emit UTC time, not local time */
/* --- @showkeydata@ --- *
*
o->f &= ~f_attr;
printf("attributes:");
for (key_mkattriter(&i, k); key_nextattr(&i, &an, &av); ) {
- printf("\n\t%s = %s", an, av);
+ printf("\n %s = %s", an, av);
o->f |= f_attr;
}
if (o->f & f_attr)
} cmds[] = {
{ "add", cmd_add,
"add [options] type [attr...]\n\
- Options: [-lq] [-a alg] [-b|-B bits] [-p param] [-r tag]\n\
+ Options: [-lqLS] [-a alg] [-b|-B bits] [-p param] [-r tag]\n\
[-e expire] [-t tag] [-c comment]"
},
{ "expire", cmd_expire, "expire tag..." },
{
unsigned f = 0;
- enum {
- f_bogus = 1
- };
+#define f_bogus 1u
/* --- Initialization --- */
projects / u / mdw / catacomb / blobdiff