diff options
| author | Werner Koch <[email protected]> | 2014-06-23 11:24:43 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-06-23 11:24:43 +0000 |
| commit | 01bd0558dd2f8b80d2f3b61f91c11a68357c91fd (patch) | |
| tree | 9491b724206c7946dee345cbd40239c58b2b40b5 | |
| parent | w32: Fix typo in README.W32. (diff) | |
| download | gnupg-01bd0558dd2f8b80d2f3b61f91c11a68357c91fd.tar.gz gnupg-01bd0558dd2f8b80d2f3b61f91c11a68357c91fd.zip | |
Remove useless diagnostic in MDC verification.
* g10/encr-data.c (decrypt_data): Do not distinguish between a bad MDC
packet 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 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/g10/encr-data.c b/g10/encr-data.c index 8d277ce2e..c65aa11b5 100644 --- a/g10/encr-data.c +++ b/g10/encr-data.c @@ -208,12 +208,10 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek ) cipher_decrypt ( dfx->cipher_hd, dfx->defer, dfx->defer, 22); md_write ( dfx->mdc_hash, dfx->defer, 2); md_final ( dfx->mdc_hash ); - if (dfx->defer[0] != '\xd3' || dfx->defer[1] != '\x14' ) { - log_error("mdc_packet with invalid encoding\n"); - rc = G10ERR_INVALID_PACKET; - } - else if ( datalen != 20 - || memcmp(md_read( dfx->mdc_hash, 0 ), dfx->defer+2, datalen) ) + if ( dfx->defer[0] != '\xd3' + || dfx->defer[1] != '\x14' + || datalen != 20 + || memcmp (md_read (dfx->mdc_hash, 0 ), dfx->defer+2, datalen)) rc = G10ERR_BAD_SIGN; /*log_hexdump("MDC calculated:",md_read( dfx->mdc_hash, 0), datalen);*/ /*log_hexdump("MDC message :", dfx->defer, 20);*/ |