security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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.
This commit is contained in:
Werner Koch 2011-09-20 09:54:27 +02:00
parent 0dcf517700
commit 7c000f18de
10 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -1,3 +1,12 @@
2011-09-20 Werner Koch <wk@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@g10code.com>
* export.c (transfer_format_to_openpgp): Don't parse unneeded CSUM.

2
g10/cipher.c
View File

@ -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");
}
{

2
g10/decrypt-data.c
View File

@ -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,

8
g10/mainproc.c
View File

@ -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)

6
g10/sign.c
View File

@ -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));

8
sm/ChangeLog
View File

@ -1,3 +1,11 @@
2011-09-20 Werner Koch <wk@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@g10code.com>
* keydb.c (keydb_add_resource): Remove unsued var CREATED_FNAME.

2
sm/certcheck.c
View File

@ -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)

2
sm/certreqgen.c
View File

@ -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);

4
sm/sign.c
View File

@ -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++)
{

4
sm/verify.c
View File

@ -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);