Minor changes for key fetching.

diff --git a/dh.h b/dh.h
index 465f59f..2fff372 100644 (file)
--- 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.4 2000/06/17 10:52:47 mdw Exp $
  *
  * Diffie-Hellman and related public-key systems
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: dh.h,v $
+ * 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 +51,10 @@
 #  include "grand.h"
 #endif
 
+#ifndef CATACOMB_KEY_H
+#  include "key.h"
+#endif
+
 #ifndef CATACOMB_PGEN_H
 #  include "pgen.h"
 #endif
@@ -59,6 +66,28 @@ typedef struct dh_param {
   mp *g;
 } dh_param;
 
+typedef struct dh_pub {
+  dh_param dp;
+  mp *y;
+} dh_pub;
+
+typedef struct dh_priv {
+  dh_param dp;
+  mp *x;
+  mp *y;
+} 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
+
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @dh_gen@ --- *