/* -*-c-*-
*
- * $Id: dh.h,v 1.7 2001/02/03 16:08:24 mdw Exp $
+ * $Id$
*
* Diffie-Hellman and related public-key systems
*
* MA 02111-1307, USA.
*/
-/*----- 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).
- *
- */
-
#ifndef CATACOMB_DH_H
#define CATACOMB_DH_H
/*----- Header files ------------------------------------------------------*/
+#ifndef CATACOMB_GROUP_H
+# include "group.h"
+#endif
+
#ifndef CATACOMB_GRAND_H
# include "grand.h"
#endif
# include "pgen.h"
#endif
+#ifndef CATACOMB_QDPARSE_H
+# include "qdparse.h"
+#endif
+
/*----- Data structures ---------------------------------------------------*/
-typedef struct dh_param {
- mp *p, *q; /* Prime numbers %$p$% and %$q$% */
- mp *g; /* Generates order-%$q$% subgroup */
-} dh_param;
+typedef gprime_param dh_param; /* Group parameters */
typedef struct dh_pub {
dh_param dp; /* Shared parameters */
extern int dh_checkparam(keycheck */*kc*/, const dh_param */*dp*/,
mp **/*v*/, size_t /*n*/);
+/* ---- @dh_infofromdata@ --- *
+ *
+ * Arguments: @dh_param *dp@ = parameters to fill in
+ * @pdata *pd@ = packed data structure
+ *
+ * Returns: ---
+ *
+ * Use: Fills in a parameters structure from a packed data block.
+ */
+
+struct pdata;
+extern void dh_infofromdata(dh_param */*dp*/, struct pdata */*pd*/);
+
+/* --- @dh_parse@, @dhbin_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/binary 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*/);
+extern int dhbin_parse(qd_parse */*qd*/, gbin_param */*gb*/);
+
/*----- That's all, folks -------------------------------------------------*/
#ifdef __cplusplus