X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dh.h;h=344b29e356cead53dbe372252587b126ea90eafc;hb=HEAD;hp=48f7b68eaf4b932c332b4009a40c61cbde95203a;hpb=18822d0b975f30c628b39fb38c1a0372e372aeb8;p=platform%2Fupstream%2Fopenssh.git

diff --git a/dh.h b/dh.h
index 48f7b68..344b29e 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.15 2016/05/02 10:26:04 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
@@ -37,14 +37,20 @@ DH	*dh_new_group_asc(const char *, const char *);
 DH	*dh_new_group(BIGNUM *, BIGNUM *);
 DH	*dh_new_group1(void);
 DH	*dh_new_group14(void);
+DH	*dh_new_group16(void);
+DH	*dh_new_group18(void);
+DH	*dh_new_group_fallback(int);
 
-void	 dh_gen_key(DH *, int);
-int	 dh_pub_is_valid(DH *, BIGNUM *);
+int	 dh_gen_key(DH *, int);
+int	 dh_pub_is_valid(const DH *, const BIGNUM *);
 
-int	 dh_estimate(int);
+u_int	 dh_estimate(int);
 
-/* Min and max values from RFC4419. */
-#define DH_GRP_MIN	1024
+/*
+ * Max value from RFC4419.
+ * Miniumum increased in light of DH precomputation attacks.
+ */
+#define DH_GRP_MIN	2048
 #define DH_GRP_MAX	8192
 
 /*