From 6864bba78e76a1ff72aec140ae9f4e752454c463 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 7 Jul 2020 12:58:29 +0200 Subject: gpg: Fix flaw in symmetric algorithm selection in mixed mode. * g10/encrypt.c (setup_symkey): Use default_cipher_algo function instead of the fallback s2k_cipher_algo. Fix error code. (encrypt_simple): Use setup_symkey. -- Aside of removing code duplication this patch fixes the flaw that the S2K cipher algorithm was used when mixing public key and symmetric encryption or signatures with symmetric encrypion. The default_algorithm function should be used here so that the command line option --cipher-algo and --personal-cipher-preferences have an effect. Signed-off-by: Werner Koch --- g10/passphrase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/passphrase.c') diff --git a/g10/passphrase.c b/g10/passphrase.c index 54a183e54..7c2e34cc9 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -268,7 +268,7 @@ passphrase_to_dek (int cipher_algo, STRING2KEY *s2k, *canceled = 0; if (opt.no_symkey_cache) - nocache = 1; /* Force no symmtric key caching. */ + nocache = 1; /* Force no symmetric key caching. */ if ( !s2k ) { -- cgit v1.2.3