security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

* verify.c (gpgsm_verify): Fixed for changes API of gcry_md_info.

Browse Source 
* certchain.c (unknown_criticals): Fixed an error code test.
This commit is contained in:
Werner Koch 2003-11-18 17:29:51 +00:00
parent 2f3d309750
commit 2f2eb1d202
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sm/ChangeLog
View File

@ -1,3 +1,9 @@
2003-11-18 Werner Koch <wk@gnupg.org>
* 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 <wk@gnupg.org> 2003-11-12 Werner Koch <wk@gnupg.org>
Adjusted for API changes in Libksba. Adjusted for API changes in Libksba.

2
sm/certchain.c
View File

@ -61,7 +61,7 @@ unknown_criticals (KsbaCert cert)
rc = gpg_error (GPG_ERR_UNSUPPORTED_CERT); rc = gpg_error (GPG_ERR_UNSUPPORTED_CERT);
} }
} }
if (err && err != -1) if (err && gpg_err_code (err) != GPG_ERR_EOF)
rc = err; rc = err;
return rc; return rc;

7
sm/verify.c
View File

@ -286,11 +286,16 @@ gpgsm_verify (CTRL ctrl, int in_fd, int data_fd, FILE *out_fp)
&msgdigest, &msgdigestlen); &msgdigest, &msgdigestlen);
if (!err) if (!err)
{ {
size_t is_enabled;
algoid = ksba_cms_get_digest_algo (cms, signer); algoid = ksba_cms_get_digest_algo (cms, signer);
algo = gcry_md_map_name (algoid); algo = gcry_md_map_name (algoid);
if (DBG_X509) if (DBG_X509)
log_debug ("signer %d - digest algo: %d\n", signer, algo); 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); log_error ("digest algo %d has not been enabled\n", algo);
goto next_signer; goto next_signer;