sha1 library cleanup
Subsystems (24)
Eric Biggers
maintainercover sha1 library cleanup
<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.
Also the function is named just "sha_transform()", which makes it unclear which version of SHA is meant.
Therefore, this series cleans things up by moving these SHA-1 declarations into <crypto/sha.h> where they better belong, and changing the names to say SHA-1 rather than just SHA.
As future work, we should split sha.h into sha1.h and sha2.h and try to remove the remaining uses of SHA-1. For example, the remaining use in drivers/char/random.c is probably one that can be gotten rid of.
This patch series applies to cryptodev/master.
Eric Biggers (7):
mptcp: use SHA256_BLOCK_SIZE, not SHA_MESSAGE_BYTES
crypto: powerpc/sha1 - remove unused temporary workspace
crypto: powerpc/sha1 - prefix the "sha1_" functions
crypto: s390/sha1 - prefix the "sha1_" functions
crypto: lib/sha1 - rename "sha" to "sha1"
crypto: lib/sha1 - remove unnecessary includes of linux/cryptohash.h
crypto: lib/sha1 - fold linux/cryptohash.h into crypto/sha.h
Documentation/security/siphash.rst | 2 +- arch/arm/crypto/sha1_glue.c | 1 - arch/arm/crypto/sha1_neon_glue.c | 1 - arch/arm/crypto/sha256_glue.c | 1 - arch/arm/crypto/sha256_neon_glue.c | 1 - arch/arm/kernel/armksyms.c | 1 - arch/arm64/crypto/sha256-glue.c | 1 - arch/arm64/crypto/sha512-glue.c | 1 - arch/microblaze/kernel/microblaze_ksyms.c | 1 - arch/mips/cavium-octeon/crypto/octeon-md5.c | 1 - arch/powerpc/crypto/md5-glue.c | 1 - arch/powerpc/crypto/sha1-spe-glue.c | 1 - arch/powerpc/crypto/sha1.c | 33 ++++++++++----------- arch/powerpc/crypto/sha256-spe-glue.c | 1 - arch/s390/crypto/sha1_s390.c | 12 ++++---- arch/sparc/crypto/md5_glue.c | 1 - arch/sparc/crypto/sha1_glue.c | 1 - arch/sparc/crypto/sha256_glue.c | 1 - arch/sparc/crypto/sha512_glue.c | 1 - arch/unicore32/kernel/ksyms.c | 1 - arch/x86/crypto/sha1_ssse3_glue.c | 1 - arch/x86/crypto/sha256_ssse3_glue.c | 1 - arch/x86/crypto/sha512_ssse3_glue.c | 1 - crypto/sha1_generic.c | 5 ++-- drivers/char/random.c | 8 ++--- drivers/crypto/atmel-sha.c | 1 - drivers/crypto/chelsio/chcr_algo.c | 1 - drivers/crypto/chelsio/chcr_ipsec.c | 1 - drivers/crypto/omap-sham.c | 1 - fs/f2fs/hash.c | 1 - include/crypto/sha.h | 10 +++++++ include/linux/cryptohash.h | 14 --------- include/linux/filter.h | 4 +-- include/net/tcp.h | 1 - kernel/bpf/core.c | 18 +++++------ lib/crypto/chacha.c | 1 - lib/sha1.c | 24 ++++++++------- net/core/secure_seq.c | 1 - net/ipv6/addrconf.c | 10 +++---- net/ipv6/seg6_hmac.c | 1 - net/mptcp/crypto.c | 4 +-- 41 files changed, 69 insertions(+), 104 deletions(-) delete mode 100644 include/linux/cryptohash.h
base-commit: 12b3cf9093542d9f752a4968815ece836159013f
Signature · 1 line
2.26.2
Eric Biggers
maintainerPATCH 1/7 mptcp: use SHA256_BLOCK_SIZE, not SHA_MESSAGE_BYTES
From: Eric Biggers <ebiggers(a)google.com>
In preparation for naming the SHA-1 stuff in <linux/cryptohash.h> properly and moving it to a more appropriate header, fix the HMAC-SHA256 code in mptcp_crypto_hmac_sha() to use SHA256_BLOCK_SIZE instead of "SHA_MESSAGE_BYTES" which is actually the SHA-1 block size. (Fortunately these are both 64 bytes, so this wasn't a "real" bug...)
--- net/mptcp/crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/mptcp/crypto.c +2 -2
@@ -61,7 +61,7 @@ void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u8 *msg, int len, void *hmac)put_unaligned_be64 (key2, key2be);/* Generate key xored with ipad */ -memset (input,0x36 ,SHA_MESSAGE_BYTES ); +memset (input,0x36 ,SHA256_BLOCK_SIZE );for (i =0 ; i <8 ; i++) input[i] ^= key1be[i];for (i =0 ; i <8 ; i++)
@@ -78,7 +78,7 @@ void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u8 *msg, int len, void *hmac)sha256_final (&state, &input[SHA256_BLOCK_SIZE ]);/* Prepare second part of hmac */ -memset (input,0x5C ,SHA_MESSAGE_BYTES ); +memset (input,0x5C ,SHA256_BLOCK_SIZE );for (i =0 ; i <8 ; i++) input[i] ^= key1be[i];for (i =0 ; i <8 ; i++)
Signature · 1 line
2.26.2
Eric Biggers
maintainerPATCH 4/7 crypto: s390/sha1 - prefix the "sha1_" functions
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Prefix the s390 SHA-1 functions with "s390_sha1_" rather than "sha1_". This allows us to rename the library function sha_init() to sha1_init() without causing a naming collision.
--- arch/s390/crypto/sha1_s390.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/s390/crypto/sha1_s390.c +6 -6
@@ -27,7 +27,7 @@#include "sha.h" -static int sha1_init (struct shash_desc *desc) +static int s390_sha1_init (struct shash_desc *desc) {struct s390_sha_ctx *sctx =shash_desc_ctx (desc);
@@ -42,7 +42,7 @@ static int sha1_init(struct shash_desc *desc)return 0 ; } -static int sha1_export (struct shash_desc *desc,void *out) +static int s390_sha1_export (struct shash_desc *desc,void *out) {struct s390_sha_ctx *sctx =shash_desc_ctx (desc);struct sha1_state *octx = out;
@@ -53,7 +53,7 @@ static int sha1_export(struct shash_desc *desc, void *out)return 0 ; } -static int sha1_import (struct shash_desc *desc,const void *in) +static int s390_sha1_import (struct shash_desc *desc,const void *in) {struct s390_sha_ctx *sctx =shash_desc_ctx (desc);const struct sha1_state *ictx = in;
@@ -67,11 +67,11 @@ static int sha1_import(struct shash_desc *desc, const void *in)static struct shash_alg alg = { .digestsize =SHA1_DIGEST_SIZE , - .init = sha1_init, + .init = s390_sha1_init, .update = s390_sha_update, .final = s390_sha_final, - .export = sha1_export, - .import = sha1_import, + .export = s390_sha1_export, + .import = s390_sha1_import, .descsize =sizeof (struct s390_sha_ctx ), .statesize =sizeof (struct sha1_state ), .base = {
Signature · 1 line
2.26.2
Eric Biggers
maintainerPATCH 7/7 crypto: lib/sha1 - fold linux/cryptohash.h into crypto/sha.h
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
<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).
--- crypto/sha1_generic.c | 1 - drivers/char/random.c | 2 +- include/crypto/sha.h | 10 ++++++++++ include/linux/cryptohash.h | 18 ------------------ include/linux/filter.h | 2 +- lib/sha1.c | 2 +- 6 files changed, 13 insertions(+), 22 deletions(-) delete mode 100644 include/linux/cryptohash.h
crypto/sha1_generic.c +0 -1
@@ -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
@@ -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
@@ -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 deleted +0 -18
@@ -1,18 +0,0 @@ -/* 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
@@ -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>
lib/sha1.c +1 -1
@@ -9,7 +9,7 @@#include <linux/kernel.h> #include <linux/export.h> #include <linux/bitops.h> -#include <linux/cryptohash.h> +#include <crypto/sha.h> #include <asm/unaligned.h> /*
Signature · 1 line
2.26.2
Eric Biggers
maintainerPATCH 6/7 crypto: lib/sha1 - remove unnecessary includes of linux/cryptohash.h
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
<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.
Most files that include this header don't actually need it. So in preparation for removing it, remove all these unneeded includes of it.
--- arch/arm/crypto/sha1_glue.c | 1 - arch/arm/crypto/sha1_neon_glue.c | 1 - arch/arm/crypto/sha256_glue.c | 1 - arch/arm/crypto/sha256_neon_glue.c | 1 - arch/arm/kernel/armksyms.c | 1 - arch/arm64/crypto/sha256-glue.c | 1 - arch/arm64/crypto/sha512-glue.c | 1 - arch/microblaze/kernel/microblaze_ksyms.c | 1 - arch/mips/cavium-octeon/crypto/octeon-md5.c | 1 - arch/powerpc/crypto/md5-glue.c | 1 - arch/powerpc/crypto/sha1-spe-glue.c | 1 - arch/powerpc/crypto/sha256-spe-glue.c | 1 - arch/sparc/crypto/md5_glue.c | 1 - arch/sparc/crypto/sha1_glue.c | 1 - arch/sparc/crypto/sha256_glue.c | 1 - arch/sparc/crypto/sha512_glue.c | 1 - arch/unicore32/kernel/ksyms.c | 1 - arch/x86/crypto/sha1_ssse3_glue.c | 1 - arch/x86/crypto/sha256_ssse3_glue.c | 1 - arch/x86/crypto/sha512_ssse3_glue.c | 1 - drivers/crypto/atmel-sha.c | 1 - drivers/crypto/chelsio/chcr_algo.c | 1 - drivers/crypto/chelsio/chcr_ipsec.c | 1 - drivers/crypto/omap-sham.c | 1 - fs/f2fs/hash.c | 1 - include/net/tcp.h | 1 - lib/crypto/chacha.c | 1 - net/core/secure_seq.c | 1 - net/ipv6/seg6_hmac.c | 1 - 29 files changed, 29 deletions(-)
arch/arm/crypto/sha1_glue.c +0 -1
@@ -14,7 +14,6 @@#include <crypto/internal/hash.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/cryptohash.h> #include <linux/types.h> #include <crypto/sha.h> #include <crypto/sha1_base.h>
arch/arm/crypto/sha1_neon_glue.c +0 -1
@@ -18,7 +18,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>
arch/arm/crypto/sha256_glue.c +0 -1
@@ -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 <linux/string.h> #include <crypto/sha.h>
arch/arm/crypto/sha256_neon_glue.c +0 -1
@@ -11,7 +11,6 @@#include <crypto/internal/hash.h> #include <crypto/internal/simd.h> -#include <linux/cryptohash.h> #include <linux/types.h> #include <linux/string.h> #include <crypto/sha.h>
arch/arm/kernel/armksyms.c +0 -1
@@ -7,7 +7,6 @@#include <linux/export.h> #include <linux/sched.h> #include <linux/string.h> -#include <linux/cryptohash.h> #include <linux/delay.h> #include <linux/in6.h> #include <linux/syscalls.h>
arch/arm64/crypto/sha256-glue.c +0 -1
@@ -12,7 +12,6 @@#include <crypto/internal/simd.h> #include <crypto/sha.h> #include <crypto/sha256_base.h> -#include <linux/cryptohash.h> #include <linux/types.h> #include <linux/string.h>
arch/arm64/crypto/sha512-glue.c +0 -1
@@ -6,7 +6,6 @@*/ #include <crypto/internal/hash.h> -#include <linux/cryptohash.h> #include <linux/types.h> #include <linux/string.h> #include <crypto/sha.h>
arch/microblaze/kernel/microblaze_ksyms.c +0 -1
@@ -6,7 +6,6 @@#include <linux/export.h> #include <linux/string.h> -#include <linux/cryptohash.h> #include <linux/delay.h> #include <linux/in6.h> #include <linux/syscalls.h>
arch/mips/cavium-octeon/crypto/octeon-md5.c +0 -1
@@ -25,7 +25,6 @@#include <linux/module.h> #include <linux/string.h> #include <asm/byteorder.h> -#include <linux/cryptohash.h> #include <asm/octeon/octeon.h> #include <crypto/internal/hash.h>
arch/powerpc/crypto/md5-glue.c +0 -1
@@ -11,7 +11,6 @@#include <linux/init.h> #include <linux/module.h> #include <linux/mm.h> -#include <linux/cryptohash.h> #include <linux/types.h> #include <crypto/md5.h> #include <asm/byteorder.h>
arch/powerpc/crypto/sha1-spe-glue.c +0 -1
@@ -11,7 +11,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 <asm/byteorder.h>
arch/powerpc/crypto/sha256-spe-glue.c +0 -1
@@ -12,7 +12,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 <asm/byteorder.h>
arch/sparc/crypto/md5_glue.c +0 -1
@@ -18,7 +18,6 @@#include <linux/init.h> #include <linux/module.h> #include <linux/mm.h> -#include <linux/cryptohash.h> #include <linux/types.h> #include <crypto/md5.h>
arch/sparc/crypto/sha1_glue.c +0 -1
@@ -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>
arch/sparc/crypto/sha256_glue.c +0 -1
@@ -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>
arch/sparc/crypto/sha512_glue.c +0 -1
@@ -14,7 +14,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>
arch/unicore32/kernel/ksyms.c +0 -1
@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/sched.h> #include <linux/string.h> -#include <linux/cryptohash.h> #include <linux/delay.h> #include <linux/in6.h> #include <linux/syscalls.h>
arch/x86/crypto/sha1_ssse3_glue.c +0 -1
@@ -21,7 +21,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>
arch/x86/crypto/sha256_ssse3_glue.c +0 -1
@@ -34,7 +34,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/sha256_base.h>
arch/x86/crypto/sha512_ssse3_glue.c +0 -1
@@ -32,7 +32,6 @@#include <linux/init.h> #include <linux/module.h> #include <linux/mm.h> -#include <linux/cryptohash.h> #include <linux/string.h> #include <linux/types.h> #include <crypto/sha.h>
drivers/crypto/atmel-sha.c +0 -1
@@ -31,7 +31,6 @@#include <linux/of_device.h> #include <linux/delay.h> #include <linux/crypto.h> -#include <linux/cryptohash.h> #include <crypto/scatterwalk.h> #include <crypto/algapi.h> #include <crypto/sha.h>
drivers/crypto/chelsio/chcr_algo.c +0 -1
@@ -44,7 +44,6 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/crypto.h> -#include <linux/cryptohash.h> #include <linux/skbuff.h> #include <linux/rtnetlink.h> #include <linux/highmem.h>
drivers/crypto/chelsio/chcr_ipsec.c +0 -1
@@ -40,7 +40,6 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/crypto.h> -#include <linux/cryptohash.h> #include <linux/skbuff.h> #include <linux/rtnetlink.h> #include <linux/highmem.h>
drivers/crypto/omap-sham.c +0 -1
@@ -33,7 +33,6 @@#include <linux/of_irq.h> #include <linux/delay.h> #include <linux/crypto.h> -#include <linux/cryptohash.h> #include <crypto/scatterwalk.h> #include <crypto/algapi.h> #include <crypto/sha.h>
fs/f2fs/hash.c +0 -1
@@ -12,7 +12,6 @@#include <linux/types.h> #include <linux/fs.h> #include <linux/f2fs_fs.h> -#include <linux/cryptohash.h> #include <linux/pagemap.h> #include <linux/unicode.h>
include/net/tcp.h +0 -1
@@ -23,7 +23,6 @@#include <linux/cache.h> #include <linux/percpu.h> #include <linux/skbuff.h> -#include <linux/cryptohash.h> #include <linux/kref.h> #include <linux/ktime.h>
lib/crypto/chacha.c +0 -1
@@ -10,7 +10,6 @@#include <linux/export.h> #include <linux/bitops.h> #include <linux/string.h> -#include <linux/cryptohash.h> #include <asm/unaligned.h> #include <crypto/chacha.h>
net/core/secure_seq.c +0 -1
@@ -5,7 +5,6 @@#include <linux/kernel.h> #include <linux/init.h> -#include <linux/cryptohash.h> #include <linux/module.h> #include <linux/cache.h> #include <linux/random.h>
net/ipv6/seg6_hmac.c +0 -1
@@ -34,7 +34,6 @@#include <net/addrconf.h> #include <net/xfrm.h> -#include <linux/cryptohash.h> #include <crypto/hash.h> #include <crypto/sha.h> #include <net/seg6.h>
Signature · 1 line
2.26.2
Eric Biggers
maintainerPATCH 5/7 crypto: lib/sha1 - rename "sha" to "sha1"
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The library implementation of the SHA-1 compression function is confusingly called just "sha_transform()". Alongside it are some "SHA_" constants and "sha_init()". Presumably these are left over from a time when SHA just meant SHA-1. But now there are also SHA-2 and SHA-3, and moreover SHA-1 is now considered insecure and thus shouldn't be used.
Therefore, rename these functions and constants to make it very clear that they are for SHA-1. Also add a comment to make it clear that these shouldn't be used.
For the extra-misleadingly named "SHA_MESSAGE_BYTES", rename it to SHA1_BLOCK_SIZE and define it to just '64' rather than '(512/8)' so that it matches the same definition in <crypto/sha.h>. This prepares for merging <linux/cryptohash.h> into <crypto/sha.h>.
--- Documentation/security/siphash.rst | 2 +- crypto/sha1_generic.c | 4 ++-- drivers/char/random.c | 6 +++--- include/linux/cryptohash.h | 16 ++++++++++------ include/linux/filter.h | 2 +- kernel/bpf/core.c | 18 +++++++++--------- lib/sha1.c | 22 ++++++++++++---------- net/ipv6/addrconf.c | 10 +++++----- 8 files changed, 43 insertions(+), 37 deletions(-)
Documentation/security/siphash.rst +1 -1
@@ -7,7 +7,7 @@ SipHash - a short input PRF SipHash is a cryptographically secure PRF -- a keyed hash function -- that performs very well for short inputs, hence the name. It was designed by cryptographers Daniel J. Bernstein and Jean-Philippe Aumasson. It is intended -as a replacement for some uses of: `jhash`, `md5_transform`, `sha_transform`, +as a replacement for some uses of: `jhash`, `md5_transform`, `sha1_transform`, and so forth. SipHash takes a secret key filled with randomly generated numbers and either
crypto/sha1_generic.c +2 -2
@@ -31,10 +31,10 @@ EXPORT_SYMBOL_GPL(sha1_zero_message_hash);static void sha1_generic_block_fn (struct sha1_state *sst,u8 const *src,int blocks) { -u32 temp[SHA_WORKSPACE_WORDS ]; +u32 temp[SHA1_WORKSPACE_WORDS ];while (blocks--) { -sha_transform (sst->state, src, temp); +sha1_transform (sst->state, src, temp); src +=SHA1_BLOCK_SIZE ; }memzero_explicit (temp,sizeof (temp));
drivers/char/random.c +3 -3
@@ -1397,14 +1397,14 @@ static void extract_buf(struct entropy_store *r, __u8 *out)__u32 w[5 ];unsigned long l[LONGS (20 )]; } hash; -__u32 workspace[SHA_WORKSPACE_WORDS ]; +__u32 workspace[SHA1_WORKSPACE_WORDS ];unsigned long flags;/* * If we have an architectural hardware random number * generator, use it for SHA's initial vector */ -sha_init (hash.w); +sha1_init (hash.w);for (i =0 ; i <LONGS (20 ); i++) {unsigned long v;if (!arch_get_random_long (&v))
@@ -1415,7 +1415,7 @@ static void extract_buf(struct entropy_store *r, __u8 *out)/* Generate a hash across the pool, 16 words (512 bits) at a time */ spin_lock_irqsave (&r->lock, flags);for (i =0 ; i < r->poolinfo->poolwords; i +=16 ) -sha_transform (hash.w, (__u8 *)(r->pool + i), workspace); +sha1_transform (hash.w, (__u8 *)(r->pool + i), workspace);/* * We mix the hash back into the pool to prevent backtracking
include/linux/cryptohash.h +10 -6
@@ -4,11 +4,15 @@#include <uapi/linux/types.h> -#define SHA_DIGEST_WORDS 5 -#define SHA_MESSAGE_BYTES (512 /*bits*/ / 8) -#define SHA_WORKSPACE_WORDS 16 - -void sha_init (__u32 *buf); -void sha_transform (__u32 *digest,const char *data,__u32 *W ); +/* +* 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
@@ -746,7 +746,7 @@ static inline u32 bpf_prog_insn_size(const struct bpf_prog *prog)static inline u32 bpf_prog_tag_scratch_size (const struct bpf_prog *prog) {return round_up (bpf_prog_insn_size (prog) + -sizeof (__be64) +1 ,SHA_MESSAGE_BYTES ); +sizeof (__be64) +1 ,SHA1_BLOCK_SIZE ); }static inline unsigned int bpf_prog_size (unsigned int proglen)
kernel/bpf/core.c +9 -9
@@ -262,10 +262,10 @@ void __bpf_prog_free(struct bpf_prog *fp)int bpf_prog_calc_tag (struct bpf_prog *fp) { -const u32 bits_offset =SHA_MESSAGE_BYTES -sizeof (__be64); +const u32 bits_offset =SHA1_BLOCK_SIZE -sizeof (__be64);u32 raw_size =bpf_prog_tag_scratch_size (fp); -u32 digest[SHA_DIGEST_WORDS ]; -u32 ws[SHA_WORKSPACE_WORDS ]; +u32 digest[SHA1_DIGEST_WORDS ]; +u32 ws[SHA1_WORKSPACE_WORDS ];u32 i, bsize, psize, blocks;struct bpf_insn *dst;bool was_ld_map;
@@ -277,7 +277,7 @@ int bpf_prog_calc_tag(struct bpf_prog *fp)if (!raw)return -ENOMEM ; -sha_init (digest); +sha1_init (digest);memset (ws,0 ,sizeof (ws));/* We need to take out the map fd for the digest calculation
@@ -308,8 +308,8 @@ int bpf_prog_calc_tag(struct bpf_prog *fp)memset (&raw[psize],0 , raw_size - psize); raw[psize++] =0x80 ; - bsize =round_up (psize,SHA_MESSAGE_BYTES ); - blocks = bsize /SHA_MESSAGE_BYTES ; + bsize =round_up (psize,SHA1_BLOCK_SIZE ); + blocks = bsize /SHA1_BLOCK_SIZE ; todo = raw;if (bsize - psize >=sizeof (__be64)) { bits = (__be64 *)(todo + bsize -sizeof (__be64));
@@ -320,12 +320,12 @@ int bpf_prog_calc_tag(struct bpf_prog *fp) *bits =cpu_to_be64 ((psize -1 ) <<3 );while (blocks--) { -sha_transform (digest, todo, ws); - todo +=SHA_MESSAGE_BYTES ; +sha1_transform (digest, todo, ws); + todo +=SHA1_BLOCK_SIZE ; } result = (__force __be32 *)digest; -for (i =0 ; i <SHA_DIGEST_WORDS ; i++) +for (i =0 ; i <SHA1_DIGEST_WORDS ; i++) result[i] =cpu_to_be32 (digest[i]);memcpy (fp->tag, result,sizeof (fp->tag));
lib/sha1.c +12 -10
@@ -64,22 +64,24 @@#define T_60_79 (t,A ,B ,C ,D ,E ) SHA_ROUND(t, SHA_MIX, (B^C^D) , 0xca62c1d6, A, B, C, D, E )/** -* sha_transform - single block SHA1 transform +* sha1_transform - single block SHA1 transform (deprecated) * * @digest: 160 bit digest to update * @data: 512 bits of data to hash * @array: 16 words of workspace (see note) * -* This function generates a SHA1 digest for a single 512-bit block. -* Be warned, it does not handle padding and message digest, do not -* confuse it with the full FIPS 180-1 digest algorithm for variable -* length messages. +* This function executes SHA-1's internal compression function. It updates the +* 160-bit internal state (@digest) with a single 512-bit data block (@data). +* +* Don't use this function. SHA-1 is no longer considered secure. And even if +* you do have to use SHA-1, this isn't the correct way to hash something with +* SHA-1 as this doesn't handle padding and finalization. * * Note: If the hash is security sensitive, the caller should be sure * to clear the workspace. This is left to the caller to avoid * unnecessary clears between chained hashing operations. */ -void sha_transform (__u32 *digest,const char *data,__u32 *array) +void sha1_transform (__u32 *digest,const char *data,__u32 *array) {__u32 A ,B ,C ,D ,E ;
@@ -185,13 +187,13 @@ void sha_transform(__u32 *digest, const char *data, __u32 *array) digest[3 ] +=D ; digest[4 ] +=E ; } -EXPORT_SYMBOL (sha_transform); +EXPORT_SYMBOL (sha1_transform);/** -* sha_init - initialize the vectors for a SHA1 digest +* sha1_init - initialize the vectors for a SHA1 digest * @buf: vector to initialize */ -void sha_init (__u32 *buf) +void sha1_init (__u32 *buf) { buf[0 ] =0x67452301 ; buf[1 ] =0xefcdab89 ;
@@ -199,4 +201,4 @@ void sha_init(__u32 *buf) buf[3 ] =0x10325476 ; buf[4 ] =0xc3d2e1f0 ; } -EXPORT_SYMBOL (sha_init); +EXPORT_SYMBOL (sha1_init);
net/ipv6/addrconf.c +5 -5
@@ -3222,11 +3222,11 @@ static int ipv6_generate_stable_address(struct in6_addr *address, const struct inet6_dev *idev) { static DEFINE_SPINLOCK(lock); - static __u32 digest[SHA_DIGEST_WORDS]; - static __u32 workspace[SHA_WORKSPACE_WORDS]; + static __u32 digest[SHA1_DIGEST_WORDS]; + static __u32 workspace[SHA1_WORKSPACE_WORDS]; static union { - char __data[SHA_MESSAGE_BYTES]; + char __data[SHA1_BLOCK_SIZE]; struct { struct in6_addr secret; __be32 prefix[2];
@@ -3251,7 +3251,7 @@ static int ipv6_generate_stable_address(struct in6_addr *address, retry:spin_lock_bh (&lock); -sha_init (digest); +sha1_init (digest);memset (&data,0 ,sizeof (data));memset (workspace,0 ,sizeof (workspace));memcpy (data.hwaddr, idev->dev->perm_addr, idev->dev->addr_len);
@@ -3260,7 +3260,7 @@ static int ipv6_generate_stable_address(struct in6_addr *address, data.secret = secret; data.dad_count = dad_count; -sha_transform (digest, data.__data, workspace); +sha1_transform (digest, data.__data, workspace); temp = *address; temp.s6_addr32[2 ] = (__force __be32 )digest[0 ];
Signature · 1 line
2.26.2
Eric Biggers
maintainerPATCH 3/7 crypto: powerpc/sha1 - prefix the "sha1_" functions
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Prefix the PowerPC SHA-1 functions with "powerpc_sha1_" rather than "sha1_". This allows us to rename the library function sha_init() to sha1_init() without causing a naming collision.
--- arch/powerpc/crypto/sha1.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
arch/powerpc/crypto/sha1.c +13 -13
@@ -22,7 +22,7 @@void powerpc_sha_transform (u32 *state,const u8 *src); -static int sha1_init (struct shash_desc *desc) +static int powerpc_sha1_init (struct shash_desc *desc) {struct sha1_state *sctx =shash_desc_ctx (desc);
@@ -33,8 +33,8 @@ static int sha1_init(struct shash_desc *desc)return 0 ; } -static int sha1_update (struct shash_desc *desc,const u8 *data, -unsigned int len) +static int powerpc_sha1_update (struct shash_desc *desc,const u8 *data, +unsigned int len) {struct sha1_state *sctx =shash_desc_ctx (desc);unsigned int partial, done;
@@ -68,7 +68,7 @@ static int sha1_update(struct shash_desc *desc, const u8 *data,/* Add padding and return the message digest. */ -static int sha1_final (struct shash_desc *desc,u8 *out) +static int powerpc_sha1_final (struct shash_desc *desc,u8 *out) {struct sha1_state *sctx =shash_desc_ctx (desc);__be32 *dst = (__be32 *)out;
@@ -81,10 +81,10 @@ static int sha1_final(struct shash_desc *desc, u8 *out)/* Pad out to 56 mod 64 */ index = sctx->count &0x3f ; padlen = (index <56 ) ? (56 - index) : ((64 +56 ) - index); -sha1_update (desc, padding, padlen); +powerpc_sha1_update (desc, padding, padlen);/* Append length */ -sha1_update (desc, (const u8 *)&bits,sizeof (bits)); +powerpc_sha1_update (desc, (const u8 *)&bits,sizeof (bits));/* Store state in digest */ for (i =0 ; i <5 ; i++)
@@ -96,7 +96,7 @@ static int sha1_final(struct shash_desc *desc, u8 *out)return 0 ; } -static int sha1_export (struct shash_desc *desc,void *out) +static int powerpc_sha1_export (struct shash_desc *desc,void *out) {struct sha1_state *sctx =shash_desc_ctx (desc);
@@ -104,7 +104,7 @@ static int sha1_export(struct shash_desc *desc, void *out)return 0 ; } -static int sha1_import (struct shash_desc *desc,const void *in) +static int powerpc_sha1_import (struct shash_desc *desc,const void *in) {struct sha1_state *sctx =shash_desc_ctx (desc);
@@ -114,11 +114,11 @@ static int sha1_import(struct shash_desc *desc, const void *in)static struct shash_alg alg = { .digestsize =SHA1_DIGEST_SIZE , - .init = sha1_init, - .update = sha1_update, - .final = sha1_final, - .export = sha1_export, - .import = sha1_import, + .init = powerpc_sha1_init, + .update = powerpc_sha1_update, + .final = powerpc_sha1_final, + .export = powerpc_sha1_export, + .import = powerpc_sha1_import, .descsize =sizeof (struct sha1_state ), .statesize =sizeof (struct sha1_state ), .base = {
Signature · 1 line
2.26.2
Eric Biggers
maintainerPATCH 2/7 crypto: powerpc/sha1 - remove unused temporary workspace
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The PowerPC implementation of SHA-1 doesn't actually use the 16-word temporary array that's passed to the assembly code. This was probably meant to correspond to the 'W' array that lib/sha1.c uses. However, in sha1-powerpc-asm.S these values are actually stored in GPRs 16-31.
Referencing SHA_WORKSPACE_WORDS from this code also isn't appropriate, since it's an implementation detail of lib/sha1.c.
Therefore, just remove this unneeded array.
Tested with:
export ARCH=powerpc CROSS_COMPILE=powerpc-linux-gnu-
make mpc85xx_defconfig
cat >> .config << EOF
# CONFIG_MODULES is not set
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set CONFIG_DEBUG_KERNEL=y
CONFIG_CRYPTO_MANAGER_EXTRA_TESTS=y
CONFIG_CRYPTO_SHA1_PPC=y
EOF
make olddefconfig
make -j32
qemu-system-ppc -M mpc8544ds -cpu e500 -nographic \
-kernel arch/powerpc/boot/zImage \
-append "cryptomgr.fuzz_iterations=1000 cryptomgr.panic_on_fail=1"
--- arch/powerpc/crypto/sha1.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
arch/powerpc/crypto/sha1.c +2 -5
@@ -16,12 +16,11 @@#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 <asm/byteorder.h> -extern void powerpc_sha_transform (u32 *state,const u8 *src,u32 *temp); +void powerpc_sha_transform (u32 *state,const u8 *src);static int sha1_init (struct shash_desc *desc) {
@@ -47,7 +46,6 @@ static int sha1_update(struct shash_desc *desc, const u8 *data, src = data;if ((partial + len) >63 ) { -u32 temp[SHA_WORKSPACE_WORDS ];if (partial) { done = -partial;
@@ -56,12 +54,11 @@ static int sha1_update(struct shash_desc *desc, const u8 *data, }do { -powerpc_sha_transform (sctx->state, src, temp); +powerpc_sha_transform (sctx->state, src); done +=64 ; src = data + done; }while (done +63 < len); -memzero_explicit (temp,sizeof (temp)); partial =0 ; }memcpy (sctx->buffer + partial, src, len - done);
Signature · 1 line
2.26.2
Re: [MPTCP] [PATCH 1/7] mptcp: use SHA256_BLOCK_SIZE, not SHA_MESSAGE_BYTES
In reply to Eric BiggersHi Eric,
Quoted 7 lines · Eric Biggers
From: Eric Biggers <ebiggers(a)google.com>
In preparation for naming the SHA-1 stuff in <
linux/cryptohash.h> properly and moving it to a more appropriate header, fix the HMAC-SHA256 code inmptcp_crypto_hmac_sha()to useSHA256_BLOCK_SIZEinstead of "SHA_MESSAGE_BYTES" which is actually the SHA-1 block size. (Fortunately these are both 64 bytes, so this wasn't a "real" bug...)
Good catch! I guess it was left when switching from SHA-1 to SHA-256 in 65492c5a6ab5 (mptcp: move from sha1 (v0) to sha256 (v1)).
For MPTCP related code, it looks good to me, thank you for this!
Signature · 5 lines
Matthieu Baerts | R&D Engineer matthieu.baerts(a)tessares.net Tessares SA | Hybrid Access Solutions www.tessares.net 1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
Jason A. Donenfeld
maintainerThanks for this series. I like the general idea. I think it might make sense, though, to separate things out into sha1.h and sha256.h. That will be nice preparation work for when we eventually move obsolete primitives into some <crypto/dangerous/> subdirectory.
Quoted 21 lines · Eric Biggers
<
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.Also the function is named just "
sha_transform()", which makes it unclear which version of SHA is meant.Therefore, this series cleans things up by moving these SHA-1 declarations into <
crypto/sha.h> where they better belong, and changing the names to say SHA-1 rather than just SHA.As future work, we should split
sha.hintosha1.handsha2.hand try to remove the remaining uses of SHA-1. For example, the remaining use indrivers/char/random.cis probably one that can be gotten rid of.This patch series applies to cryptodev/master.
Quoted 9 lines
Eric Biggers (7):
mptcp: useSHA256_BLOCK_SIZE, notSHA_MESSAGE_BYTES
crypto: powerpc/sha1 - remove unused temporary workspace
crypto: powerpc/sha1 - prefix the "sha1_" functions
crypto: s390/sha1 - prefix the "sha1_" functions
crypto: lib/sha1 - rename "sha" to "sha1"
crypto: lib/sha1 - remove unnecessary includes oflinux/cryptohash.h
crypto: lib/sha1 - foldlinux/cryptohash.hintocrypto/sha.h
For the series,
Quoted 49 lines
Documentation/security/siphash.rst | 2 +- arch/arm/crypto/sha1_glue.c | 1 - arch/arm/crypto/sha1_neon_glue.c | 1 - arch/arm/crypto/sha256_glue.c | 1 - arch/arm/crypto/sha256_neon_glue.c | 1 - arch/arm/kernel/armksyms.c | 1 - arch/arm64/crypto/sha256-glue.c | 1 - arch/arm64/crypto/sha512-glue.c | 1 - arch/microblaze/kernel/microblaze_ksyms.c | 1 - arch/mips/cavium-octeon/crypto/octeon-md5.c | 1 - arch/powerpc/crypto/md5-glue.c | 1 - arch/powerpc/crypto/sha1-spe-glue.c | 1 - arch/powerpc/crypto/sha1.c | 33 ++++++++++----------- arch/powerpc/crypto/sha256-spe-glue.c | 1 - arch/s390/crypto/sha1_s390.c | 12 ++++---- arch/sparc/crypto/md5_glue.c | 1 - arch/sparc/crypto/sha1_glue.c | 1 - arch/sparc/crypto/sha256_glue.c | 1 - arch/sparc/crypto/sha512_glue.c | 1 - arch/unicore32/kernel/ksyms.c | 1 - arch/x86/crypto/sha1_ssse3_glue.c | 1 - arch/x86/crypto/sha256_ssse3_glue.c | 1 - arch/x86/crypto/sha512_ssse3_glue.c | 1 - crypto/sha1_generic.c | 5 ++-- drivers/char/random.c | 8 ++--- drivers/crypto/atmel-sha.c | 1 - drivers/crypto/chelsio/chcr_algo.c | 1 - drivers/crypto/chelsio/chcr_ipsec.c | 1 - drivers/crypto/omap-sham.c | 1 - fs/f2fs/hash.c | 1 - include/crypto/sha.h | 10 +++++++ include/linux/cryptohash.h | 14 --------- include/linux/filter.h | 4 +-- include/net/tcp.h | 1 - kernel/bpf/core.c | 18 +++++------ lib/crypto/chacha.c | 1 - lib/sha1.c | 24 ++++++++------- net/core/secure_seq.c | 1 - net/ipv6/addrconf.c | 10 +++---- net/ipv6/seg6_hmac.c | 1 - net/mptcp/crypto.c | 4 +-- 41 files changed, 69 insertions(+), 104 deletions(-) delete mode 100644 include/linux/cryptohash.hbase-commit:
12b3cf9093542d9f752a4968815ece836159013f--
2.26.2
Eric Biggers
maintainerQuoted 4 lines · Jason A. Donenfeld
Thanks for this series. I like the general idea. I think it might make sense, though, to separate things out into
sha1.handsha256.h. That will be nice preparation work for when we eventually move obsolete primitives into some <crypto/dangerous/> subdirectory.
That's basically what I suggested in the cover letter:
"As future work, we should split sha.h into sha1.h and sha2.h and try to remove the remaining uses of SHA-1. For example, the remaining use in drivers/char/random.c is probably one that can be gotten rid of."
("sha2.h" rather than "sha256.h", since it would include SHA-512 too. Also, we already have sha3.h, so having sha{1,2,3}.h would be logical.)
But there are 108 files that include <crypto/sha.h>, all of which would need to be updated, which risks merge conflicts. So this series seemed like a good stopping point to get these initial changes in for 5.8. Then in the next release we can split up sha.h (and debate whether sha1.h should really be "<crypto/dangerous/sha1.h>" or whatever).
There are 3 files where I added an include of sha.h, where we could go directly to sha1.h if we did it now. But that's not much compared to the 108 files.
- Eric
Re: [PATCH 2/7] crypto: powerpc/sha1 - remove unused temporary workspace
In reply to Eric BiggersQuoted 14 lines · Eric Biggers
From: Eric Biggers <[email protected]>
The PowerPC implementation of SHA-1 doesn't actually use the 16-word temporary array that's passed to the assembly code. This was probably meant to correspond to the 'W' array that
lib/sha1.cuses. However, insha1-powerpc-asm.Sthese values are actually stored in GPRs 16-31.Referencing
SHA_WORKSPACE_WORDSfrom this code also isn't appropriate, since it's an implementation detail oflib/sha1.c.Therefore, just remove this unneeded array.
Tested with:
Quoted 14 lines
export ARCH=powerpc CROSS_COMPILE=powerpc-linux-gnu-
makempc85xx_defconfig
cat >> .config << EOF
#CONFIG_MODULESis not set
#CONFIG_CRYPTO_MANAGER_DISABLE_TESTSis not setCONFIG_DEBUG_KERNEL=y
CONFIG_CRYPTO_MANAGER_EXTRA_TESTS=y
CONFIG_CRYPTO_SHA1_PPC=y
EOF
make olddefconfig
make -j32
qemu-system-ppc -M mpc8544ds -cpu e500 -nographic \
-kernelarch/powerpc/boot/zImage\
-append "cryptomgr.fuzz_iterations=1000 cryptomgr.panic_on_fail=1"
Thanks for testing.
I gave it a quick spin on a Power9 and it showed no issues.
cheers
Herbert Xu
maintainerQuoted 71 lines · Eric Biggers
<
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.Also the function is named just "
sha_transform()", which makes it unclear which version of SHA is meant.Therefore, this series cleans things up by moving these SHA-1 declarations into <
crypto/sha.h> where they better belong, and changing the names to say SHA-1 rather than just SHA.As future work, we should split
sha.hintosha1.handsha2.hand try to remove the remaining uses of SHA-1. For example, the remaining use indrivers/char/random.cis probably one that can be gotten rid of.This patch series applies to cryptodev/master.
Eric Biggers (7):
mptcp: useSHA256_BLOCK_SIZE, notSHA_MESSAGE_BYTES
crypto: powerpc/sha1 - remove unused temporary workspace
crypto: powerpc/sha1 - prefix the "sha1_" functions
crypto: s390/sha1 - prefix the "sha1_" functions
crypto: lib/sha1 - rename "sha" to "sha1"
crypto: lib/sha1 - remove unnecessary includes oflinux/cryptohash.h
crypto: lib/sha1 - foldlinux/cryptohash.hintocrypto/sha.hDocumentation/security/siphash.rst | 2 +- arch/arm/crypto/sha1_glue.c | 1 - arch/arm/crypto/sha1_neon_glue.c | 1 - arch/arm/crypto/sha256_glue.c | 1 - arch/arm/crypto/sha256_neon_glue.c | 1 - arch/arm/kernel/armksyms.c | 1 - arch/arm64/crypto/sha256-glue.c | 1 - arch/arm64/crypto/sha512-glue.c | 1 - arch/microblaze/kernel/microblaze_ksyms.c | 1 - arch/mips/cavium-octeon/crypto/octeon-md5.c | 1 - arch/powerpc/crypto/md5-glue.c | 1 - arch/powerpc/crypto/sha1-spe-glue.c | 1 - arch/powerpc/crypto/sha1.c | 33 ++++++++++----------- arch/powerpc/crypto/sha256-spe-glue.c | 1 - arch/s390/crypto/sha1_s390.c | 12 ++++---- arch/sparc/crypto/md5_glue.c | 1 - arch/sparc/crypto/sha1_glue.c | 1 - arch/sparc/crypto/sha256_glue.c | 1 - arch/sparc/crypto/sha512_glue.c | 1 - arch/unicore32/kernel/ksyms.c | 1 - arch/x86/crypto/sha1_ssse3_glue.c | 1 - arch/x86/crypto/sha256_ssse3_glue.c | 1 - arch/x86/crypto/sha512_ssse3_glue.c | 1 - crypto/sha1_generic.c | 5 ++-- drivers/char/random.c | 8 ++--- drivers/crypto/atmel-sha.c | 1 - drivers/crypto/chelsio/chcr_algo.c | 1 - drivers/crypto/chelsio/chcr_ipsec.c | 1 - drivers/crypto/omap-sham.c | 1 - fs/f2fs/hash.c | 1 - include/crypto/sha.h | 10 +++++++ include/linux/cryptohash.h | 14 --------- include/linux/filter.h | 4 +-- include/net/tcp.h | 1 - kernel/bpf/core.c | 18 +++++------ lib/crypto/chacha.c | 1 - lib/sha1.c | 24 ++++++++------- net/core/secure_seq.c | 1 - net/ipv6/addrconf.c | 10 +++---- net/ipv6/seg6_hmac.c | 1 - net/mptcp/crypto.c | 4 +-- 41 files changed, 69 insertions(+), 104 deletions(-)
Quoted 4 lines
delete mode 100644
include/linux/cryptohash.hbase-commit:
12b3cf9093542d9f752a4968815ece836159013f
All applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <herbert(a)gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt