From 82b39fe254703776209cebb88f428bf2d1eb596b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 14 Mar 2024 21:41:15 +0100 Subject: [PATCH] gpg: Make sure a DECRYPTION_OKAY is never issued for a bad OCB tag. * g10/mainproc.c (proc_encrypted): Force a decryption failure if any error has been seen. * g10/decrypt-data.c (aead_checktag): Issue an ERROR line. -- GnuPG-bug-id: 7042 Note that gpg in any case returns a failure exit code but due to double forking GPGME would not see it. --- g10/decrypt-data.c | 1 + g10/mainproc.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c index 0046c350e..d372cbb90 100644 --- a/g10/decrypt-data.c +++ b/g10/decrypt-data.c @@ -206,6 +206,7 @@ aead_checktag (decode_filter_ctx_t dfx, int final, const void *tagbuf) { log_error ("gcry_cipher_checktag%s failed: %s\n", final? " (final)":"", gpg_strerror (err)); + write_status_error ("aead_checktag", err); return err; } if (DBG_FILTER) diff --git a/g10/mainproc.c b/g10/mainproc.c index 456d1ffbe..0d98e0f67 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -821,9 +821,13 @@ proc_encrypted (CTX c, PACKET *pkt) compliance_de_vs |= 2; } - /* Trigger the deferred error. */ + /* Trigger the deferred error. The second condition makes sure that a + * log_error printed in the cry_cipher_checktag never gets ignored. */ if (!result && early_plaintext) result = gpg_error (GPG_ERR_BAD_DATA); + else if (!result && pkt->pkt.encrypted->aead_algo + && log_get_errorcount (0)) + result = gpg_error (GPG_ERR_BAD_SIGNATURE); if (result == -1) ;