[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-96-g7c000f1
by Werner Koch
cvs at cvs.gnupg.org
Tue Sep 20 10:39:51 CEST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 7c000f18de5e7f94adc1364a2a56c99cfb23d8f8 (commit)
from 0dcf517700387e75ce46c28993f882031e34c816 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7c000f18de5e7f94adc1364a2a56c99cfb23d8f8
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 20 09:54:27 2011 +0200
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.
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 8ab0db5..be2ad0b 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-20 Werner Koch <wk at g10code.com>
+
+ * sign.c (sign_file, clearsign_file, sign_symencrypt_file):
+ s/gcry_md_start_debug/gcry_md_debug/ in preparation for Libgcrypt
+ 1.6.
+ * mainproc.c (proc_plaintext, proc_tree): Ditto.
+ * decrypt-data.c (decrypt_data): Ditto.
+ * cipher.c (write_header): Ditto.
+
2011-08-10 Werner Koch <wk at g10code.com>
* export.c (transfer_format_to_openpgp): Don't parse unneeded CSUM.
diff --git a/g10/cipher.c b/g10/cipher.c
index 07df792..10f0ebb 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -61,7 +61,7 @@ write_header( cipher_filter_context_t *cfx, IOBUF a )
ed.mdc_method = DIGEST_ALGO_SHA1;
gcry_md_open (&cfx->mdc_hash, DIGEST_ALGO_SHA1, 0);
if ( DBG_HASHING )
- gcry_md_start_debug (cfx->mdc_hash, "creatmdc");
+ gcry_md_debug (cfx->mdc_hash, "creatmdc");
}
{
diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c
index e95dc10..e219898 100644
--- a/g10/decrypt-data.c
+++ b/g10/decrypt-data.c
@@ -121,7 +121,7 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
if (gcry_md_open (&dfx->mdc_hash, ed->mdc_method, 0 ))
BUG ();
if ( DBG_HASHING )
- gcry_md_start_debug (dfx->mdc_hash, "checkmdc");
+ gcry_md_debug (dfx->mdc_hash, "checkmdc");
}
rc = openpgp_cipher_open (&dfx->cipher_hd, dek->algo,
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 2ad9416..ca8b446 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -709,9 +709,9 @@ proc_plaintext( CTX c, PACKET *pkt )
BUG ();
}
if ( DBG_HASHING ) {
- gcry_md_start_debug ( c->mfx.md, "verify" );
+ gcry_md_debug ( c->mfx.md, "verify" );
if ( c->mfx.md2 )
- gcry_md_start_debug ( c->mfx.md2, "verify2" );
+ gcry_md_debug ( c->mfx.md2, "verify2" );
}
rc=0;
@@ -2164,9 +2164,9 @@ proc_tree( CTX c, KBNODE node )
/* c->mfx.md2? 0 :(sig->sig_class == 0x01) */
#endif
if ( DBG_HASHING ) {
- gcry_md_start_debug( c->mfx.md, "verify" );
+ gcry_md_debug( c->mfx.md, "verify" );
if ( c->mfx.md2 )
- gcry_md_start_debug( c->mfx.md2, "verify2" );
+ gcry_md_debug( c->mfx.md2, "verify2" );
}
if( c->sigs_only ) {
if (c->signed_data.used && c->signed_data.data_fd != -1)
diff --git a/g10/sign.c b/g10/sign.c
index a768ac9..4cc813c 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -877,7 +877,7 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
if ( gcry_md_open (&mfx.md, 0, 0) )
BUG ();
if (DBG_HASHING)
- gcry_md_start_debug (mfx.md, "sign");
+ gcry_md_debug (mfx.md, "sign");
/* If we're encrypting and signing, it is reasonable to pick the
hash algorithm to use out of the recipient key prefs. This is
@@ -1231,7 +1231,7 @@ clearsign_file( const char *fname, strlist_t locusr, const char *outfile )
gcry_md_enable (textmd, hash_for(sk_rover->pk));
if ( DBG_HASHING )
- gcry_md_start_debug ( textmd, "clearsign" );
+ gcry_md_debug ( textmd, "clearsign" );
copy_clearsig_text( out, inp, textmd, !opt.not_dash_escaped,
opt.escape_from, (old_style && only_md5) );
@@ -1356,7 +1356,7 @@ sign_symencrypt_file (const char *fname, strlist_t locusr)
if ( gcry_md_open (&mfx.md, 0, 0) )
BUG ();
if ( DBG_HASHING )
- gcry_md_start_debug (mfx.md, "symc-sign");
+ gcry_md_debug (mfx.md, "symc-sign");
for (sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next)
gcry_md_enable (mfx.md, hash_for (sk_rover->pk));
diff --git a/sm/ChangeLog b/sm/ChangeLog
index aee3efc..a77c7a8 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-20 Werner Koch <wk at g10code.com>
+
+ * 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 <wk at g10code.com>
* keydb.c (keydb_add_resource): Remove unsued var CREATED_FNAME.
diff --git a/sm/certcheck.c b/sm/certcheck.c
index 18fadb1..f36873d 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 a5c122b..41a6d7f 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);
diff --git a/sm/sign.c b/sm/sign.c
index a3005ca..cd80a12 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -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 add1b44..c77eb57 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);
-----------------------------------------------------------------------
Summary of changes:
g10/ChangeLog | 9 +++++++++
g10/cipher.c | 2 +-
g10/decrypt-data.c | 2 +-
g10/mainproc.c | 8 ++++----
g10/sign.c | 6 +++---
sm/ChangeLog | 8 ++++++++
sm/certcheck.c | 2 +-
sm/certreqgen.c | 2 +-
sm/sign.c | 4 ++--
sm/verify.c | 4 ++--
10 files changed, 32 insertions(+), 15 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list