X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=dh.c;h=fff9b998c54062eaa473968640f40acc6b6f8a5d;hb=59230b9b9fc44453f24c6b3cf33a0f4c570a3563;hp=5917d39e0dd6f7df0b47ed0b2794a3a3e60f8f8e;hpb=ff05a229397c75142725f45cad191ce4a00625ce;p=secnet.git

diff --git a/dh.c b/dh.c
index 5917d39..fff9b99 100644
--- a/dh.c
+++ b/dh.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <gmp.h>
+#include <limits.h>
 
 #include "secnet.h"
 #include "util.h"
@@ -31,8 +32,9 @@ static string_t dh_makepublic(void *sst, uint8_t *secret, uint32_t secretlen)
     return r;
 }
 
+static dh_makeshared_fn dh_makeshared;
 static void dh_makeshared(void *sst, uint8_t *secret, uint32_t secretlen,
-			  string_t rempublic, uint8_t *sharedsecret,
+			  cstring_t rempublic, uint8_t *sharedsecret,
 			  uint32_t buflen)
 {
     struct dh *st=sst;
@@ -112,12 +114,20 @@ static list_t *dh_apply(closure_t *self, struct cloc loc, dict_t *context,
 	    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.len=sz;
 
     return new_closure(&st->cl);
 }
 
-init_module dh_module;
 void dh_module(dict_t *dict)
 {
     add_closure(dict,"diffie-hellman",dh_apply);