Remove low-level SHA-1 functions
Subsystems (5)
Eric Biggers
maintainercover Remove low-level SHA-1 functions
This series updates net/ipv6/addrconf.c to use the regular SHA-1 functions, then removes sha1_init_raw() and sha1_transform().
Please consider these for net-next.
(These were originally patches 25-26 of the series
https://lore.kernel.org/linux-crypto/[email protected]/ )
Eric Biggers (2):
ipv6: Switch to higher-level SHA-1 functions lib/crypto: sha1: Remove low-level functions from API
include/crypto/sha1.h | 10 ------- lib/crypto/sha1.c | 63 ++++++++++++------------------------------- net/ipv6/addrconf.c | 21 +++++++++------ 3 files changed, 30 insertions(+), 64 deletions(-)
base-commit: 31d44a37820f00de8156d1c1960dbf1bf04263c2
Signature · 1 line
2.52.0
Eric Biggers
maintainerPATCH 1/2 ipv6: Switch to higher-level SHA-1 functions
There's now a proper SHA-1 API that follows the usual conventions for hash function APIs: sha1_init(), sha1_update(), sha1_final(), sha1(). The only remaining user of the older low-level SHA-1 API, sha1_init_raw() and sha1_transform(), is ipv6_generate_stable_address(). I'd like to remove this older API, which is too low-level.
Unfortunately, ipv6_generate_stable_address() does in fact skip the SHA-1 finalization for some reason. So the values it computes are not standard SHA-1 values, and it sort of does want the low-level API.
Still, it's still possible to use the higher-level functions sha1_init() and sha1_update() to get the same result, provided that the resulting state is used directly, skipping sha1_final().
So, let's do that instead. This will allow removing the low-level API.
--- net/ipv6/addrconf.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
net/ipv6/addrconf.c +13 -8
@@ -3337,15 +3337,14 @@ static bool ipv6_reserved_interfaceid(struct in6_addr address) static int ipv6_generate_stable_address(struct in6_addr *address, u8 dad_count, const struct inet6_dev *idev) { static DEFINE_SPINLOCK(lock); - static __u32 digest[SHA1_DIGEST_WORDS]; - static __u32 workspace[SHA1_WORKSPACE_WORDS]; + static struct sha1_ctx sha_ctx; static union { - char __data[SHA1_BLOCK_SIZE]; + u8 __data[SHA1_BLOCK_SIZE]; struct { struct in6_addr secret; __be32 prefix[2]; unsigned char hwaddr[MAX_ADDR_LEN]; u8 dad_count;
@@ -3366,24 +3365,30 @@ static int ipv6_generate_stable_address(struct in6_addr *address,return -1 ; retry:spin_lock_bh (&lock); -sha1_init_raw (digest); +sha1_init (&sha_ctx); +memset (&data,0 ,sizeof (data)); -memset (workspace,0 ,sizeof (workspace));memcpy (data.hwaddr, idev->dev->perm_addr, idev->dev->addr_len); data.prefix[0 ] = address->s6_addr32[0 ]; data.prefix[1 ] = address->s6_addr32[1 ]; data.secret = secret; data.dad_count = dad_count; -sha1_transform (digest, data.__data, workspace); +sha1_update (&sha_ctx, data.__data,sizeof (data)); +/* +* Note that the SHA-1 finalization is omitted here, and the digest is +* pulled directly from the internal SHA-1 state (making it incompatible +* with standard SHA-1). Unusual, but technically okay since the data +* length is fixed and is a multiple of the SHA-1 block size. +*/ temp = *address; - temp.s6_addr32[2 ] = (__force __be32 )digest[0 ]; - temp.s6_addr32[3 ] = (__force __be32 )digest[1 ]; + temp.s6_addr32[2 ] = (__force __be32 )sha_ctx.state.h[0 ]; + temp.s6_addr32[3 ] = (__force __be32 )sha_ctx.state.h[1 ];spin_unlock_bh (&lock);if (ipv6_reserved_interfaceid (temp)) { dad_count++;
Signature · 1 line
2.52.0
Re: [PATCH net-next 1/2] ipv6: Switch to higher-level SHA-1 functions
Quoted 14 lines · Eric Biggers
There's now a proper SHA-1 API that follows the usual conventions for hash function APIs:
sha1_init(),sha1_update(),sha1_final(),sha1(). The only remaining user of the older low-level SHA-1 API,sha1_init_raw()andsha1_transform(), isipv6_generate_stable_address(). I'd like to remove this older API, which is too low-level.Unfortunately,
ipv6_generate_stable_address()does in fact skip the SHA-1 finalization for some reason. So the values it computes are not standard SHA-1 values, and it sort of does want the low-level API.Still, it's still possible to use the higher-level functions
sha1_init()andsha1_update()to get the same result, provided that the resulting state is used directly, skippingsha1_final().
Quoted 8 lines
So, let's do that instead. This will allow removing the low-level API.
Reviewed-by Ard Biesheuvel <[email protected]>Signed-off-by Eric Biggers <[email protected]>--- net/ipv6/addrconf.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
Eric Biggers
maintainerPATCH 2/2 lib/crypto: sha1: Remove low-level functions from API
In reply to Eric BiggersNow that there are no users of the low-level SHA-1 interface, remove it.
Specifically:
- Remove SHA1_DIGEST_WORDS (no longer used)
- Remove sha1_init_raw() (no longer used)
- Rename sha1_transform() to sha1_block_generic() and make it static
- Move SHA1_WORKSPACE_WORDS into lib/crypto/sha1.c
--- include/crypto/sha1.h | 10 ------- lib/crypto/sha1.c | 63 ++++++++++++------------------------------- 2 files changed, 17 insertions(+), 56 deletions(-)
include/crypto/sha1.h +0 -10
@@ -24,20 +24,10 @@ struct sha1_state {u32 state[SHA1_DIGEST_SIZE /4 ];u64 count;u8 buffer[SHA1_BLOCK_SIZE ]; }; -/* -* 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_raw (__u32 *buf); -void sha1_transform (__u32 *digest,const char *data,__u32 *W ); -/* State for the SHA-1 compression function */ struct sha1_block_state {u32 h[SHA1_DIGEST_SIZE /4 ]; };
lib/crypto/sha1.c +17 -46
105 lines not on this page · raw message
Signature · 1 line
2.52.0
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 22 Jan 2026 21:16:54 -0800 you wrote:
This series updates
net/ipv6/addrconf.cto use the regular SHA-1 functions, then removessha1_init_raw()andsha1_transform().Please consider these for net-next.
(These were originally patches 25-26 of the series
https://lore.kernel.org/linux-crypto/[email protected]/ )[...]
Here is the summary with links:
- [net-next,1/2] ipv6: Switch to higher-level SHA-1 functions
https://git.kernel.org/netdev/net-next/c/5023479627e3
- [net-next,2/2] lib/crypto: sha1: Remove low-level functions from API
https://git.kernel.org/netdev/net-next/c/9ddfabcc1ed8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html