diff options
| author | Werner Koch <wk@gnupg.org> | 2021-01-27 11:45:33 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2021-01-27 11:49:20 +0100 |
| commit | b08418d22cc898c9d135217e07ca77f3daf3c9e9 (patch) | |
| tree | d117bfe18145762fd273a4dce3a0ffb6eb05589d | |
| parent | fb84674d6c645a423b8ed9835437d25e4893e183 (diff) | |
| download | gnupg-b08418d22cc898c9d135217e07ca77f3daf3c9e9.tar.gz | |
gpg: Fix ugly error message for an unknown symkey algorithm.
* g10/mainproc.c (proc_symkey_enc): Do not continue with an unknown
algorithm.
--
Trying to encrypt data created with
printf "\x8c\x49\x05\x0e\x0a\x03\x01"
fails in version 2.2.19 with
gpg: packet(3) with unknown version 5
but with later versions with
gpg: encrypted with unknown algorithm 14
gpg: Ohhhh jeeee: ... this is a bug \
([...]/passphrase.c:433:passphrase_to_dek)
so we better catch this case earlier.
Reported-by: Tavis Ormandy
Signed-off-by: Werner Koch <wk@gnupg.org>
| -rw-r--r-- | g10/mainproc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index e675e853a..08986a070 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -381,7 +381,10 @@ proc_symkey_enc (CTX c, PACKET *pkt) } } else - log_error (_("encrypted with unknown algorithm %d.%s\n"), algo, a); + { + log_error (_("encrypted with unknown algorithm %d.%s\n"), algo, a); + s = NULL; /* Force a goto leave. */ + } if (openpgp_md_test_algo (enc->s2k.hash_algo)) { |