Commit 9503ca2c authored by Eric Biggers's avatar Eric Biggers
Browse files

lib/crypto: sha1: Rename sha1_init() to sha1_init_raw() 



Rename the existing sha1_init() to sha1_init_raw(), since it conflicts
with the upcoming library function.  This will later be removed, but
this keeps the kernel building for the introduction of the library.

Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250712232329.818226-3-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@kernel.org>
parent 56119446

include/crypto/sha1.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct sha1_state { 
 */

#define SHA1_DIGEST_WORDS	(SHA1_DIGEST_SIZE / 4)

#define SHA1_WORKSPACE_WORDS	16

void sha1_init(__u32 *buf);

void sha1_init_raw(__u32 *buf);

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



#endif /* _CRYPTO_SHA1_H */

kernel/bpf/core.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ int bpf_prog_calc_tag(struct bpf_prog *fp) 
	if (!raw)

		return -ENOMEM;



	sha1_init(digest);

	sha1_init_raw(digest);

	memset(ws, 0, sizeof(ws));



	/* We need to take out the map fd for the digest calculation

lib/crypto/sha1.c

+3 −3
Original line number Diff line number Diff line
@@ -124,10 +124,10 @@ void sha1_transform(__u32 *digest, const char *data, __u32 *array) 
EXPORT_SYMBOL(sha1_transform);



/**

 * sha1_init - initialize the vectors for a SHA1 digest

 * sha1_init_raw - initialize the vectors for a SHA1 digest

 * @buf: vector to initialize

 */

void sha1_init(__u32 *buf)

void sha1_init_raw(__u32 *buf)

{

	buf[0] = 0x67452301;

	buf[1] = 0xefcdab89;
@@ -135,7 +135,7 @@ void sha1_init(__u32 *buf) 
	buf[3] = 0x10325476;

	buf[4] = 0xc3d2e1f0;

}

EXPORT_SYMBOL(sha1_init);

EXPORT_SYMBOL(sha1_init_raw);



MODULE_DESCRIPTION("SHA-1 Algorithm");

MODULE_LICENSE("GPL");

net/ipv6/addrconf.c

+1 −1
Original line number Diff line number Diff line
@@ -3367,7 +3367,7 @@ static int ipv6_generate_stable_address(struct in6_addr *address, 
retry:

	spin_lock_bh(&lock);



	sha1_init(digest);

	sha1_init_raw(digest);

	memset(&data, 0, sizeof(data));

	memset(workspace, 0, sizeof(workspace));

	memcpy(data.hwaddr, idev->dev->perm_addr, idev->dev->addr_len);