summaryrefslogtreecommitdiff
path: root/cipher
diff options
context:
space:
mode:
Diffstat (limited to 'cipher')
-rw-r--r--cipher/ChangeLog15
-rw-r--r--cipher/ac.c18
-rw-r--r--cipher/dsa.c10
-rw-r--r--cipher/elgamal.c20
-rw-r--r--cipher/primegen.c9
-rw-r--r--cipher/pubkey.c27
6 files changed, 58 insertions, 41 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 4b0d28a7..d4439138 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,18 @@
+2003-10-31 Werner Koch <wk@gnupg.org>
+
+ * 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/.
+
2003-10-27 Moritz Schulte <mo@g10code.com>
* pubkey.c (gcry_pk_encrypt): Don't forget to deallocate pkey.
diff --git a/cipher/ac.c b/cipher/ac.c
index a4b4bf56..4917a336 100644
--- a/cipher/ac.c
+++ b/cipher/ac.c
@@ -148,8 +148,8 @@ gcry_ac_data_add (gcry_ac_data_t data,
gcry_ac_mpi_t *ac_mpis = NULL;
/* Allocate. */
- ac_mpis = realloc (data->data,
- sizeof (gcry_ac_mpi_t) * (data->data_n + 1));
+ ac_mpis = gcry_realloc (data->data,
+ sizeof (gcry_ac_mpi_t) * (data->data_n + 1));
if (! ac_mpis)
err = gpg_err_code_from_errno (errno);
@@ -171,11 +171,13 @@ static gcry_err_code_t
gcry_ac_data_copy_internal (gcry_ac_data_t *data_cp, gcry_ac_data_t data)
{
gcry_err_code_t err = GPG_ERR_NO_ERROR;
- gcry_ac_data_t data_new = NULL;
+ gcry_ac_data_t data_new;
+ void *p = NULL;
int i = 0;
/* Allocate data set. */
- err = _gcry_malloc (sizeof (struct gcry_ac_data), 0, (void **) &data_new);
+ err = _gcry_malloc (sizeof (struct gcry_ac_data), 0, &p);
+ data_new = p;
if (! err)
data_new->data_n = data->data_n;
@@ -639,17 +641,17 @@ gcry_ac_data_get_name (gcry_ac_data_t data, const char *name,
returned MPI value will be released in case gcry_ac_data_set is
used to associate the label NAME with a different MPI value. */
gcry_error_t
-gcry_ac_data_get_index (gcry_ac_data_t data, unsigned int index,
+gcry_ac_data_get_index (gcry_ac_data_t data, unsigned int idx,
const char **name, gcry_mpi_t *mpi)
{
gcry_err_code_t err = GPG_ERR_NO_ERROR;
- if (index < data->data_n)
+ if (idx < data->data_n)
{
if (name)
- *name = data->data[index].name;
+ *name = data->data[idx].name;
if (mpi)
- *mpi = data->data[index].mpi;
+ *mpi = data->data[idx].mpi;
}
else
err = GPG_ERR_NO_DATA;
diff --git a/cipher/dsa.c b/cipher/dsa.c
index a75413b1..11908d4f 100644
--- a/cipher/dsa.c
+++ b/cipher/dsa.c
@@ -313,7 +313,7 @@ verify(gcry_mpi_t r, gcry_mpi_t s, gcry_mpi_t hash, DSA_public_key *pkey )
int rc;
gcry_mpi_t w, u1, u2, v;
gcry_mpi_t base[3];
- gcry_mpi_t exp[3];
+ gcry_mpi_t ex[3];
if( !(mpi_cmp_ui( r, 0 ) > 0 && mpi_cmp( r, pkey->q ) < 0) )
@@ -336,10 +336,10 @@ verify(gcry_mpi_t r, gcry_mpi_t s, gcry_mpi_t hash, DSA_public_key *pkey )
mpi_mulm( u2, r, w, pkey->q );
/* v = g^u1 * y^u2 mod p mod q */
- base[0] = pkey->g; exp[0] = u1;
- base[1] = pkey->y; exp[1] = u2;
- base[2] = NULL; exp[2] = NULL;
- mpi_mulpowm( v, base, exp, pkey->p );
+ base[0] = pkey->g; ex[0] = u1;
+ base[1] = pkey->y; ex[1] = u2;
+ base[2] = NULL; ex[2] = NULL;
+ mpi_mulpowm( v, base, ex, pkey->p );
mpi_fdiv_r( v, v, pkey->q );
rc = !mpi_cmp( v, r );
diff --git a/cipher/elgamal.c b/cipher/elgamal.c
index 51e5c559..b902aba6 100644
--- a/cipher/elgamal.c
+++ b/cipher/elgamal.c
@@ -448,7 +448,7 @@ verify(gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, ELG_public_key *pkey )
gcry_mpi_t t1;
gcry_mpi_t t2;
gcry_mpi_t base[4];
- gcry_mpi_t exp[4];
+ gcry_mpi_t ex[4];
if( !(mpi_cmp_ui( a, 0 ) > 0 && mpi_cmp( a, pkey->p ) < 0) )
return 0; /* assertion 0 < a < p failed */
@@ -468,10 +468,10 @@ verify(gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, ELG_public_key *pkey )
rc = !mpi_cmp( t1, t2 );
#elif 0
/* t1 = (y^a mod p) * (a^b mod p) mod p */
- base[0] = pkey->y; exp[0] = a;
- base[1] = a; exp[1] = b;
- base[2] = NULL; exp[2] = NULL;
- mpi_mulpowm( t1, base, exp, pkey->p );
+ base[0] = pkey->y; ex[0] = a;
+ base[1] = a; ex[1] = b;
+ base[2] = NULL; ex[2] = NULL;
+ mpi_mulpowm( t1, base, ex, pkey->p );
/* t2 = g ^ input mod p */
gcry_mpi_powm( t2, pkey->g, input, pkey->p );
@@ -480,11 +480,11 @@ verify(gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, ELG_public_key *pkey )
#else
/* t1 = g ^ - input * y ^ a * a ^ b mod p */
mpi_invm(t2, pkey->g, pkey->p );
- base[0] = t2 ; exp[0] = input;
- base[1] = pkey->y; exp[1] = a;
- base[2] = a; exp[2] = b;
- base[3] = NULL; exp[3] = NULL;
- mpi_mulpowm( t1, base, exp, pkey->p );
+ base[0] = t2 ; ex[0] = input;
+ base[1] = pkey->y; ex[1] = a;
+ base[2] = a; ex[2] = b;
+ base[3] = NULL; ex[3] = NULL;
+ mpi_mulpowm( t1, base, ex, pkey->p );
rc = !mpi_cmp_ui( t1, 1 );
#endif
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];
}
}
diff --git a/cipher/pubkey.c b/cipher/pubkey.c
index 657e4c19..8197419c 100644
--- a/cipher/pubkey.c
+++ b/cipher/pubkey.c
@@ -684,29 +684,30 @@ sexp_elements_extract (gcry_sexp_t key_sexp, const char *element_names,
gcry_mpi_t *elements)
{
gcry_err_code_t err = GPG_ERR_NO_ERROR;
- int i, index;
+ int i, idx;
const char *name;
gcry_sexp_t list;
- for (name = element_names, index = 0; *name && (! err); name++, index++)
+ for (name = element_names, idx = 0; *name && (! err); name++, idx++)
{
list = gcry_sexp_find_token (key_sexp, name, 1);
if (! list)
err = GPG_ERR_NO_OBJ;
else
{
- elements[index] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
+ elements[idx] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
gcry_sexp_release (list);
- if (! elements[index])
+ if (! elements[idx])
err = GPG_ERR_INV_OBJ;
}
}
if (err)
- for (i = 0; i < index; i++)
- if (elements[i])
- gcry_free (elements[i]);
-
+ {
+ for (i = 0; i < idx; i++)
+ if (elements[i])
+ gcry_free (elements[i]);
+ }
return err;
}
@@ -1398,8 +1399,7 @@ gcry_pk_encrypt (gcry_sexp_t *r_ciph, gcry_sexp_t s_data, gcry_sexp_t s_pkey)
*/
{
- int i;
- void **arg_list = malloc (sizeof (void *) * nelem);
+ void **arg_list = malloc (nelem * sizeof *arg_list);
if (arg_list)
{
for (i = 0; i < nelem; i++)
@@ -1621,8 +1621,7 @@ gcry_pk_sign (gcry_sexp_t *r_sig, gcry_sexp_t s_hash, gcry_sexp_t s_skey)
strcpy (p, "))");
{
- int i;
- void **arg_list = malloc (sizeof (void *) * nelem);
+ void **arg_list = malloc (nelem * sizeof *arg_list);
if (arg_list)
{
for (i = 0; i < nelem; i++)
@@ -1950,8 +1949,8 @@ gcry_pk_genkey (gcry_sexp_t *r_key, gcry_sexp_t s_parms)
mpis[nelem++] = NULL;
{
- int elem_n = strlen (pub_elems) + strlen (sec_elems), i;
- void **arg_list = malloc (sizeof (void *) * nelem_cp);
+ int elem_n = strlen (pub_elems) + strlen (sec_elems);
+ void **arg_list = malloc (nelem_cp * sizeof *arg_list);
if (arg_list)
{
for (i = 0; i < elem_n; i++)
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-12 19:17:53 +0000