diff options
| author | Werner Koch <[email protected]> | 2014-05-14 06:55:58 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-05-14 06:56:39 +0000 |
| commit | 455a4a2212302c05095e736b127f647e95714fe7 (patch) | |
| tree | 92f6d721eada11bdfa69938e24a4931e39288f28 /g10/decrypt-data.c | |
| parent | gpg: Fix glitch entering a full expiration time. (diff) | |
| download | gnupg-455a4a2212302c05095e736b127f647e95714fe7.tar.gz gnupg-455a4a2212302c05095e736b127f647e95714fe7.zip | |
gpg: Remove useless diagnostic in MDC verification.
* g10/decrypt-data.c (decrypt_data): Do not distinguish between a bad
MDC packer header and a bad MDC.
--
The separate diagnostic was introduced for debugging a problems. For
explaining an MDC error a single error message is easier to
understand.
Diffstat (limited to 'g10/decrypt-data.c')
| -rw-r--r-- | g10/decrypt-data.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c index 22a6aefbd..9c6ae73bf 100644 --- a/g10/decrypt-data.c +++ b/g10/decrypt-data.c @@ -243,14 +243,10 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek) gcry_md_write (dfx->mdc_hash, dfx->defer, 2); gcry_md_final (dfx->mdc_hash); - if (dfx->defer[0] != '\xd3' || dfx->defer[1] != '\x14' ) - { - log_error("mdc_packet with invalid encoding\n"); - rc = gpg_error (GPG_ERR_INV_PACKET); - } - else if (datalen != 20 - || memcmp (gcry_md_read (dfx->mdc_hash, 0), - dfx->defer+2,datalen )) + if ( dfx->defer[0] != '\xd3' + || dfx->defer[1] != '\x14' + || datalen != 20 + || memcmp (gcry_md_read (dfx->mdc_hash, 0), dfx->defer+2, datalen)) rc = gpg_error (GPG_ERR_BAD_SIGNATURE); /* log_printhex("MDC message:", dfx->defer, 22); */ /* log_printhex("MDC calc:", gcry_md_read (dfx->mdc_hash,0), datalen); */ |