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

crypto: lib/sha1 - rename "sha" to "sha1" 



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>.

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

Documentation/security/siphash.rst

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE