projects
/
platform
/
upstream
/
openssh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the build error for gcc-14
[platform/upstream/openssh.git]
/
dh.h
diff --git
a/dh.h
b/dh.h
index
48f7b68
..
344b29e
100644
(file)
--- a/
dh.h
+++ b/
dh.h
@@
-1,4
+1,4
@@
-/* $OpenBSD: dh.h,v 1.1
1 2013/10/08 11:42:13 dtucker
Exp $ */
+/* $OpenBSD: dh.h,v 1.1
5 2016/05/02 10:26:04 djm
Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
/*
* 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_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
/*
#define DH_GRP_MAX 8192
/*