let's use more strict warnings, and help Visual Studio

[xonotic/d0_blind_id.git] / d0_bignum-gmp.c

diff --git a/d0_bignum-gmp.c b/d0_bignum-gmp.c
index 5cd31c01d7122c31227429da267c2bdb9fd046c9..93bf0f72154d3c5c5da75de81c58344eb7794434 100644 (file)
--- a/d0_bignum-gmp.c
+++ b/d0_bignum-gmp.c
@@ -1,3 +1,22 @@
+/*
+Blind-ID library for user identification using RSA blind signatures
+Copyright (C) 2010  Rudolf Polzer
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
 #include "d0_bignum.h"
 
 #include <gmp.h>
@@ -8,17 +27,34 @@ struct d0_bignum_s
 };
 
 static gmp_randstate_t RANDSTATE;
+static d0_bignum_t temp;
 
 #include <time.h>
-void d0_bignum_INITIALIZE()
+#include <stdio.h>
+void d0_bignum_INITIALIZE(void)
 {
-       gmp_randinit_default(RANDSTATE);
-       gmp_randseed_ui(RANDSTATE, time(NULL)); // TODO seed
+       FILE *f;
+       d0_bignum_init(&temp);
+       gmp_randinit_mt(RANDSTATE);
+       gmp_randseed_ui(RANDSTATE, time(NULL));
+       f = fopen("/dev/random", "rb");
+       if(f)
+       {
+               unsigned char buf[256];
+               setbuf(f, NULL);
+               if(fread(buf, sizeof(buf), 1, f) == 1)
+               {
+                       mpz_import(temp.z, sizeof(buf), 1, 1, 0, 0, buf);
+                       gmp_randseed(RANDSTATE, temp.z);
+               }
+               fclose(f);
+       }
 }
 
-void d0_bignum_SHUTDOWN()
+void d0_bignum_SHUTDOWN(void)
 {
-       // free RANDSTATE
+       d0_bignum_clear(&temp);
+       gmp_randclear(RANDSTATE);
 }
 
 BOOL d0_iobuf_write_bignum(d0_iobuf_t *buf, const d0_bignum_t *bignum)
@@ -58,7 +94,7 @@ d0_bignum_t *d0_iobuf_read_bignum(d0_iobuf_t *buf, d0_bignum_t *bignum)
        return bignum;
 }
 
-d0_bignum_t *d0_bignum_new()
+d0_bignum_t *d0_bignum_new(void)
 {
        d0_bignum_t *b = d0_malloc(sizeof(d0_bignum_t));
        mpz_init(b->z);
@@ -93,10 +129,9 @@ int d0_bignum_cmp(const d0_bignum_t *a, const d0_bignum_t *b)
 
 d0_bignum_t *d0_bignum_rand_range(d0_bignum_t *r, const d0_bignum_t *min, const d0_bignum_t *max)
 {
-       static d0_bignum_t *temp = NULL; if(!temp) temp = d0_bignum_new();
        if(!r) r = d0_bignum_new(); if(!r) return NULL;
-       mpz_sub(temp->z, max->z, min->z);
-       mpz_urandomm(r->z, RANDSTATE, temp->z);
+       mpz_sub(temp.z, max->z, min->z);
+       mpz_urandomm(r->z, RANDSTATE, temp.z);
        mpz_add(r->z, r->z, min->z);
        return r;
 }