- dtucker@cvs.openbsd.org 2010/01/12 01:31:05

[openssh.git] / dh.h

diff --git a/dh.h b/dh.h
index fd90fab5a6a0ac9ab64d66a3e4e7fbfdae740d84..dfc1480eac66798c32483656f5a78d2fa2c525d3 100644 (file)
--- a/dh.h
+++ b/dh.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: dh.h,v 1.6 2001/06/26 06:32:52 itojun Exp $   */
+/* $OpenBSD: dh.h,v 1.10 2008/06/26 09:19:40 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
@@ -36,13 +36,38 @@ DH  *choose_dh(int, int, int);
 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);
 
-void   dh_gen_key(DH *, int);
-int    dh_pub_is_valid(DH *, BIGNUM *);
+void    dh_gen_key(DH *, int);
+int     dh_pub_is_valid(DH *, BIGNUM *);
 
-int    dh_estimate(int);
+int     dh_estimate(int);
 
 #define DH_GRP_MIN     1024
 #define DH_GRP_MAX     8192
 
+/*
+ * Values for "type" field of moduli(5)
+ * Specifies the internal structure of the prime modulus.
+ */
+#define MODULI_TYPE_UNKNOWN            (0)
+#define MODULI_TYPE_UNSTRUCTURED       (1)
+#define MODULI_TYPE_SAFE               (2)
+#define MODULI_TYPE_SCHNORR            (3)
+#define MODULI_TYPE_SOPHIE_GERMAIN     (4)
+#define MODULI_TYPE_STRONG             (5)
+
+/*
+ * Values for "tests" field of moduli(5)
+ * Specifies the methods used in checking for primality.
+ * Usually, more than one test is used.
+ */
+#define MODULI_TESTS_UNTESTED          (0x00)
+#define MODULI_TESTS_COMPOSITE         (0x01)
+#define MODULI_TESTS_SIEVE             (0x02)
+#define MODULI_TESTS_MILLER_RABIN      (0x04)
+#define MODULI_TESTS_JACOBI            (0x08)
+#define MODULI_TESTS_ELLIPTIC          (0x10)
+
+
 #endif