diff options
| -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 | ||||
| -rw-r--r-- | mpi/ChangeLog | 4 | ||||
| -rw-r--r-- | mpi/mpi-pow.c | 3 | ||||
| -rw-r--r-- | src/dumpsexp.c | 2 | ||||
| -rw-r--r-- | src/global.c | 11 | ||||
| -rw-r--r-- | tests/ChangeLog | 4 | ||||
| -rw-r--r-- | tests/random.c | 2 |
10 files changed, 33 insertions, 12 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; diff --git a/mpi/ChangeLog b/mpi/ChangeLog index 227f4515..7d32f5a3 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,7 @@ +2011-03-28 Werner Koch <wk@g10code.com> + + * mpi-pow.c (gcry_mpi_powm): Remove unused var RSEC. + 2011-02-01 Werner Koch <wk@g10code.com> * mpi-cmp.c (gcry_mpi_cmp): Allow comparing of opaque MPIs. diff --git a/mpi/mpi-pow.c b/mpi/mpi-pow.c index fbdb7ce5..33bbebe3 100644 --- a/mpi/mpi-pow.c +++ b/mpi/mpi-pow.c @@ -45,7 +45,7 @@ gcry_mpi_powm (gcry_mpi_t res, mpi_size_t esize, msize, bsize, rsize; int msign, bsign, rsign; /* Flags telling the secure allocation status of the arguments. */ - int esec, msec, bsec, rsec; + int esec, msec, bsec; /* Size of the result including space for temporary values. */ mpi_size_t size; /* Helper. */ @@ -71,7 +71,6 @@ gcry_mpi_powm (gcry_mpi_t res, esec = mpi_is_secure(expo); msec = mpi_is_secure(mod); bsec = mpi_is_secure(base); - rsec = mpi_is_secure(res); rp = res->d; ep = expo->d; diff --git a/src/dumpsexp.c b/src/dumpsexp.c index 6ea05e83..f6384d7d 100644 --- a/src/dumpsexp.c +++ b/src/dumpsexp.c @@ -378,7 +378,7 @@ init_data (void) static void push_data (int c) { - + (void)c; } /* Flush and thus print the current data chunk. */ diff --git a/src/global.c b/src/global.c index 51d7f396..cbb7eb89 100644 --- a/src/global.c +++ b/src/global.c @@ -534,6 +534,10 @@ _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr) err = _gcry_fips_run_selftests (1); break; +#if _GCRY_GCC_VERSION >= 40600 +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wswitch" +#endif case 58: /* Init external random test. */ { void **rctx = va_arg (arg_ptr, void **); @@ -568,6 +572,13 @@ _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr) _gcry_random_deinit_external_test (ctx); } break; + case 61: /* RFU */ + break; + case 62: /* RFU */ + break; +#if _GCRY_GCC_VERSION >= 40600 +# pragma GCC diagnostic pop +#endif case GCRYCTL_DISABLE_HWF: { diff --git a/tests/ChangeLog b/tests/ChangeLog index 8ef49fcc..e25f134a 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2011-03-28 Werner Koch <wk@g10code.com> + + * random.c (readn): Remove used var P. + 2011-02-21 Werner Koch <wk@g10code.com> * version.c (main): Do a verbatim check of the version string. diff --git a/tests/random.c b/tests/random.c index 0575e8a0..a2435293 100644 --- a/tests/random.c +++ b/tests/random.c @@ -84,9 +84,7 @@ readn (int fd, void *buf, size_t buflen, size_t *ret_nread) { size_t nleft = buflen; int nread; - char *p; - p = buf; while ( nleft > 0 ) { nread = read ( fd, buf, nleft ); |