X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/1269467c574b73b63e596de3e5be561014215c99..3563e36580c7dad68cd6d3f7eb82eef570fc0c76:/dh.h

diff --git a/dh.h b/dh.h
index c2f2311..56dbf0a 100644
--- a/dh.h
+++ b/dh.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dh.h,v 1.6 2000/07/29 10:01:16 mdw Exp $
+ * $Id: dh.h,v 1.8 2004/04/01 12:50:09 mdw Exp $
  *
  * Diffie-Hellman and related public-key systems
  *
@@ -30,6 +30,16 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: dh.h,v $
+ * Revision 1.8  2004/04/01 12:50:09  mdw
+ * Add cyclic group abstraction, with test code.  Separate off exponentation
+ * functions for better static linking.  Fix a buttload of bugs on the way.
+ * Generally ensure that negative exponents do inversion correctly.  Add
+ * table of standard prime-field subgroups.  (Binary field subgroups are
+ * currently unimplemented but easy to add if anyone ever finds a good one.)
+ *
+ * Revision 1.7  2001/02/03 16:08:24  mdw
+ * Add consistency checking for public keys.
+ *
  * Revision 1.6  2000/07/29 10:01:16  mdw
  * Supply commentry for the Diffie-Hellman parameters.  Add Lim-Lee
  * parameter generation.
@@ -54,6 +64,10 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#ifndef CATACOMB_GROUP_H
+#  include "group.h"
+#endif
+
 #ifndef CATACOMB_GRAND_H
 #  include "grand.h"
 #endif
@@ -62,26 +76,31 @@
 #  include "key.h"
 #endif
 
+#ifndef CATACOMB_KEYCHECK_H
+#  include "keycheck.h"
+#endif
+
 #ifndef CATACOMB_PGEN_H
 #  include "pgen.h"
 #endif
 
+#ifndef CATACOMB_QDPARSE_H
+#  include "qdparse.h"
+#endif
+
 /*----- Data structures ---------------------------------------------------*/
 
-typedef struct dh_param {		/* Prime numbers %$p$% and %$q$% */
-  mp *p, *q;				/* Generates order-%$q$% subgroup */
-  mp *g;
-} dh_param;
+typedef gprime_param dh_param;		/* Group parameters */
 
-typedef struct dh_pub {			/* Shared parameters */
-  dh_param dp;				/* Public key */
-  mp *y;
+typedef struct dh_pub {
+  dh_param dp;				/* Shared parameters */		
+  mp *y;				/* Public key */
 } dh_pub;
 
-typedef struct dh_priv {		/* Shared parameters */
-  dh_param dp;				/* Private key */
-  mp *x;				/* %$y \equiv g^x \pmod{p}$% */
-  mp *y;
+typedef struct dh_priv {
+  dh_param dp;				/* Shared parameters */
+  mp *x;				/* Private key */
+  mp *y;				/* %$y \equiv g^x \pmod{p}$% */
 } dh_priv;
 
 /*----- Key fetching ------------------------------------------------------*/
@@ -175,6 +194,36 @@ extern int dh_limlee(dh_param */*dp*/, unsigned /*ql*/, unsigned /*pl*/,
 		     pgen_proc */*oev*/, void */*oec*/, pgen_proc */*iev*/,
 		     void */*iec*/, size_t */*nf*/, mp ***/*f*/);
 
+/* --- @dh_checkparam@ --- *
+ *
+ * Arguments:	@keycheck *kc@ = keycheck state
+ *		@const dh_param *dp@ = pointer to the parameter set
+ *		@mp **v@ = optional vector of factors
+ *		@size_t n@ = size of vector
+ *
+ * Returns:	Zero if all OK, or return status from function.
+ *
+ * Use:		Checks a set of Diffie-Hellman parameters for consistency and
+ *		security.
+ */
+
+extern int dh_checkparam(keycheck */*kc*/, const dh_param */*dp*/,
+			 mp **/*v*/, size_t /*n*/);
+
+/* --- @dh_parse@ --- *
+ *
+ * Arguments:	@qd_parse *qd@ = parser context
+ *		@dh_param *dp@ = parameters to fill in
+ *
+ * Returns:	Zero if OK, nonzero on error.
+ *
+ * Use:		Parses a prime group string.  This is either one of the
+ *		standard group strings, or a %$p$%, %$q$%, %$g$% triple
+ *		separated by commas.
+ */
+
+extern int dh_parse(qd_parse */*qd*/, dh_param */*dp*/);
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus