From a9816d5fb13edb30c5d12cf85ae3e1a114fcc2c1 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 5 Aug 2019 10:09:41 +0900 Subject: [PATCH] sm: Support AES-256 key. * sm/decrypt.c (prepare_decryption): Handle a case for AES-256. -- Cherry-pick master commit of: ef2424144a070c9199e40424ec8d9b5a9919aa72 Signed-off-by: NIIBE Yutaka --- sm/decrypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sm/decrypt.c b/sm/decrypt.c index 60ed14a64..db0768eea 100644 --- a/sm/decrypt.c +++ b/sm/decrypt.c @@ -75,10 +75,10 @@ prepare_decryption (ctrl_t ctrl, const char *hexkeygrip, const char *desc, log_printhex ("pkcs1 encoded session key:", seskey, seskeylen); n=0; - if (seskeylen == 24 || seskeylen == 16) + if (seskeylen == 32 || seskeylen == 24 || seskeylen == 16) { - /* Smells like a 3-DES or AES-128 key. This might happen - * because a SC has already done the unpacking. A better + /* Smells like an AES-128, 3-DES, or AES-256 key. This might + * happen because a SC has already done the unpacking. A better * solution would be to test for this only after we triggered * the GPG_ERR_INV_SESSION_KEY. */ }