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

crypto: lib/sha1 - fold linux/cryptohash.h into crypto/sha.h 



<linux/cryptohash.h> sounds very generic and important, like it's the
header to include if you're doing cryptographic hashing in the kernel.
But actually it only includes the library implementation of the SHA-1
compression function (not even the full SHA-1).  This should basically
never be used anymore; SHA-1 is no longer considered secure, and there
are much better ways to do cryptographic hashing in the kernel.

Remove this header and fold it into <crypto/sha.h> which already
contains constants and functions for SHA-1 (along with SHA-2).

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2aaba014

crypto/sha1_generic.c

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

#include <linux/module.h>

#include <linux/mm.h>

#include <linux/cryptohash.h>

#include <linux/types.h>

#include <crypto/sha.h>

#include <crypto/sha1_base.h>

drivers/char/random.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ 
#include <linux/spinlock.h>

#include <linux/kthread.h>

#include <linux/percpu.h>

#include <linux/cryptohash.h>

#include <linux/fips.h>

#include <linux/ptrace.h>

#include <linux/workqueue.h>
@@ -337,6 +336,7 @@ 
#include <linux/completion.h>

#include <linux/uuid.h>

#include <crypto/chacha.h>

#include <crypto/sha.h>



#include <asm/processor.h>

#include <linux/uaccess.h>

include/crypto/sha.h

+10 −0
Original line number Diff line number Diff line
@@ -113,6 +113,16 @@ extern int crypto_sha512_update(struct shash_desc *desc, const u8 *data, 
extern int crypto_sha512_finup(struct shash_desc *desc, const u8 *data,

			       unsigned int len, u8 *hash);



/*

 * An implementation of SHA-1's compression function.  Don't use in new code!

 * You shouldn't be using SHA-1, and even if you *have* to use SHA-1, this isn't

 * the correct way to hash something with SHA-1 (use crypto_shash instead).

 */

#define SHA1_DIGEST_WORDS	(SHA1_DIGEST_SIZE / 4)

#define SHA1_WORKSPACE_WORDS	16

void sha1_init(__u32 *buf);

void sha1_transform(__u32 *digest, const char *data, __u32 *W);



/*

 * Stand-alone implementation of the SHA256 algorithm. It is designed to

 * have as little dependencies as possible so it can be used in the

include/linux/cryptohash.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __CRYPTOHASH_H

#define __CRYPTOHASH_H



#include <uapi/linux/types.h>



/*

 * An implementation of SHA-1's compression function.  Don't use in new code!

 * You shouldn't be using SHA-1, and even if you *have* to use SHA-1, this isn't

 * the correct way to hash something with SHA-1 (use crypto_shash instead).

 */

#define SHA1_DIGEST_WORDS 5

#define SHA1_BLOCK_SIZE 64

#define SHA1_WORKSPACE_WORDS 16

void sha1_init(__u32 *buf);

void sha1_transform(__u32 *digest, const char *data, __u32 *W);



#endif

include/linux/filter.h

+1 −1
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 
#include <linux/workqueue.h>

#include <linux/sched.h>

#include <linux/capability.h>

#include <linux/cryptohash.h>

#include <linux/set_memory.h>

#include <linux/kallsyms.h>

#include <linux/if_vlan.h>

#include <linux/vmalloc.h>

#include <crypto/sha.h>



#include <net/sch_generic.h>