Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crypto: Prepare to move crypto_tfm_ctx
The helper crypto_tfm_ctx is only used by the Crypto API algorithm
code and should really be in algapi.h. However, for historical
reasons many files relied on it to be in crypto.h. This patch
changes those files to use algapi.h instead in prepartion for a
move.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+30
-25
+1
-1
arch/arm/crypto/aes-cipher-glue.c
+1
-1
arch/arm/crypto/aes-cipher-glue.c
+1
-1
arch/arm64/crypto/aes-ce-glue.c
+1
-1
arch/arm64/crypto/aes-ce-glue.c
···
9
9
#include <asm/simd.h>
10
10
#include <asm/unaligned.h>
11
11
#include <crypto/aes.h>
12
+
#include <crypto/algapi.h>
12
13
#include <crypto/internal/simd.h>
13
14
#include <linux/cpufeature.h>
14
-
#include <linux/crypto.h>
15
15
#include <linux/module.h>
16
16
17
17
#include "aes-ce-setkey.h"
+1
-1
arch/arm64/crypto/aes-cipher-glue.c
+1
-1
arch/arm64/crypto/aes-cipher-glue.c
+1
-1
arch/arm64/crypto/sm4-ce-cipher-glue.c
+1
-1
arch/arm64/crypto/sm4-ce-cipher-glue.c
···
2
2
3
3
#include <asm/neon.h>
4
4
#include <asm/simd.h>
5
+
#include <crypto/algapi.h>
5
6
#include <crypto/sm4.h>
6
7
#include <crypto/internal/simd.h>
7
8
#include <linux/module.h>
8
9
#include <linux/cpufeature.h>
9
-
#include <linux/crypto.h>
10
10
#include <linux/types.h>
11
11
12
12
MODULE_ALIAS_CRYPTO("sm4");
+1
-1
arch/x86/crypto/twofish_glue.c
+1
-1
arch/x86/crypto/twofish_glue.c
+1
-1
crypto/aes_generic.c
+1
-1
crypto/aes_generic.c
···
48
48
*/
49
49
50
50
#include <crypto/aes.h>
51
+
#include <crypto/algapi.h>
51
52
#include <linux/module.h>
52
53
#include <linux/init.h>
53
54
#include <linux/types.h>
54
55
#include <linux/errno.h>
55
-
#include <linux/crypto.h>
56
56
#include <asm/byteorder.h>
57
57
#include <asm/unaligned.h>
58
58
+1
-1
crypto/aes_ti.c
+1
-1
crypto/aes_ti.c
+1
-1
crypto/anubis.c
+1
-1
crypto/anubis.c
+2
-1
crypto/blowfish_common.c
+2
-1
crypto/blowfish_common.c
···
14
14
* Copyright (c) Kyle McMartin <kyle@debian.org>
15
15
* Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
16
16
*/
17
+
18
+
#include <crypto/algapi.h>
17
19
#include <linux/init.h>
18
20
#include <linux/module.h>
19
21
#include <linux/mm.h>
20
22
#include <asm/byteorder.h>
21
-
#include <linux/crypto.h>
22
23
#include <linux/types.h>
23
24
#include <crypto/blowfish.h>
24
25
+2
-1
crypto/blowfish_generic.c
+2
-1
crypto/blowfish_generic.c
···
11
11
* Copyright (c) Kyle McMartin <kyle@debian.org>
12
12
* Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
13
13
*/
14
+
15
+
#include <crypto/algapi.h>
14
16
#include <linux/init.h>
15
17
#include <linux/module.h>
16
18
#include <linux/mm.h>
17
19
#include <asm/unaligned.h>
18
-
#include <linux/crypto.h>
19
20
#include <linux/types.h>
20
21
#include <crypto/blowfish.h>
21
22
+1
-1
crypto/camellia_generic.c
+1
-1
crypto/camellia_generic.c
+1
-1
crypto/cast5_generic.c
+1
-1
crypto/cast5_generic.c
+1
-1
crypto/cast6_generic.c
+1
-1
crypto/cast6_generic.c
+1
-1
crypto/des_generic.c
+1
-1
crypto/des_generic.c
+1
-1
crypto/fcrypt.c
+1
-1
crypto/fcrypt.c
+1
-1
crypto/khazad.c
+1
-1
crypto/khazad.c
+1
-1
crypto/seed.c
+1
-1
crypto/seed.c
···
8
8
* Copyright (C) 2007 Korea Information Security Agency (KISA).
9
9
*/
10
10
11
+
#include <crypto/algapi.h>
11
12
#include <linux/module.h>
12
13
#include <linux/init.h>
13
14
#include <linux/types.h>
14
15
#include <linux/errno.h>
15
-
#include <linux/crypto.h>
16
16
#include <asm/byteorder.h>
17
17
18
18
#define SEED_NUM_KCONSTANTS 16
+1
-1
crypto/serpent_generic.c
+1
-1
crypto/serpent_generic.c
···
7
7
* Copyright (C) 2002 Dag Arne Osvik <osvik@ii.uib.no>
8
8
*/
9
9
10
+
#include <crypto/algapi.h>
10
11
#include <linux/init.h>
11
12
#include <linux/module.h>
12
13
#include <linux/errno.h>
13
14
#include <asm/unaligned.h>
14
-
#include <linux/crypto.h>
15
15
#include <linux/types.h>
16
16
#include <crypto/serpent.h>
17
17
+1
-1
crypto/sm4_generic.c
+1
-1
crypto/sm4_generic.c
···
7
7
* All rights reserved.
8
8
*/
9
9
10
+
#include <crypto/algapi.h>
10
11
#include <crypto/sm4.h>
11
12
#include <linux/module.h>
12
13
#include <linux/init.h>
13
14
#include <linux/types.h>
14
15
#include <linux/errno.h>
15
-
#include <linux/crypto.h>
16
16
#include <asm/byteorder.h>
17
17
#include <asm/unaligned.h>
18
18
+1
-1
crypto/tea.c
+1
-1
crypto/tea.c
···
14
14
* Copyright (c) 2004 Aaron Grothe ajgrothe@yahoo.com
15
15
*/
16
16
17
+
#include <crypto/algapi.h>
17
18
#include <linux/init.h>
18
19
#include <linux/module.h>
19
20
#include <linux/mm.h>
20
21
#include <asm/byteorder.h>
21
-
#include <linux/crypto.h>
22
22
#include <linux/types.h>
23
23
24
24
#define TEA_KEY_SIZE 16
+1
-1
crypto/twofish_common.c
+1
-1
crypto/twofish_common.c
+1
-1
crypto/twofish_generic.c
+1
-1
crypto/twofish_generic.c
···
25
25
*/
26
26
27
27
#include <asm/unaligned.h>
28
+
#include <crypto/algapi.h>
28
29
#include <crypto/twofish.h>
29
30
#include <linux/module.h>
30
31
#include <linux/init.h>
31
32
#include <linux/types.h>
32
33
#include <linux/errno.h>
33
-
#include <linux/crypto.h>
34
34
#include <linux/bitops.h>
35
35
36
36
/* Macros to compute the g() function in the encryption and decryption
+1
-1
drivers/crypto/nx/nx-842.h
+1
-1
drivers/crypto/nx/nx-842.h
+1
-1
include/crypto/aria.h
+1
-1
include/crypto/aria.h
···
18
18
#ifndef _CRYPTO_ARIA_H
19
19
#define _CRYPTO_ARIA_H
20
20
21
+
#include <crypto/algapi.h>
21
22
#include <linux/module.h>
22
23
#include <linux/init.h>
23
24
#include <linux/types.h>
24
25
#include <linux/errno.h>
25
-
#include <linux/crypto.h>
26
26
#include <asm/byteorder.h>
27
27
28
28
#define ARIA_MIN_KEY_SIZE 16
+2
include/crypto/internal/acompress.h
+2
include/crypto/internal/acompress.h