upstream commit

add support for additional fixed DH groups from
 draft-ietf-curdle-ssh-kex-sha2-03

diffie-hellman-group14-sha256 (2K group)
diffie-hellman-group16-sha512 (4K group)
diffie-hellman-group18-sha512 (8K group)

based on patch from Mark D. Baushke and Darren Tucker
ok markus@

Upstream-ID: ac00406ada4f0dfec41585ca0839f039545bc46f

1 files changed, 3 insertions, 1 deletions

diff --git a/dh.h b/dh.h
index e191cfd8a..bcd485cf9 100644
--- a/dh.h
+++ b/dh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.h,v 1.14 2015/10/16 22:32:22 djm Exp $ */
+/* $OpenBSD: dh.h,v 1.15 2016/05/02 10:26:04 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
@@ -37,6 +37,8 @@ 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);
 
 int      dh_gen_key(DH *, int);