From 2f2eb1d202d6486476b0a2be4a639627ae3c20a3 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 18 Nov 2003 17:29:51 +0000 Subject: [PATCH] * verify.c (gpgsm_verify): Fixed for changes API of gcry_md_info. * certchain.c (unknown_criticals): Fixed an error code test. --- sm/ChangeLog | 6 ++++++ sm/certchain.c | 2 +- sm/verify.c | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sm/ChangeLog b/sm/ChangeLog index 24f71fba6..4b6e579b6 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,9 @@ +2003-11-18 Werner Koch + + * verify.c (gpgsm_verify): Fixed for changes API of gcry_md_info. + + * certchain.c (unknown_criticals): Fixed an error code test. + 2003-11-12 Werner Koch Adjusted for API changes in Libksba. diff --git a/sm/certchain.c b/sm/certchain.c index a25e08219..50e910240 100644 --- a/sm/certchain.c +++ b/sm/certchain.c @@ -61,7 +61,7 @@ unknown_criticals (KsbaCert cert) rc = gpg_error (GPG_ERR_UNSUPPORTED_CERT); } } - if (err && err != -1) + if (err && gpg_err_code (err) != GPG_ERR_EOF) rc = err; return rc; diff --git a/sm/verify.c b/sm/verify.c index 201fc7b55..e6e08c06c 100644 --- a/sm/verify.c +++ b/sm/verify.c @@ -286,11 +286,16 @@ gpgsm_verify (CTRL ctrl, int in_fd, int data_fd, FILE *out_fp) &msgdigest, &msgdigestlen); if (!err) { + size_t is_enabled; + algoid = ksba_cms_get_digest_algo (cms, signer); algo = gcry_md_map_name (algoid); if (DBG_X509) log_debug ("signer %d - digest algo: %d\n", signer, algo); - if ( !gcry_md_info (data_md, GCRYCTL_IS_ALGO_ENABLED, &algo, NULL) ) + is_enabled = sizeof algo; + if ( gcry_md_info (data_md, GCRYCTL_IS_ALGO_ENABLED, + &algo, &is_enabled) + || !is_enabled) { log_error ("digest algo %d has not been enabled\n", algo); goto next_signer;