commit 57d10cbe861a235dd269c74fb2fe248469ecee9d
author markus@openbsd.org <markus@openbsd.org> Mon Jan 19 20:16:15 2015 +0000
committer Damien Miller <djm@mindrot.org> Tue Jan 20 09:19:39 2015 +1100
tree c65deed24700490bd3b20300c4829d4d5466ff6d
parent 3fdc88a0def4f86aa88a5846ac079dc964c0546a

upstream commit

adapt kex to sshbuf and struct ssh; ok djm@

dh.h

diff --git a/dh.h b/dh.h
index 48f7b68..63a1b14 100644
--- a/dh.h
+++ b/dh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.h,v 1.11 2013/10/08 11:42:13 dtucker Exp $ */
+/* $OpenBSD: dh.h,v 1.12 2015/01/19 20:16:15 markus Exp $ */
 
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
@@ -38,10 +38,10 @@
 DH	*dh_new_group1(void);
 DH	*dh_new_group14(void);
 
-void	 dh_gen_key(DH *, int);
+int	 dh_gen_key(DH *, int);
 int	 dh_pub_is_valid(DH *, BIGNUM *);
 
-int	 dh_estimate(int);
+u_int	 dh_estimate(int);
 
 /* Min and max values from RFC4419. */
 #define DH_GRP_MIN	1024