X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/1709c9a148391a5dea359b2f67ff5db733a597cd..1d6d3b01cb40e0cfaeb816c87c513695aea0816a:/rand.h diff --git a/rand.h b/rand.h index 05721fc..5d542b8 100644 --- a/rand.h +++ b/rand.h @@ -1,13 +1,13 @@ /* -*-c-*- * - * $Id: rand.h,v 1.8 2001/02/03 16:07:33 mdw Exp $ + * $Id$ * * Secure random number generator * * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of Catacomb. * @@ -15,49 +15,18 @@ * it under the terms of the GNU Library General Public License as * published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. - * + * * Catacomb is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. - * + * * You should have received a copy of the GNU Library General Public * License along with Catacomb; if not, write to the Free * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. */ -/*----- Revision history --------------------------------------------------* - * - * $Log: rand.h,v $ - * Revision 1.8 2001/02/03 16:07:33 mdw - * Give generic random objects separate namespaces for their supported misc - * ops. - * - * Revision 1.7 2000/10/08 12:07:18 mdw - * Remove spurious comma in enum. - * - * Revision 1.6 2000/06/17 11:53:38 mdw - * Deprecate `rand_getgood'. Provide a new interface to ensure that a pool - * is well seeded. - * - * 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. - * - * Revision 1.1 1999/09/03 08:41:12 mdw - * Initial import. - * - */ - /*----- Notes on the random number generator ------------------------------* * * The algorithm is one of the author's own devising. It may therefore be @@ -235,9 +204,9 @@ extern void rand_add(rand_pool */*r*/, /* --- @rand_goodbits@ --- * * - * Arguments: @rand_pool *r@ = pointer to a randomness pool + * Arguments: @rand_pool *r@ = pointer to a randomness pool * - * Returns: Estimate of the number of good bits remaining in the pool. + * Returns: Estimate of the number of good bits remaining in the pool. */ extern unsigned rand_goodbits(rand_pool */*r*/); @@ -314,7 +283,11 @@ enum { RAND_STRETCH, /* No args */ RAND_KEY, /* @const void *k, size_t sz@ */ RAND_NOISESRC, /* @const rand_source *s@ */ - RAND_SEED /* @unsigned bits@ */ + RAND_SEED, /* @unsigned bits@ */ + RAND_TIMER, /* No args */ + RAND_GOODBITS, /* No args */ + RAND_ADD /* @const void *p, size_t sz,@ + * @unsigned goodbits */ }; /* --- Default random number generator --- */