+/*
+ * dh.c
+ */
+/*
+ * This file is Free Software. It was originally written for secnet.
+ *
+ * Copyright 1995-2003 Stephen Early
+ * Copyright 2002-2014 Ian Jackson
+ *
+ * You may redistribute secnet as a whole and/or modify it under the
+ * terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3, or (at your option) any
+ * later version.
+ *
+ * You may redistribute this file and/or modify it under the terms of
+ * the GNU General Public License as published by the Free Software
+ * Foundation; either version 2, or (at your option) any later
+ * version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
+
#include <stdio.h>
#include <gmp.h>
+#include <limits.h>
#include "secnet.h"
#include "util.h"
MP_INT p,g; /* prime modulus and generator */
};
-static string_t dh_makepublic(void *sst, uint8_t *secret, uint32_t secretlen)
+static string_t dh_makepublic(void *sst, uint8_t *secret, int32_t secretlen)
{
struct dh *st=sst;
string_t r;
read_mpbin(&a, secret, secretlen);
- mpz_powm(&b, &st->g, &a, &st->p);
+ mpz_powm_sec(&b, &st->g, &a, &st->p);
r=write_mpstring(&b);
}
static dh_makeshared_fn dh_makeshared;
-static void dh_makeshared(void *sst, uint8_t *secret, uint32_t secretlen,
- cstring_t rempublic, uint8_t *sharedsecret,
- uint32_t buflen)
+static bool_t dh_makeshared(void *sst, uint8_t *secret, int32_t secretlen,
+ cstring_t rempublic, uint8_t *sharedsecret,
+ int32_t buflen)
{
struct dh *st=sst;
MP_INT a, b, c;
read_mpbin(&a, secret, secretlen);
mpz_set_str(&b, rempublic, 16);
- mpz_powm(&c, &b, &a, &st->p);
+ mpz_powm_sec(&c, &b, &a, &st->p);
write_mpbin(&c,sharedsecret,buflen);
mpz_clear(&a);
mpz_clear(&b);
mpz_clear(&c);
+
+ return True;
}
static list_t *dh_apply(closure_t *self, struct cloc loc, dict_t *context,
{
struct dh *st;
string_t p,g;
+ dict_t *dict = 0;
item_t *i;
+ bool_t check = True;
- st=safe_malloc(sizeof(*st),"dh_apply");
+ NEW(st);
st->cl.description="dh";
st->cl.type=CL_DH;
st->cl.apply=NULL;
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","modulus must be a prime\n");
}
}
- st->ops.len=mpz_sizeinbase(&st->p,2)/8;
+
+ size_t sz=mpz_sizeinbase(&st->p,2)/8;
+ if (sz>INT_MAX) {
+ cfgfatal(loc,"diffie-hellman","modulus far too large\n");
+ }
+ if (mpz_cmp(&st->g,&st->p) >= 0) {
+ cfgfatal(loc,"diffie-hellman","generator must be less than modulus\n");
+ }
+
+ st->ops.secret_len=sz;
+
+ 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. */
return new_closure(&st->cl);
}
-init_module dh_module;
void dh_module(dict_t *dict)
{
add_closure(dict,"diffie-hellman",dh_apply);
~mdw / secnet / blobdiff