Skip to content

Commit a24d22b

Browse files
ebiggersherbertx
ebiggers
authored and
herbertx
committed
crypto: sha - split sha.h into sha1.h and sha2.h
Currently <crypto/sha.h> contains declarations for both SHA-1 and SHA-2, and <crypto/sha3.h> contains declarations for SHA-3. This organization is inconsistent, but more importantly SHA-1 is no longer considered to be cryptographically secure. So to the extent possible, SHA-1 shouldn't be grouped together with any of the other SHA versions, and usage of it should be phased out. Therefore, split <crypto/sha.h> into two headers <crypto/sha1.h> and <crypto/sha2.h>, and make everyone explicitly specify whether they want the declarations for SHA-1, SHA-2, or both. This avoids making the SHA-1 declarations visible to files that don't want anything to do with SHA-1. It also prepares for potentially moving sha1.h into a new insecure/ or dangerous/ directory. Signed-off-by: Eric Biggers <ebiggers@google.com> Acked-by: Ard Biesheuvel <ardb@kernel.org> Acked-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent 5bdad82 commit a24d22b

File tree

120 files changed

+205
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+205
-155
lines changed

‎arch/arm/crypto/sha1-ce-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <crypto/internal/hash.h>
99
#include <crypto/internal/simd.h>
10-
#include <crypto/sha.h>
10+
#include <crypto/sha1.h>
1111
#include <crypto/sha1_base.h>
1212
#include <linux/cpufeature.h>
1313
#include <linux/crypto.h>

‎arch/arm/crypto/sha1.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#define ASM_ARM_CRYPTO_SHA1_H
44

55
#include <linux/crypto.h>
6-
#include <crypto/sha.h>
6+
#include <crypto/sha1.h>
77

88
extern int sha1_update_arm(struct shash_desc *desc, const u8 *data,
99
unsigned int len);

‎arch/arm/crypto/sha1_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/init.h>
1616
#include <linux/module.h>
1717
#include <linux/types.h>
18-
#include <crypto/sha.h>
18+
#include <crypto/sha1.h>
1919
#include <crypto/sha1_base.h>
2020
#include <asm/byteorder.h>
2121

‎arch/arm/crypto/sha1_neon_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <linux/module.h>
2020
#include <linux/mm.h>
2121
#include <linux/types.h>
22-
#include <crypto/sha.h>
22+
#include <crypto/sha1.h>
2323
#include <crypto/sha1_base.h>
2424
#include <asm/neon.h>
2525
#include <asm/simd.h>

‎arch/arm/crypto/sha2-ce-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <crypto/internal/hash.h>
99
#include <crypto/internal/simd.h>
10-
#include <crypto/sha.h>
10+
#include <crypto/sha2.h>
1111
#include <crypto/sha256_base.h>
1212
#include <linux/cpufeature.h>
1313
#include <linux/crypto.h>

‎arch/arm/crypto/sha256_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <linux/mm.h>
1818
#include <linux/types.h>
1919
#include <linux/string.h>
20-
#include <crypto/sha.h>
20+
#include <crypto/sha2.h>
2121
#include <crypto/sha256_base.h>
2222
#include <asm/simd.h>
2323
#include <asm/neon.h>

‎arch/arm/crypto/sha256_neon_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <crypto/internal/simd.h>
1414
#include <linux/types.h>
1515
#include <linux/string.h>
16-
#include <crypto/sha.h>
16+
#include <crypto/sha2.h>
1717
#include <crypto/sha256_base.h>
1818
#include <asm/byteorder.h>
1919
#include <asm/simd.h>

‎arch/arm/crypto/sha512-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include <crypto/internal/hash.h>
9-
#include <crypto/sha.h>
9+
#include <crypto/sha2.h>
1010
#include <crypto/sha512_base.h>
1111
#include <linux/crypto.h>
1212
#include <linux/module.h>

‎arch/arm/crypto/sha512-neon-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <crypto/internal/hash.h>
99
#include <crypto/internal/simd.h>
10-
#include <crypto/sha.h>
10+
#include <crypto/sha2.h>
1111
#include <crypto/sha512_base.h>
1212
#include <linux/crypto.h>
1313
#include <linux/module.h>

‎arch/arm64/crypto/aes-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <asm/simd.h>
1111
#include <crypto/aes.h>
1212
#include <crypto/ctr.h>
13-
#include <crypto/sha.h>
13+
#include <crypto/sha2.h>
1414
#include <crypto/internal/hash.h>
1515
#include <crypto/internal/simd.h>
1616
#include <crypto/internal/skcipher.h>

‎arch/arm64/crypto/sha1-ce-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <asm/unaligned.h>
1111
#include <crypto/internal/hash.h>
1212
#include <crypto/internal/simd.h>
13-
#include <crypto/sha.h>
13+
#include <crypto/sha1.h>
1414
#include <crypto/sha1_base.h>
1515
#include <linux/cpufeature.h>
1616
#include <linux/crypto.h>

‎arch/arm64/crypto/sha2-ce-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <asm/unaligned.h>
1111
#include <crypto/internal/hash.h>
1212
#include <crypto/internal/simd.h>
13-
#include <crypto/sha.h>
13+
#include <crypto/sha2.h>
1414
#include <crypto/sha256_base.h>
1515
#include <linux/cpufeature.h>
1616
#include <linux/crypto.h>

‎arch/arm64/crypto/sha256-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <asm/simd.h>
1111
#include <crypto/internal/hash.h>
1212
#include <crypto/internal/simd.h>
13-
#include <crypto/sha.h>
13+
#include <crypto/sha2.h>
1414
#include <crypto/sha256_base.h>
1515
#include <linux/types.h>
1616
#include <linux/string.h>

‎arch/arm64/crypto/sha512-ce-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <asm/unaligned.h>
1515
#include <crypto/internal/hash.h>
1616
#include <crypto/internal/simd.h>
17-
#include <crypto/sha.h>
17+
#include <crypto/sha2.h>
1818
#include <crypto/sha512_base.h>
1919
#include <linux/cpufeature.h>
2020
#include <linux/crypto.h>

‎arch/arm64/crypto/sha512-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <crypto/internal/hash.h>
99
#include <linux/types.h>
1010
#include <linux/string.h>
11-
#include <crypto/sha.h>
11+
#include <crypto/sha2.h>
1212
#include <crypto/sha512_base.h>
1313
#include <asm/neon.h>
1414

‎arch/mips/cavium-octeon/crypto/octeon-sha1.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
#include <linux/mm.h>
17-
#include <crypto/sha.h>
17+
#include <crypto/sha1.h>
1818
#include <linux/init.h>
1919
#include <linux/types.h>
2020
#include <linux/module.h>

‎arch/mips/cavium-octeon/crypto/octeon-sha256.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#include <linux/mm.h>
18-
#include <crypto/sha.h>
18+
#include <crypto/sha2.h>
1919
#include <linux/init.h>
2020
#include <linux/types.h>
2121
#include <linux/module.h>

‎arch/mips/cavium-octeon/crypto/octeon-sha512.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
#include <linux/mm.h>
17-
#include <crypto/sha.h>
17+
#include <crypto/sha2.h>
1818
#include <linux/init.h>
1919
#include <linux/types.h>
2020
#include <linux/module.h>

‎arch/powerpc/crypto/sha1-spe-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/module.h>
1313
#include <linux/mm.h>
1414
#include <linux/types.h>
15-
#include <crypto/sha.h>
15+
#include <crypto/sha1.h>
1616
#include <asm/byteorder.h>
1717
#include <asm/switch_to.h>
1818
#include <linux/hardirq.h>

‎arch/powerpc/crypto/sha1.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <linux/module.h>
1818
#include <linux/mm.h>
1919
#include <linux/types.h>
20-
#include <crypto/sha.h>
20+
#include <crypto/sha1.h>
2121
#include <asm/byteorder.h>
2222

2323
void powerpc_sha_transform(u32 *state, const u8 *src);

‎arch/powerpc/crypto/sha256-spe-glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <linux/module.h>
1414
#include <linux/mm.h>
1515
#include <linux/types.h>
16-
#include <crypto/sha.h>
16+
#include <crypto/sha2.h>
1717
#include <asm/byteorder.h>
1818
#include <asm/switch_to.h>
1919
#include <linux/hardirq.h>

‎arch/s390/crypto/sha.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
#define _CRYPTO_ARCH_S390_SHA_H
1212

1313
#include <linux/crypto.h>
14-
#include <crypto/sha.h>
14+
#include <crypto/sha1.h>
15+
#include <crypto/sha2.h>
1516
#include <crypto/sha3.h>
1617

1718
/* must be big enough for the largest SHA variant */

‎arch/s390/crypto/sha1_s390.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <linux/init.h>
2323
#include <linux/module.h>
2424
#include <linux/cpufeature.h>
25-
#include <crypto/sha.h>
25+
#include <crypto/sha1.h>
2626
#include <asm/cpacf.h>
2727

2828
#include "sha.h"

‎arch/s390/crypto/sha256_s390.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/init.h>
1313
#include <linux/module.h>
1414
#include <linux/cpufeature.h>
15-
#include <crypto/sha.h>
15+
#include <crypto/sha2.h>
1616
#include <asm/cpacf.h>
1717

1818
#include "sha.h"

‎arch/s390/crypto/sha3_256_s390.c

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <linux/init.h>
1313
#include <linux/module.h>
1414
#include <linux/cpufeature.h>
15-
#include <crypto/sha.h>
1615
#include <crypto/sha3.h>
1716
#include <asm/cpacf.h>
1817

‎arch/s390/crypto/sha3_512_s390.c

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <linux/init.h>
1212
#include <linux/module.h>
1313
#include <linux/cpufeature.h>
14-
#include <crypto/sha.h>
1514
#include <crypto/sha3.h>
1615
#include <asm/cpacf.h>
1716

‎arch/s390/crypto/sha512_s390.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Author(s): Jan Glauber (jang@de.ibm.com)
99
*/
1010
#include <crypto/internal/hash.h>
11-
#include <crypto/sha.h>
11+
#include <crypto/sha2.h>
1212
#include <linux/errno.h>
1313
#include <linux/init.h>
1414
#include <linux/kernel.h>

‎arch/s390/purgatory/purgatory.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <linux/kexec.h>
1111
#include <linux/string.h>
12-
#include <crypto/sha.h>
12+
#include <crypto/sha2.h>
1313
#include <asm/purgatory.h>
1414

1515
int verify_sha256_digest(void)

‎arch/sparc/crypto/sha1_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/module.h>
1717
#include <linux/mm.h>
1818
#include <linux/types.h>
19-
#include <crypto/sha.h>
19+
#include <crypto/sha1.h>
2020

2121
#include <asm/pstate.h>
2222
#include <asm/elf.h>

‎arch/sparc/crypto/sha256_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/module.h>
1717
#include <linux/mm.h>
1818
#include <linux/types.h>
19-
#include <crypto/sha.h>
19+
#include <crypto/sha2.h>
2020

2121
#include <asm/pstate.h>
2222
#include <asm/elf.h>

‎arch/sparc/crypto/sha512_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/module.h>
1616
#include <linux/mm.h>
1717
#include <linux/types.h>
18-
#include <crypto/sha.h>
18+
#include <crypto/sha2.h>
1919

2020
#include <asm/pstate.h>
2121
#include <asm/elf.h>

‎arch/x86/crypto/sha1_ssse3_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <linux/module.h>
2323
#include <linux/mm.h>
2424
#include <linux/types.h>
25-
#include <crypto/sha.h>
25+
#include <crypto/sha1.h>
2626
#include <crypto/sha1_base.h>
2727
#include <asm/simd.h>
2828

‎arch/x86/crypto/sha256_ssse3_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <linux/module.h>
3636
#include <linux/mm.h>
3737
#include <linux/types.h>
38-
#include <crypto/sha.h>
38+
#include <crypto/sha2.h>
3939
#include <crypto/sha256_base.h>
4040
#include <linux/string.h>
4141
#include <asm/simd.h>

‎arch/x86/crypto/sha512_ssse3_glue.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <linux/mm.h>
3535
#include <linux/string.h>
3636
#include <linux/types.h>
37-
#include <crypto/sha.h>
37+
#include <crypto/sha2.h>
3838
#include <crypto/sha512_base.h>
3939
#include <asm/simd.h>
4040

‎arch/x86/purgatory/purgatory.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
#include <linux/bug.h>
12-
#include <crypto/sha.h>
12+
#include <crypto/sha2.h>
1313
#include <asm/purgatory.h>
1414

1515
#include "../boot/string.h"

‎crypto/asymmetric_keys/asym_tpm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/tpm_command.h>
1111
#include <crypto/akcipher.h>
1212
#include <crypto/hash.h>
13-
#include <crypto/sha.h>
13+
#include <crypto/sha1.h>
1414
#include <asm/unaligned.h>
1515
#include <keys/asymmetric-subtype.h>
1616
#include <keys/trusted_tpm.h>

‎crypto/sha1_generic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/module.h>
1717
#include <linux/mm.h>
1818
#include <linux/types.h>
19-
#include <crypto/sha.h>
19+
#include <crypto/sha1.h>
2020
#include <crypto/sha1_base.h>
2121
#include <asm/byteorder.h>
2222

‎crypto/sha256_generic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/module.h>
1313
#include <linux/mm.h>
1414
#include <linux/types.h>
15-
#include <crypto/sha.h>
15+
#include <crypto/sha2.h>
1616
#include <crypto/sha256_base.h>
1717
#include <asm/byteorder.h>
1818
#include <asm/unaligned.h>

‎crypto/sha512_generic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/init.h>
1313
#include <linux/crypto.h>
1414
#include <linux/types.h>
15-
#include <crypto/sha.h>
15+
#include <crypto/sha2.h>
1616
#include <crypto/sha512_base.h>
1717
#include <linux/percpu.h>
1818
#include <asm/byteorder.h>

‎drivers/char/random.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@
336336
#include <linux/completion.h>
337337
#include <linux/uuid.h>
338338
#include <crypto/chacha.h>
339-
#include <crypto/sha.h>
339+
#include <crypto/sha1.h>
340340

341341
#include <asm/processor.h>
342342
#include <linux/uaccess.h>

‎drivers/crypto/allwinner/sun4i-ss/sun4i-ss.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <linux/pm_runtime.h>
2626
#include <crypto/md5.h>
2727
#include <crypto/skcipher.h>
28-
#include <crypto/sha.h>
28+
#include <crypto/sha1.h>
2929
#include <crypto/hash.h>
3030
#include <crypto/internal/hash.h>
3131
#include <crypto/internal/skcipher.h>

‎drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
#include <linux/pm_runtime.h>
1414
#include <linux/scatterlist.h>
1515
#include <crypto/internal/hash.h>
16-
#include <crypto/sha.h>
16+
#include <crypto/sha1.h>
17+
#include <crypto/sha2.h>
1718
#include <crypto/md5.h>
1819
#include "sun8i-ce.h"
1920

‎drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
#include <crypto/internal/hash.h>
1717
#include <crypto/md5.h>
1818
#include <crypto/rng.h>
19-
#include <crypto/sha.h>
19+
#include <crypto/sha1.h>
20+
#include <crypto/sha2.h>
2021

2122
/* CE Registers */
2223
#define CE_TDQ 0x00

‎drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
#include <linux/pm_runtime.h>
1414
#include <linux/scatterlist.h>
1515
#include <crypto/internal/hash.h>
16-
#include <crypto/sha.h>
16+
#include <crypto/sha1.h>
17+
#include <crypto/sha2.h>
1718
#include <crypto/md5.h>
1819
#include "sun8i-ss.h"
1920

0 commit comments

Comments
 (0)