Commit a24d22b2 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Acked-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5bdad829

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>

#include <crypto/sha.h>

#include <crypto/sha1.h>

#include <crypto/sha1_base.h>

#include <linux/cpufeature.h>

#include <linux/crypto.h>

arch/arm/crypto/sha1.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#define ASM_ARM_CRYPTO_SHA1_H



#include <linux/crypto.h>

#include <crypto/sha.h>

#include <crypto/sha1.h>



extern int sha1_update_arm(struct shash_desc *desc, const u8 *data,

			   unsigned int len);

arch/arm/crypto/sha1_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/init.h>

#include <linux/module.h>

#include <linux/types.h>

#include <crypto/sha.h>

#include <crypto/sha1.h>

#include <crypto/sha1_base.h>

#include <asm/byteorder.h>

arch/arm/crypto/sha1_neon_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/module.h>

#include <linux/mm.h>

#include <linux/types.h>

#include <crypto/sha.h>

#include <crypto/sha1.h>

#include <crypto/sha1_base.h>

#include <asm/neon.h>

#include <asm/simd.h>

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>

#include <crypto/sha.h>

#include <crypto/sha2.h>

#include <crypto/sha256_base.h>

#include <linux/cpufeature.h>

#include <linux/crypto.h>