diff options
| author | Werner Koch <[email protected]> | 2011-09-20 07:54:27 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-09-20 07:54:27 +0000 |
| commit | 7c000f18de5e7f94adc1364a2a56c99cfb23d8f8 (patch) | |
| tree | 2e4ed8a7c8f7baa04087b9e4c247306f3eea3342 /sm | |
| parent | Allow no protection in pinentry-mode=loopback. (diff) | |
| download | gnupg-7c000f18de5e7f94adc1364a2a56c99cfb23d8f8.tar.gz gnupg-7c000f18de5e7f94adc1364a2a56c99cfb23d8f8.zip | |
Replace gcry_md_start_debug by gcry_md_debug.
This is to allow building with Libgcrypt master (1.6) which has some
cleanups in the API/ABI.
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/ChangeLog | 8 | ||||
| -rw-r--r-- | sm/certcheck.c | 2 | ||||
| -rw-r--r-- | sm/certreqgen.c | 2 | ||||
| -rw-r--r-- | sm/sign.c | 4 | ||||
| -rw-r--r-- | sm/verify.c | 4 |
5 files changed, 14 insertions, 6 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index aee3efcf0..a77c7a88e 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,11 @@ +2011-09-20 Werner Koch <[email protected]> + + * verify.c (gpgsm_verify): s/gcry_md_start_debug/gcry_md_debug/ + in preparation for Libgcrypt 1.6. + * sign.c (gpgsm_sign): Ditto. + * certreqgen.c (create_request): Ditto. + * certcheck.c (gpgsm_check_cert_sig): Ditto. + 2011-08-10 Werner Koch <[email protected]> * keydb.c (keydb_add_resource): Remove unsued var CREATED_FNAME. diff --git a/sm/certcheck.c b/sm/certcheck.c index 18fadb1fe..f36873ddf 100644 --- a/sm/certcheck.c +++ b/sm/certcheck.c @@ -251,7 +251,7 @@ gpgsm_check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert) return rc; } if (DBG_HASHING) - gcry_md_start_debug (md, "hash.cert"); + gcry_md_debug (md, "hash.cert"); rc = ksba_cert_hash (cert, 1, HASH_FNC, md); if (rc) diff --git a/sm/certreqgen.c b/sm/certreqgen.c index a5c122bf6..41a6d7f05 100644 --- a/sm/certreqgen.c +++ b/sm/certreqgen.c @@ -720,7 +720,7 @@ create_request (ctrl_t ctrl, goto leave; } if (DBG_HASHING) - gcry_md_start_debug (md, "cr.cri"); + gcry_md_debug (md, "cr.cri"); ksba_certreq_set_hash_function (cr, HASH_FNC, md); ksba_certreq_set_writer (cr, writer); @@ -540,7 +540,7 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist, goto leave; } if (DBG_HASHING) - gcry_md_start_debug (data_md, "sign.data"); + gcry_md_debug (data_md, "sign.data"); for (i=0; (algoid=ksba_cms_get_digest_algo_list (cms, i)); i++) { @@ -674,7 +674,7 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist, goto leave; } if (DBG_HASHING) - gcry_md_start_debug (md, "sign.attr"); + gcry_md_debug (md, "sign.attr"); ksba_cms_set_hash_function (cms, HASH_FNC, md); for (cl=signerlist,signer=0; cl; cl = cl->next, signer++) { diff --git a/sm/verify.c b/sm/verify.c index add1b445b..c77eb5744 100644 --- a/sm/verify.c +++ b/sm/verify.c @@ -161,7 +161,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp) goto leave; } if (DBG_HASHING) - gcry_md_start_debug (data_md, "vrfy.data"); + gcry_md_debug (data_md, "vrfy.data"); audit_log (ctrl->audit, AUDIT_SETUP_READY); @@ -497,7 +497,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp) goto next_signer; } if (DBG_HASHING) - gcry_md_start_debug (md, "vrfy.attr"); + gcry_md_debug (md, "vrfy.attr"); ksba_cms_set_hash_function (cms, HASH_FNC, md); rc = ksba_cms_hash_signed_attrs (cms, signer); |