path: root/arch/s390/crypto/aes_s390.c
diff options
authorStephan Mueller <>2016-02-09 15:37:47 +0100
committerHerbert Xu <>2016-02-17 04:07:51 +0800
commit28856a9e52c7cac712af6c143de04766617535dc (patch)
tree4ee6c79e76f8eadc0148bfeb09fd146c9d53fabf /arch/s390/crypto/aes_s390.c
parent730d02e27670fa5b6a55778d11023c5897d87d57 (diff)
crypto: xts - consolidate sanity check for keys
The patch centralizes the XTS key check logic into the service function xts_check_key which is invoked from the different XTS implementations. With this, the XTS implementations in ARM, ARM64, PPC and S390 have now a sanity check for the XTS keys similar to the other arches. In addition, this service function received a check to ensure that the key != the tweak key which is mandated by FIPS 140-2 IG A.9. As the check is not present in the standards defining XTS, it is only enforced in FIPS mode of the kernel. Signed-off-by: Stephan Mueller <> Signed-off-by: Herbert Xu <>
Diffstat (limited to 'arch/s390/crypto/aes_s390.c')
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index 0b9b95f3c703..3f1a1a4e81fe 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -587,6 +587,11 @@ static int xts_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
struct s390_xts_ctx *xts_ctx = crypto_tfm_ctx(tfm);
u32 *flags = &tfm->crt_flags;
+ int err;
+ err = xts_check_key(tfm, in_key, key_len);
+ if (err)
+ return err;
switch (key_len) {
case 32: