X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/ba044e65f37effe25ed5a6fa86d7c250b8065f60..d34decd2b2b88240cf4ca68a2a5feb7bf36de6e7:/rand.h

diff --git a/rand.h b/rand.h
index 2656eaf..2f23440 100644
--- a/rand.h
+++ b/rand.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: rand.h,v 1.2 1999/10/12 21:00:15 mdw Exp $
+ * $Id: rand.h,v 1.5 1999/12/13 15:34:15 mdw Exp $
  *
  * Secure random number generator
  *
@@ -30,6 +30,15 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: rand.h,v $
+ * Revision 1.5  1999/12/13 15:34:15  mdw
+ * Fix a typo.
+ *
+ * Revision 1.4  1999/12/10 23:29:48  mdw
+ * Change header file guard names.
+ *
+ * Revision 1.3  1999/10/15 21:04:30  mdw
+ * Increase output buffer a bit for performance.
+ *
  * Revision 1.2  1999/10/12 21:00:15  mdw
  * Make pool and buffer sizes more sensible.
  *
@@ -50,7 +59,7 @@
  * concerns I expressed about the Linux generator in a Usenet article to
  * sci.crypt.
  *
- * The generator is divided into two parts: an input pool and an outpu
+ * The generator is divided into two parts: an input pool and an output
  * buffer.  New random data is placed into the pool in the way described
  * below, which is shamelessly stolen from the Linux /dev/random generator.
  * The only interaction that the pool has on the output buffer is through the
@@ -77,8 +86,8 @@
  * an adversary has to guess before predicting generator output.
  */
 
-#ifndef RAND_H
-#define RAND_H
+#ifndef CATACOMB_RAND_H
+#define CATACOMB_RAND_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -88,12 +97,18 @@
 
 #include <stddef.h>
 
-#include "rmd160-hmac.h"
+#ifndef CATACOMB_GRAND_H
+#  include "grand.h"
+#endif
+
+#ifndef CATACOMB_RMD160_HMAC_H
+#  include "rmd160-hmac.h"
+#endif
 
 /*----- Magic numbers -----------------------------------------------------*/
 
 #define RAND_POOLSZ 128			/* Input pool size in bytes */
-#define RAND_BUFSZ 128			/* Output buffer size in bytes */
+#define RAND_BUFSZ 512			/* Output buffer size in bytes */
 #define RAND_SECSZ 20			/* Secret octets in output buffer */
 
 #define RAND_IBITS (RAND_POOLSZ * 8)
@@ -238,7 +253,7 @@ extern void rand_stretch(rand_pool */*r*/);
  * Use:		Gets random data from the pool.  The pool's contents can't be
  *		determined from the output of this function; nor can the
  *		output data be determined from a knowledge of the data input
- *		to the pool wihtout also having knowledge of the secret key.
+ *		to the pool without also having knowledge of the secret key.
  *		The good bits counter is decremented, although no special
  *		action is taken if it reaches zero.
  */
@@ -264,6 +279,33 @@ extern void rand_get(rand_pool */*r*/, void */*p*/, size_t /*sz*/);
 
 extern void rand_getgood(rand_pool */*r*/, void */*p*/, size_t /*sz*/);
 
+/*----- Generic random number generator interface -------------------------*/
+
+/* --- Miscellaneous operations --- */
+
+enum {
+  RAND_GATE = GRAND_SPECIFIC,		/* No args */
+  RAND_STRETCH,				/* No args */
+  RAND_KEY,				/* @const void *k, size_t sz@ */
+  RAND_NOISESRC				/* @const rand_source *s@ */
+};
+
+/* --- Default random number generator --- */
+
+extern grand rand_global;
+
+/* --- @rand_create@ --- *
+ *
+ * Arguments:	---
+ *
+ * Returns:	Pointer to a generic generator.
+ *
+ * Use:		Constructs a generic generator interface over a Catacomb
+ *		entropy pool generator.
+ */
+
+extern grand *rand_create(void);
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus