{
struct dh *st;
string_t p,g;
+ dict_t *dict = 0;
item_t *i;
+ bool_t check = True;
NEW(st);
st->cl.description="dh";
st->ops.makepublic=dh_makepublic;
st->ops.makeshared=dh_makeshared;
st->loc=loc;
- /* We have two string arguments: the first is the modulus, and the
- second is the generator. Both are in hex. */
+
+ /* We either have two string arguments and maybe a boolean, or a
+ * dictionary
+ */
i=list_elem(args,0);
- if (i) {
- if (i->type!=t_string) {
- cfgfatal(i->loc,"diffie-hellman","first argument must be a "
- "string\n");
- }
- p=i->data.string;
- if (mpz_init_set_str(&st->p,p,16)!=0) {
- cfgfatal(i->loc,"diffie-hellman","\"%s\" is not a hex number "
- "string\n",p);
- }
+ if (i && i->type==t_dict) {
+ dict=i->data.dict;
+ p=dict_read_string(dict,"p",True,"diffie-hellman",loc);
+ g=dict_read_string(dict,"g",True,"diffie-hellman",loc);
+ check=dict_read_bool(dict,"check",False,"diffie-hellman",loc,True);
} else {
- cfgfatal(loc,"diffie-hellman","you must provide a prime modulus\n");
- }
-
- i=list_elem(args,1);
- if (i) {
- if (i->type!=t_string) {
+ if (!i)
+ cfgfatal(loc,"diffie-hellman","you must provide a prime modulus\n");
+ else if (i->type!=t_string)
+ cfgfatal(i->loc,"diffie-hellman",
+ "first argument must be a string or a dictionary\n");
+ p=i->data.string;
+ i=list_elem(args,1);
+ if (!i)
+ cfgfatal(loc,"diffie-hellman","you must provide a generator\n");
+ else if (i->type!=t_string)
cfgfatal(i->loc,"diffie-hellman","second argument must be a "
"string\n");
- }
g=i->data.string;
- if (mpz_init_set_str(&st->g,g,16)!=0) {
- cfgfatal(i->loc,"diffie-hellman","\"%s\" is not a hex number "
- "string\n",g);
+ i=list_elem(args,2);
+ if (i) {
+ if (i->type!=t_bool)
+ cfgfatal(i->loc,"diffie-hellman",
+ "third argument must be boolean or omitted\n");
+ check=i->data.bool;
}
- } else {
- cfgfatal(loc,"diffie-hellman","you must provide a generator\n");
}
- i=list_elem(args,2);
- if (i && i->type==t_bool && i->data.bool==False) {
+ if (mpz_init_set_str(&st->p,p,16)!=0)
+ cfgfatal(loc,"diffie-hellman","\"%s\" is not a hex number "
+ "string\n",p);
+ if (mpz_init_set_str(&st->g,g,16)!=0)
+ cfgfatal(i->loc,"diffie-hellman","\"%s\" is not a hex number "
+ "string\n",g);
+
+ if (!check) {
Message(M_INFO,"diffie-hellman (%s:%d): skipping modulus "
"primality check\n",loc.file,loc.line);
} else {
cfgfatal(loc,"diffie-hellman","generator must be less than modulus\n");
}
- st->ops.len=sz;
+ st->ops.secret_len=sz;
- st->ops.ceil_len=(mpz_sizeinbase(&st->p,2)+7)/8;
+ st->ops.shared_len=(mpz_sizeinbase(&st->p,2)+7)/8;
/* According to the docs, mpz_sizeinbase(,256) is allowed to return
* an answer which is 1 too large. But mpz_sizeinbase(,2) isn't. */