diff options
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/pkglue.c | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index b103050ce..91934e318 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2009-02-24 Werner Koch <wk@g10code.com> + + * pkglue.c (pk_verify): Return an error for improper DATA instead + of calling BUG(). + 2009-02-09 Werner Koch <wk@g10code.com> * keylist.c (print_capabilities): Take care of cert-only keys. diff --git a/g10/pkglue.c b/g10/pkglue.c index e4d749a23..90f8f248b 100644 --- a/g10/pkglue.c +++ b/g10/pkglue.c @@ -134,13 +134,14 @@ pk_verify (int algo, gcry_mpi_t hash, gcry_mpi_t * data, gcry_mpi_t * pkey) return GPG_ERR_PUBKEY_ALGO; if (rc) - BUG (); + BUG (); /* gcry_sexp_build should never fail. */ /* put hash into a S-Exp s_hash */ if (gcry_sexp_build (&s_hash, NULL, "%m", hash)) - BUG (); + BUG (); /* gcry_sexp_build should never fail. */ - /* put data into a S-Exp s_sig */ + /* Put data into a S-Exp s_sig. */ + s_sig = NULL; if (algo == GCRY_PK_DSA) { if (!data[0] || !data[1]) @@ -167,11 +168,9 @@ pk_verify (int algo, gcry_mpi_t hash, gcry_mpi_t * data, gcry_mpi_t * pkey) else BUG (); - if (rc) - BUG (); - + if (!rc) + rc = gcry_pk_verify (s_sig, s_hash, s_pkey); - rc = gcry_pk_verify (s_sig, s_hash, s_pkey); gcry_sexp_release (s_sig); gcry_sexp_release (s_hash); gcry_sexp_release (s_pkey); |