X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/052b36d05a622a93733b735acce2de865b14627b..2685767a6125c1620719c7de6234aedf41857b7e:/dh.h

diff --git a/dh.h b/dh.h
index 465f59f..90fdaa3 100644
--- a/dh.h
+++ b/dh.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dh.h,v 1.3 2000/02/12 18:21:02 mdw Exp $
+ * $Id: dh.h,v 1.7 2001/02/03 16:08:24 mdw Exp $
  *
  * Diffie-Hellman and related public-key systems
  *
@@ -30,6 +30,19 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: dh.h,v $
+ * 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.
+ *
+ * Revision 1.5  2000/07/01 11:20:51  mdw
+ * New functions for freeing public and private keys.
+ *
+ * Revision 1.4  2000/06/17 10:52:47  mdw
+ * Minor changes for key fetching.
+ *
  * Revision 1.3  2000/02/12 18:21:02  mdw
  * Overhaul of key management (again).
  *
@@ -48,6 +61,14 @@
 #  include "grand.h"
 #endif
 
+#ifndef CATACOMB_KEY_H
+#  include "key.h"
+#endif
+
+#ifndef CATACOMB_KEYCHECK_H
+#  include "keycheck.h"
+#endif
+
 #ifndef CATACOMB_PGEN_H
 #  include "pgen.h"
 #endif
@@ -55,10 +76,46 @@
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct dh_param {
-  mp *p, *q;
-  mp *g;
+  mp *p, *q;				/* Prime numbers %$p$% and %$q$% */
+  mp *g;				/* Generates order-%$q$% subgroup */
 } dh_param;
 
+typedef struct dh_pub {
+  dh_param dp;				/* Shared parameters */		
+  mp *y;				/* Public key */
+} dh_pub;
+
+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 ------------------------------------------------------*/
+
+extern const key_fetchdef dh_paramfetch[];
+#define DH_PARAMFETCHSZ 5
+
+extern const key_fetchdef dh_pubfetch[];
+#define DH_PUBFETCHSZ 6
+
+extern const key_fetchdef dh_privfetch[];
+#define DH_PRIVFETCHSZ 9
+
+/* --- @dh_paramfree@, @dh_pubfree@, @dh_privfree@ --- *
+ *
+ * Arguments:	@dh_param *dp@, @dh_pub *dp@, @dh_priv *dp@ = pointer to
+ *			key block to free
+ *
+ * Returns:	---
+ *
+ * Use:		Frees a Diffie-Hellman key block.
+ */
+
+extern void dh_paramfree(dh_param */*dp*/);
+extern void dh_pubfree(dh_pub */*dp*/);
+extern void dh_privfree(dh_priv */*dp*/);
+
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @dh_gen@ --- *
@@ -89,6 +146,58 @@ extern int dh_gen(dh_param */*dp*/, unsigned /*ql*/, unsigned /*pl*/,
 		  unsigned /*steps*/, grand */*r*/, pgen_proc */*event*/,
 		  void */*ectx*/);
 
+/* --- @dh_limlee@ --- *
+ *
+ * Arguments:	@dh_param *dp@ = pointer to output parameter block
+ *		@unsigned ql@ = length of smallest factor of %$(p - 1)/2$%
+ *		@unsigned pl@ = length of %$p$% in bits
+ *		@unsigned flags@ = other generation flags
+ *		@unsigned steps@ = number of steps to go
+ *		@grand *r@ = random number source
+ *              @pgen_proc *oev@ = outer event handler function
+ *              @void *oec@ = argument for the outer event handler
+ *              @pgen_proc *iev@ = inner event handler function
+ *              @void *iec@ = argument for the inner event handler
+ *              @size_t *nf@, @mp ***f@ = output array for factors
+ *
+ * Returns:	@PGEN_DONE@ if it worked, @PGEN_ABORT@ if it didn't.
+ *
+ * Use:		Generates Diffie-Hellman parameters based on a Lim-Lee prime.
+ *
+ *		The modulus is a large prime %$p = 2 \prod q_i + 1$%, @pl@
+ *		bits long, where the %$q_i$% are smaller primes each at least
+ *		@ql@ bits long.  It is safe to set @nf@ and @f@ to zero if
+ *		you're not interested in the factor values.
+ *
+ *		The returned %$g$% generates a subgroup of order %$q_0$% (the
+ *		first factor, returned as @f[0]@), if the flag @DH_SUBGROUP@
+ *		is set on entry; otherwise %$g$% will have order
+ *		%$(p - 1)/2$%.
+ */
+
+#define DH_SUBGROUP 1u
+
+extern int dh_limlee(dh_param */*dp*/, unsigned /*ql*/, unsigned /*pl*/,
+		     unsigned /*flags*/, unsigned /*steps*/, grand */*r*/,
+		     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*/);
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus