From 5be7c83e5d68931fa8d3db2f731b4a6401c873c8 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Fri, 14 Aug 2026 14:04:54 +0200 Subject: [PATCH] Preserve host-installed AES key during keygen Signed-off-by: Pol Henarejos --- src/openpgp/cmd_keypair_gen.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/openpgp/cmd_keypair_gen.c b/src/openpgp/cmd_keypair_gen.c index 691286e..d0457be 100644 --- a/src/openpgp/cmd_keypair_gen.c +++ b/src/openpgp/cmd_keypair_gen.c @@ -109,9 +109,7 @@ int cmd_keypair_gen(void) { if (fid == EF_PK_SIG) { reset_sig_count(); } - else if (fid == EF_PK_DEC) { - // OpenPGP does not allow generating AES keys. So, we generate a new one when gen for DEC is called. - // It is a 256 AES key by default. + else if (fid == EF_PK_DEC && !file_has_data(file_search_by_fid(EF_AES_KEY, NULL, SPECIFY_EF))) { uint8_t aes_key[32]; //maximum AES key size uint8_t key_size = 32; memcpy(aes_key, random_bytes_get(key_size), key_size);