diff options
-rw-r--r-- | arch/s390/crypto/des_s390.c | 6 | ||||
-rw-r--r-- | arch/x86/crypto/aesni-intel_glue.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c index bcca01c9989d..200f2a1b599d 100644 --- a/arch/s390/crypto/des_s390.c +++ b/arch/s390/crypto/des_s390.c | |||
@@ -237,9 +237,9 @@ static int des3_setkey(struct crypto_tfm *tfm, const u8 *key, | |||
237 | struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm); | 237 | struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm); |
238 | u32 *flags = &tfm->crt_flags; | 238 | u32 *flags = &tfm->crt_flags; |
239 | 239 | ||
240 | if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) && | 240 | if (!(crypto_memneq(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) && |
241 | memcmp(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2], | 241 | crypto_memneq(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2], |
242 | DES_KEY_SIZE)) && | 242 | DES_KEY_SIZE)) && |
243 | (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) { | 243 | (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) { |
244 | *flags |= CRYPTO_TFM_RES_WEAK_KEY; | 244 | *flags |= CRYPTO_TFM_RES_WEAK_KEY; |
245 | return -EINVAL; | 245 | return -EINVAL; |
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c index 835488b745ee..aba34b8e514c 100644 --- a/arch/x86/crypto/aesni-intel_glue.c +++ b/arch/x86/crypto/aesni-intel_glue.c | |||
@@ -1001,7 +1001,7 @@ static int __driver_rfc4106_decrypt(struct aead_request *req) | |||
1001 | authTag, auth_tag_len); | 1001 | authTag, auth_tag_len); |
1002 | 1002 | ||
1003 | /* Compare generated tag with passed in tag. */ | 1003 | /* Compare generated tag with passed in tag. */ |
1004 | retval = memcmp(src + tempCipherLen, authTag, auth_tag_len) ? | 1004 | retval = crypto_memneq(src + tempCipherLen, authTag, auth_tag_len) ? |
1005 | -EBADMSG : 0; | 1005 | -EBADMSG : 0; |
1006 | 1006 | ||
1007 | if (one_entry_in_sg) { | 1007 | if (one_entry_in_sg) { |