Merge tag 'io_uring-2019-03-06' of git://git.kernel.dk/linux-block

[linux.git] / crypto / des_generic.c

diff --git a/crypto/des_generic.c b/crypto/des_generic.c
index a71720544d118f0134b5301924fe9ab0c572eda7..1e6621665dd92737b01c14e3466de05456c28d6d 100644 (file)
--- a/crypto/des_generic.c
+++ b/crypto/des_generic.c
@@ -789,7 +789,7 @@ static int des_setkey(struct crypto_tfm *tfm, const u8 *key,
        /* Expand to tmp */
        ret = des_ekey(tmp, key);
 
-       if (unlikely(ret == 0) && (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {
+       if (unlikely(ret == 0) && (*flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
                *flags |= CRYPTO_TFM_RES_WEAK_KEY;
                return -EINVAL;
        }
@@ -866,7 +866,7 @@ int __des3_ede_setkey(u32 *expkey, u32 *flags, const u8 *key,
 
        if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||
                     !((K[2] ^ K[4]) | (K[3] ^ K[5]))) &&
-                    (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {
+                    (*flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
                *flags |= CRYPTO_TFM_RES_WEAK_KEY;
                return -EINVAL;
        }