crypto: sun4i/des - switch to new verification routines
Cc: Corentin Labbe <clabbe.montjoie@gmail.com> Acked-by: Corentin Labbe <clabbe.montjoie@gmail.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
b5d0ba83a0
commit
08d4b408e8
|
@ -542,25 +542,11 @@ int sun4i_ss_des_setkey(struct crypto_skcipher *tfm, const u8 *key,
|
|||
unsigned int keylen)
|
||||
{
|
||||
struct sun4i_tfm_ctx *op = crypto_skcipher_ctx(tfm);
|
||||
struct sun4i_ss_ctx *ss = op->ss;
|
||||
u32 flags;
|
||||
u32 tmp[DES_EXPKEY_WORDS];
|
||||
int ret;
|
||||
int err;
|
||||
|
||||
if (unlikely(keylen != DES_KEY_SIZE)) {
|
||||
dev_err(ss->dev, "Invalid keylen %u\n", keylen);
|
||||
crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
flags = crypto_skcipher_get_flags(tfm);
|
||||
|
||||
ret = des_ekey(tmp, key);
|
||||
if (unlikely(!ret) && (flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
|
||||
crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_WEAK_KEY);
|
||||
dev_dbg(ss->dev, "Weak key %u\n", keylen);
|
||||
return -EINVAL;
|
||||
}
|
||||
err = verify_skcipher_des_key(tfm, key);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
op->keylen = keylen;
|
||||
memcpy(op->key, key, keylen);
|
||||
|
@ -578,8 +564,8 @@ int sun4i_ss_des3_setkey(struct crypto_skcipher *tfm, const u8 *key,
|
|||
struct sun4i_tfm_ctx *op = crypto_skcipher_ctx(tfm);
|
||||
int err;
|
||||
|
||||
err = des3_verify_key(tfm, key);
|
||||
if (unlikely(err))
|
||||
err = verify_skcipher_des3_key(tfm, key);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
op->keylen = keylen;
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include <crypto/internal/hash.h>
|
||||
#include <crypto/internal/skcipher.h>
|
||||
#include <crypto/aes.h>
|
||||
#include <crypto/des.h>
|
||||
#include <crypto/internal/des.h>
|
||||
#include <crypto/internal/rng.h>
|
||||
#include <crypto/rng.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue