From 2e0ce7d97f0de998cdf8e95e17ce169b7cae91cd Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 24 Jun 2009 14:03:09 +0000 Subject: Fixed a bunch of little bugs as reported by Fabian Keil. Still one problem left; marked with a gcc #warning. --- sm/ChangeLog | 7 +++++++ sm/call-dirmngr.c | 2 +- sm/certreqgen.c | 2 +- sm/sign.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) (limited to 'sm') diff --git a/sm/ChangeLog b/sm/ChangeLog index c59ef06ea..93a9af122 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,10 @@ +2009-06-24 Werner Koch + + * call-dirmngr.c (pattern_from_strlist): Remove dead assignment of N. + * sign.c (gpgsm_sign): Remove dead assignment. + * certreqgen.c (create_request): Assign GPG_ERR_BUG to RC. + Reported by Fabian Keil. + 2009-05-27 Werner Koch * encrypt.c (encrypt_dek): Make use of make_canon_sexp. diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c index 914fdd03e..33aebdf13 100644 --- a/sm/call-dirmngr.c +++ b/sm/call-dirmngr.c @@ -747,7 +747,7 @@ pattern_from_strlist (strlist_t names) if (!pattern) return NULL; - for (n=0, sl=names; sl; sl = sl->next) + for (sl=names; sl; sl = sl->next) { for (s=sl->d; *s; s++) { diff --git a/sm/certreqgen.c b/sm/certreqgen.c index ca791aab8..59e667981 100644 --- a/sm/certreqgen.c +++ b/sm/certreqgen.c @@ -769,7 +769,7 @@ create_request (ctrl_t ctrl, if (!n) { log_error ("libksba did not return a proper S-Exp\n"); - err = gpg_error (GPG_ERR_BUG); + rc = gpg_error (GPG_ERR_BUG); goto leave; } rc = gcry_sexp_sscan (&s_pkey, NULL, (const char*)public, n); diff --git a/sm/sign.c b/sm/sign.c index 446cd3792..0569052ed 100644 --- a/sm/sign.c +++ b/sm/sign.c @@ -403,7 +403,7 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist, log_info ("user requested hash algorithm %d\n", opt.forced_digest_algo); for (i=0, cl=signerlist; cl; cl = cl->next, i++) { - const char *oid = ksba_cert_get_digest_algo (cl->cert); + const char *oid; if (opt.forced_digest_algo) { -- cgit v1.2.3