diff options
| author | Werner Koch <wk@gnupg.org> | 2011-03-28 14:46:36 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-03-28 14:46:36 +0200 |
| commit | dd76819014c4e9d75c4b9613e888f7536c676a46 (patch) | |
| tree | 065cea5055f317e3d2513868af1a01fc31edb5db /cipher | |
| parent | 9730275d294b4d9cbbb2453541f001c95f5f31a3 (diff) | |
| download | libgcrypt-dd76819014c4e9d75c4b9613e888f7536c676a46.tar.gz | |
Fixed a few warnings emitted by gcc 4.6.
Diffstat (limited to 'cipher')
| -rw-r--r-- | cipher/ChangeLog | 7 | ||||
| -rw-r--r-- | cipher/md.c | 1 | ||||
| -rw-r--r-- | cipher/primegen.c | 8 | ||||
| -rw-r--r-- | cipher/pubkey.c | 3 |
4 files changed, 12 insertions, 7 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 3fba314c..89616768 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,10 @@ +2011-03-28 Werner Koch <wk@g10code.com> + + * primegen.c (_gcry_generate_elg_prime): Make sure that PRIME is + NULL if the called func ever returns an error. + + * pubkey.c (gcry_pk_decrypt): Remove unused var PUBKEY. + 2011-03-09 Werner Koch <wk@g10code.com> * kdf.c: New. diff --git a/cipher/md.c b/cipher/md.c index 053eab13..c3b3a4f3 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -1232,6 +1232,7 @@ md_stop_debug( gcry_md_hd_t md ) volatile u64 b = 42; volatile u64 c; c = a * b; + (void)c; } #endif } diff --git a/cipher/primegen.c b/cipher/primegen.c index edeb7c87..2788e349 100644 --- a/cipher/primegen.c +++ b/cipher/primegen.c @@ -738,12 +738,12 @@ gcry_mpi_t _gcry_generate_elg_prime (int mode, unsigned pbits, unsigned qbits, gcry_mpi_t g, gcry_mpi_t **ret_factors) { - gcry_err_code_t err = GPG_ERR_NO_ERROR; gcry_mpi_t prime = NULL; - err = prime_generate_internal ((mode == 1), &prime, pbits, qbits, g, - ret_factors, GCRY_WEAK_RANDOM, 0, 0, - NULL, NULL); + if (prime_generate_internal ((mode == 1), &prime, pbits, qbits, g, + ret_factors, GCRY_WEAK_RANDOM, 0, 0, + NULL, NULL)) + prime = NULL; /* (Should be NULL in the error case anyway.) */ return prime; } diff --git a/cipher/pubkey.c b/cipher/pubkey.c index d4a93c74..02eeeccd 100644 --- a/cipher/pubkey.c +++ b/cipher/pubkey.c @@ -1755,7 +1755,6 @@ gcry_pk_decrypt (gcry_sexp_t *r_plain, gcry_sexp_t s_data, gcry_sexp_t s_skey) int modern, want_pkcs1, flags; gcry_err_code_t rc; gcry_module_t module_enc = NULL, module_key = NULL; - gcry_pk_spec_t *pubkey = NULL; *r_plain = NULL; @@ -1775,8 +1774,6 @@ gcry_pk_decrypt (gcry_sexp_t *r_plain, gcry_sexp_t s_data, gcry_sexp_t s_skey) goto leave; } - pubkey = (gcry_pk_spec_t *) module_key->spec; - rc = pubkey_decrypt (module_key->mod_id, &plain, data, skey, flags); if (rc) goto leave; |