diff options
| author | Werner Koch <[email protected]> | 2014-05-14 06:55:58 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-06-03 06:05:54 +0000 |
| commit | 3d4a36c8c98a15a4c5237fe2d10475a14b4c170a (patch) | |
| tree | d3b514b9d0e5096479d017156b9b0773f08d02d2 | |
| parent | gpg: Fix glitch entering a full expiration time. (diff) | |
| download | gnupg-3d4a36c8c98a15a4c5237fe2d10475a14b4c170a.tar.gz gnupg-3d4a36c8c98a15a4c5237fe2d10475a14b4c170a.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.
| -rw-r--r-- | g10/encr-data.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/g10/encr-data.c b/g10/encr-data.c index 105b10524..c5c3c194a 100644 --- a/g10/encr-data.c +++ b/g10/encr-data.c @@ -240,14 +240,10 @@ decrypt_data( 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); */ |