[openwrt/openwrt] ltq-deu: fix ifxdeu-ctr-rfc3686(aes) not matching generic impl

LEDE Commits lede-commits at lists.infradead.org
Wed Jan 5 17:10:26 PST 2022


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/9cb1875d2fcf20c208a63693d7395eb4963f59cb

commit 9cb1875d2fcf20c208a63693d7395eb4963f59cb
Author: Daniel Kestrel <kestrel1974 at t-online.de>
AuthorDate: Sat Jun 5 23:49:59 2021 +0200

    ltq-deu: fix ifxdeu-ctr-rfc3686(aes) not matching generic impl
    
    Error ifxdeu-ctr-rfc3686(aes) (16) doesn't match generic impl (20) occurs
    when running the cryptomgr extra tests that compare against the linux
    kernels generic implementation.
    
    Signed-off-by: Daniel Kestrel <kestrel1974 at t-online.de>
---
 package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c
index b4417f2ef3..a55766a4ac 100644
--- a/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c
+++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c
@@ -86,6 +86,7 @@ spinlock_t aes_lock;
 #define AES_BLOCK_SIZE      16
 #define CTR_RFC3686_NONCE_SIZE    4
 #define CTR_RFC3686_IV_SIZE       8
+#define CTR_RFC3686_MIN_KEY_SIZE  (AES_MIN_KEY_SIZE + CTR_RFC3686_NONCE_SIZE)
 #define CTR_RFC3686_MAX_KEY_SIZE  (AES_MAX_KEY_SIZE + CTR_RFC3686_NONCE_SIZE)
 
 #ifdef CRYPTO_DEBUG
@@ -1011,7 +1012,7 @@ struct skcipher_alg ifxdeu_ctr_rfc3686_aes_alg = {
     .base.cra_ctxsize        =   sizeof(struct aes_ctx),
     .base.cra_module         =   THIS_MODULE,
     .base.cra_list           =   LIST_HEAD_INIT(ifxdeu_ctr_rfc3686_aes_alg.base.cra_list),
-    .min_keysize             =   AES_MIN_KEY_SIZE,
+    .min_keysize             =   CTR_RFC3686_MIN_KEY_SIZE,
     .max_keysize             =   CTR_RFC3686_MAX_KEY_SIZE,
     .ivsize                  =   CTR_RFC3686_IV_SIZE,
     .walksize                =   AES_BLOCK_SIZE,



More information about the lede-commits mailing list