summaryrefslogtreecommitdiff
path: root/cipher/primegen.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2003-10-31 05:06:09 +0000
committerWerner Koch <wk@gnupg.org>2003-10-31 05:06:09 +0000
commit42fe74d70b1b3f2dd2a033ee525a2dd1d186345e (patch)
tree3288aec9c23c344f2adb04ea0c198138a06a7759 /cipher/primegen.c
parent21dece6b2618a281567a631a7adbce1266d002b4 (diff)
downloadlibgcrypt-42fe74d70b1b3f2dd2a033ee525a2dd1d186345e.tar.gz
* acinclude.m4 (AC_CHECK_PTH): Added.
* configure.ac: Use it here instead of the generic lib test. Bumbed LT vesion to C9/A2/R0. * dsa.c (verify): s/exp/ex/ due to shadowing of a builtin. * elgamal.c (verify): Ditto. * ac.c (gcry_ac_data_get_index): s/index/idx/ (gcry_ac_data_copy_internal): Remove the cast in _gcry_malloc. (gcry_ac_data_add): Must use gcry_realloc instead of realloc. * pubkey.c (sexp_elements_extract): s/index/idx/ as tribute to the forehackers. (gcry_pk_encrypt): Removed shadowed definition of I. Reordered arguments to malloc for clarity. (gcry_pk_sign, gcry_pk_genkey): Ditto. * primegen.c (prime_generate_internal): s/random/randomlevel/. * i386/mpih-rshift.S, i386/mpih-lshift.S: Use %dl and not %edx for testb; this avoids an assembler warning. * mpi-pow.c (gcry_mpi_powm): s/exp/expo/ to avoid shadowing warning. * autogen.sh: Allow to override the tool name. Do not run libtoolize. Update required version numbers. * libgcrypt.vers (_gcry_generate_elg_prime): Removed this symbol; gnutls does not need it anymore. * secmem.c (mb_get_new): s/pool/block/ due to global pool. * misc.c (gcry_set_log_handler): s/logf/f/ to avoid shadowing warning against a builtin. * ath-pth-compat.c: cast pth_connect to get rid of the const prototype. * basic.c (check_aes128_cbc_cts_cipher): Make it a prototype * ac.c (check_run): Comment unused variable.
Diffstat (limited to 'cipher/primegen.c')
-rw-r--r--cipher/primegen.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/cipher/primegen.c b/cipher/primegen.c
index ed3420d9..127e2800 100644
--- a/cipher/primegen.c
+++ b/cipher/primegen.c
@@ -188,7 +188,7 @@ prime_generate_internal (int mode,
gcry_mpi_t *prime_generated, unsigned int pbits,
unsigned int qbits, gcry_mpi_t g,
gcry_mpi_t **ret_factors,
- gcry_random_level_t random, unsigned int flags,
+ gcry_random_level_t randomlevel, unsigned int flags,
int all_factors)
{
gcry_err_code_t err = 0;
@@ -250,10 +250,10 @@ prime_generate_internal (int mode,
prime = gcry_mpi_new (pbits);
/* Generate first prime factor. */
- q = gen_prime (qbits, is_secret, random, NULL, NULL);
+ q = gen_prime (qbits, is_secret, randomlevel, NULL, NULL);
if (mode == 1)
- q_factor = gen_prime (req_qbits, is_secret, random, NULL, NULL);
+ q_factor = gen_prime (req_qbits, is_secret, randomlevel, NULL, NULL);
/* Allocate an array to hold the factors + 2 for later
usage. */
@@ -300,7 +300,8 @@ prime_generate_internal (int mode,
for(i = 0; i < n; i++)
{
perms[i] = 1;
- pool[i] = gen_prime (fbits, is_secret, random, NULL, NULL);
+ pool[i] = gen_prime (fbits, is_secret,
+ randomlevel, NULL, NULL);
factors[i] = pool[i];
}
}