Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crypto: ccp/des - switch to new verification routines
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
authored by
Ard Biesheuvel
and committed by
Herbert Xu
b5250416
43d81a8b
+3
-4
+3
-4
drivers/crypto/ccp/ccp-crypto-des3.c
+3
-4
drivers/crypto/ccp/ccp-crypto-des3.c
···
14
14
#include <linux/crypto.h>
15
15
#include <crypto/algapi.h>
16
16
#include <crypto/scatterwalk.h>
17
-
#include <crypto/des.h>
17
+
#include <crypto/internal/des.h>
18
18
19
19
#include "ccp-crypto.h"
20
20
···
39
39
struct ccp_ctx *ctx = crypto_tfm_ctx(crypto_ablkcipher_tfm(tfm));
40
40
struct ccp_crypto_ablkcipher_alg *alg =
41
41
ccp_crypto_ablkcipher_alg(crypto_ablkcipher_tfm(tfm));
42
-
u32 *flags = &tfm->base.crt_flags;
43
42
int err;
44
43
45
-
err = __des3_verify_key(flags, key);
46
-
if (unlikely(err))
44
+
err = verify_ablkcipher_des3_key(tfm, key);
45
+
if (err)
47
46
return err;
48
47
49
48
/* It's not clear that there is any support for a keysize of 112.