X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=f30e8166b01badc08de69487dcb99645d4d15990;hp=289748e84d16dbca133b9280dc2027e5d9c2ec67;hb=f012a742a9b342c51e3c6bef22eaab0f39cb9e46;hpb=0b6e7a20c19d642f9d8e65683e1525c91dd3de39

diff --git a/gcrypt.c b/gcrypt.c
index 289748e8..f30e8166 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -59,16 +59,15 @@ void get_random_bytes_or_die(unsigned char *buf, int num)
 }
 
 /*
- * This is called at the beginning of every program that uses libgcrypt. We
- * don't have to initialize any random seed here, but we must initialize the
- * gcrypt library. This task is performed by gcry_check_version() which can
- * also check that the gcrypt library version is at least the minimal required
- * version. This function also tells us whether we have to use our own OAEP
- * padding code.
+ * This is called at the beginning of every program that uses libgcrypt. The
+ * call to gcry_check_version() initializes the gcrypt library and checks that
+ * we have at least the minimal required version. This function also tells us
+ * whether we have to use our own OAEP padding code.
  */
 void init_random_seed_or_die(void)
 {
 	const char *ver, *req_ver;
+	int seed;
 
 	ver = gcry_check_version(NULL);
 	req_ver = "1.4.0";
@@ -85,6 +84,8 @@ void init_random_seed_or_die(void)
 		libgcrypt_has_oaep = false;
 		rsa_decrypt_sexp = "(enc-val(rsa(a %m)))";
 	}
+	get_random_bytes_or_die((unsigned char *)&seed, sizeof(seed));
+	srandom(seed);
 }
 
 /** S-expression for the public part of an RSA key. */
@@ -388,7 +389,7 @@ static int read_bignum(unsigned char *start, unsigned char *end, gcry_mpi_t *bn,
 		for (i = 0; i < num_bytes; i++, cp++)
 			bn_size = (bn_size << 8) + *cp;
 	}
-	PARA_DEBUG_LOG("bn_size %d (0x%x)\n", bn_size, bn_size);
+	PARA_DEBUG_LOG("bn_size %d (0x%x)\n", bn_size, (unsigned)bn_size);
 	gret = gcry_mpi_scan(bn, GCRYMPI_FMT_STD, cp, bn_size, NULL);
 	if (gret) {
 		PARA_ERROR_LOG("%s while scanning n\n",
@@ -586,7 +587,7 @@ static int get_asn_public_key(const char *key_file, struct asymmetric_key **resu
 	key->num_bytes = n_size;
 	*result = key;
 	ret = n_size;
-	PARA_INFO_LOG("successfully read %u bit asn public key\n", n_size * 8);
+	PARA_INFO_LOG("successfully read %d bit asn public key\n", n_size * 8);
 
 release_e:
 	gcry_mpi_release(e);
@@ -648,7 +649,7 @@ static int get_ssh_public_key(unsigned char *data, int size, gcry_sexp_t *result
 		goto release_n;
 	}
 	ret = nr_scanned / 32 * 32;
-	PARA_INFO_LOG("successfully read %u bit ssh public key\n", ret * 8);
+	PARA_INFO_LOG("successfully read %d bit ssh public key\n", ret * 8);
 release_n:
 	gcry_mpi_release(n);
 release_e: