From dfcaf2d961f236b3680c417802523375e14f204b Mon Sep 17 00:00:00 2001 From: Thorsten Blum Date: Mon, 21 Sep 2026 08:11:20 +0200 Subject: [PATCH] crypto: cast5 - use memcpy_and_pad() in cast5_setkey() Use memcpy_and_pad() instead of separate memcpy() and memset() calls to simplify cast5_setkey(). Signed-off-by: Thorsten Blum Signed-off-by: Herbert Xu --- crypto/cast5_generic.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/crypto/cast5_generic.c b/crypto/cast5_generic.c index f68330793e0c..1de0dc966a03 100644 --- a/crypto/cast5_generic.c +++ b/crypto/cast5_generic.c @@ -483,9 +483,7 @@ int cast5_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len) c->rr = key_len <= 10 ? 1 : 0; - memset(p_key, 0, 16); - memcpy(p_key, key, key_len); - + memcpy_and_pad(p_key, sizeof(p_key), key, key_len, 0); x[0] = be32_to_cpu(p_key[0]); x[1] = be32_to_cpu(p_key[1]);