X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/827e6c999a4a94c217b7138bb7e46f36f7644dab..2e8eb64a72472bea4faba1cee5edde4fe3616808:/dsa.h

diff --git a/dsa.h b/dsa.h
index dfd04db..ce7e762 100644
--- a/dsa.h
+++ b/dsa.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dsa.h,v 1.7 2000/07/29 09:59:44 mdw Exp $
+ * $Id: dsa.h,v 1.8 2001/02/03 16:08:24 mdw Exp $
  *
  * Digital Signature Algorithm
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: dsa.h,v $
+ * Revision 1.8  2001/02/03 16:08:24  mdw
+ * Add consistency checking for public keys.
+ *
  * Revision 1.7  2000/07/29 09:59:44  mdw
  * Share data structures with Diffie-Hellman stuff.
  *
@@ -79,6 +82,10 @@
 #  include "key.h"
 #endif
 
+#ifndef CATACOMB_KEYCHECK_H
+#  include "keycheck.h"
+#endif
+
 #ifndef CATACOMB_MP_H
 #  include "mp.h"
 #endif
@@ -95,6 +102,14 @@ typedef dh_param dsa_param;
 typedef dh_pub dsa_pub;
 typedef dh_priv dsa_priv;
 
+/* --- DSA key seed structure --- */
+
+typedef struct dsa_seed {
+  void *p;				/* Pointer to seed material */
+  size_t sz;				/* Size of seed material */
+  unsigned count;			/* Iterations to find @p@ */
+} dsa_seed;
+
 /* --- DSA signature structure --- *
  *
  * This is the recommended structure for a DSA signature.  The actual signing
@@ -133,6 +148,8 @@ typedef struct dsa_stepctx {
   mp *q;				/* Force @p@ to be a multiple */
   size_t bits;				/* Number of bits in the result */
   unsigned or;				/* OR mask for low order bits */
+  unsigned count;			/* Counts the number of steps made */
+  void *seedbuf;			/* Pointer to seed buffer */
 } dsa_stepctx;
 
 /* --- @dsa_step@ --- *
@@ -154,6 +171,7 @@ extern int dsa_step(int /*rq*/, pgen_event */*ev*/, void */*p*/);
  *		@unsigned steps@ = number of steps to find @q@
  *		@const void *k@ = pointer to key material
  *		@size_t sz@ = size of key material
+ *		@dsa_seed *sd@ = optional pointer for output seed information
  *		@pgen_proc *event@ = event handler function
  *		@void *ectx@ = argument for event handler
  *
@@ -171,7 +189,21 @@ extern int dsa_step(int /*rq*/, pgen_event */*ev*/, void */*p*/);
 
 extern int dsa_gen(dsa_param */*dp*/, unsigned /*ql*/, unsigned /*pl*/,
 		   unsigned /*steps*/, const void */*k*/, size_t /*sz*/,
-		   pgen_proc */*event*/, void */*ectx*/);
+		   dsa_seed */*sd*/, pgen_proc */*event*/, void */*ectx*/);
+
+/* --- @dsa_checkparam@ --- *
+ *
+ * Arguments:	@keycheck *kc@ = keycheck state
+ *		@const dsa_param *dp@ = pointer to the parameter set
+ *		@const dsa_seed *ds@ = pointer to seed information
+ *
+ * Returns:	Zero if all OK, or return status from function.
+ *
+ * Use:		Checks a set of DSA parameters for consistency and security.
+ */
+
+extern int dsa_checkparam(keycheck */*kc*/, const dsa_param */*dp*/,
+			  const dsa_seed */*ds*/);
 
 /* --- @dsa_mksig@ --- *
  *