X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/4ab1268f3ec850a115a68966325aced4f08ec603..ea932d59b3071ce00f9e510aad014ad64a3dc48c:/lcrand.c diff --git a/lcrand.c b/lcrand.c index 88e9591..a108f13 100644 --- a/lcrand.c +++ b/lcrand.c @@ -1,13 +1,13 @@ /* -*-c-*- * - * $Id: lcrand.c,v 1.2 1999/12/13 15:34:01 mdw Exp $ + * $Id: lcrand.c,v 1.5 2004/04/08 01:36:15 mdw Exp $ * * Simple linear congruential generator * * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of Catacomb. * @@ -15,29 +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: lcrand.c,v $ - * Revision 1.2 1999/12/13 15:34:01 mdw - * Add support for seeding from a generic pseudorandom source. - * - * Revision 1.1 1999/12/10 23:15:27 mdw - * Noncryptographic random number generator. - * - */ - /*----- Header files ------------------------------------------------------*/ #include @@ -175,7 +164,7 @@ uint32 lcrand_range(uint32 *x, uint32 m) uint32 r = P - P % m; do xx = lcrand(xx); while (xx >= r); *x = xx; - return (xx / (r / m)); + return (xx % m); } /*----- Generic interface -------------------------------------------------*/ @@ -247,7 +236,7 @@ static octet gbyte(grand *r) do x = lcrand(x); while (x >= P256); g->x = x; return (x / (P256 / 256)); -} +} static uint32 grange(grand *r, uint32 l) { @@ -257,7 +246,7 @@ static uint32 grange(grand *r, uint32 l) static const grand_ops gops = { "lcrand", - LCRAND_P, + LCRAND_P, 0, gmisc, gdestroy, graw, gbyte, grand_word, grange, grand_fill };