mptcp: use HMAC-SHA256 library instead of open-coded HMAC
Subsystems (4)
PATCH 1/1 mptcp: use HMAC-SHA256 library instead of open-coded HMAC
Now that there are easy-to-use HMAC-SHA256 library functions, use these in net/mptcp/crypto.c instead of open-coding the HMAC algorithm.
Remove the WARN_ON_ONCE() for messages longer than SHA256_DIGEST_SIZE. The new implementation handles all message lengths correctly.
The mptcp-crypto KUnit test still passes after this change.
--- net/mptcp/crypto.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-)
net/mptcp/crypto.c +2 -33
@@ -20,11 +20,10 @@* Brandon Heller <[email protected]> */ #include <linux/kernel.h> #include <crypto/sha2.h> -#include <linux/unaligned.h> #include "protocol.h" #define SHA256_DIGEST_WORDS (SHA256_DIGEST_SIZE / 4)
@@ -41,43 +40,13 @@ void mptcp_crypto_key_sha(u64 key, u32 *token, u64 *idsn) *idsn =be64_to_cpu (*((__be64 *)&mptcp_hashed_key[6 ])); }void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u8 *msg,int len,void *hmac) { -u8 input[SHA256_BLOCK_SIZE +SHA256_DIGEST_SIZE ]; -u8 key1be[8 ]; -u8 key2be[8 ]; -int i; +__be64 key[2 ] = {cpu_to_be64 (key1),cpu_to_be64 (key2) }; -if (WARN_ON_ONCE (len >SHA256_DIGEST_SIZE )) - len =SHA256_DIGEST_SIZE ; - -put_unaligned_be64 (key1, key1be); -put_unaligned_be64 (key2, key2be); - -/* Generate key xored with ipad */ -memset (input,0x36 ,SHA256_BLOCK_SIZE ); -for (i =0 ; i <8 ; i++) - input[i] ^= key1be[i]; -for (i =0 ; i <8 ; i++) - input[i +8 ] ^= key2be[i]; - -memcpy (&input[SHA256_BLOCK_SIZE ], msg, len); - -/* emit sha256(K1 || msg) on the second input block, so we can -* reuse 'input' for the last hashing -*/ -sha256 (input,SHA256_BLOCK_SIZE + len, &input[SHA256_BLOCK_SIZE ]); - -/* Prepare second part of hmac */ -memset (input,0x5C ,SHA256_BLOCK_SIZE ); -for (i =0 ; i <8 ; i++) - input[i] ^= key1be[i]; -for (i =0 ; i <8 ; i++) - input[i +8 ] ^= key2be[i]; - -sha256 (input,SHA256_BLOCK_SIZE +SHA256_DIGEST_SIZE , hmac); +hmac_sha256_usingrawkey ((const u8 *)key,sizeof (key), msg, len, hmac); }#if IS_MODULE (CONFIG_MPTCP_KUNIT_TEST )EXPORT_SYMBOL_GPL (mptcp_crypto_hmac_sha);#endif
base-commit: d6084bb815c453de27af8071a23163a711586a6c
Signature · 1 line
2.50.1
Hi Eric,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal: Success! ✅
- KVM Validation: debug: Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/16658838455
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/d5f8f0fd881e
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=987466
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-normalFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)
Hi Eric,
Quoted 7 lines · Eric Biggers
Now that there are easy-to-use HMAC-SHA256 library functions, use these in
net/mptcp/crypto.cinstead of open-coding the HMAC algorithm.Remove the
WARN_ON_ONCE()for messages longer thanSHA256_DIGEST_SIZE. The new implementation handles all message lengths correctly.The mptcp-crypto KUnit test still passes after this change.
Thank you for this patch! It is a good idea, and it looks good to me!
One small detail: net-next is currently closed [1], and I don't think this patch can be applied in -net. So except if you plan to take it in the libcrypto tree for 6.17 -- but that's probably strange -- what I can do is to apply it in the MPTCP tree, and send it to net-next later on. Is this OK for you?
[1] https://patchwork.hopto.org/net-next.html
Cheers,
Matt
--
pw-bot: defer
Signature · 1 line
Sponsored by the NGI0 Core fund.
Quoted 21 lines · Matthieu Baerts
Hi Eric,
Quoted 7 lines · Eric Biggers
Now that there are easy-to-use HMAC-SHA256 library functions, use these in
net/mptcp/crypto.cinstead of open-coding the HMAC algorithm.Remove the
WARN_ON_ONCE()for messages longer thanSHA256_DIGEST_SIZE. The new implementation handles all message lengths correctly.The mptcp-crypto KUnit test still passes after this change.
Thank you for this patch! It is a good idea, and it looks good to me!
Reviewed-by Matthieu Baerts (NGI0) <[email protected]>One small detail: net-next is currently closed [1], and I don't think this patch can be applied in -net. So except if you plan to take it in the libcrypto tree for 6.17 -- but that's probably strange -- what I can do is to apply it in the MPTCP tree, and send it to net-next later on. Is this OK for you?
Quoted 5 lines
[1] https://patchwork.hopto.org/net-next.html
Cheers,
Matt
--
The MPTCP tree (and then net-next) for 6.18 is fine. I know this isn't a great time to send patches, but I just happened to have some time now.
- Eric
Hi Eric,
Quoted 22 lines · Eric Biggers
Quoted 21 lines · Matthieu Baerts
Hi Eric,
Quoted 7 lines · Eric Biggers
Now that there are easy-to-use HMAC-SHA256 library functions, use these in
net/mptcp/crypto.cinstead of open-coding the HMAC algorithm.Remove the
WARN_ON_ONCE()for messages longer thanSHA256_DIGEST_SIZE. The new implementation handles all message lengths correctly.The mptcp-crypto KUnit test still passes after this change.
Thank you for this patch! It is a good idea, and it looks good to me!
Reviewed-by Matthieu Baerts (NGI0) <[email protected]>One small detail: net-next is currently closed [1], and I don't think this patch can be applied in -net. So except if you plan to take it in the libcrypto tree for 6.17 -- but that's probably strange -- what I can do is to apply it in the MPTCP tree, and send it to net-next later on. Is this OK for you?
Quoted 8 lines
Quoted 5 lines
[1] https://patchwork.hopto.org/net-next.html
Cheers,
Matt
--The MPTCP tree (and then net-next) for 6.18 is fine. I know this isn't a great time to send patches, but I just happened to have some time now.
No problem, having this patch now is fine for MPTCP. I just queued it for 6.18.
Applied in our tree (feat. for net-next):
New patches for t/upstream:
- 1eadc6f75c43: mptcp: use HMAC-SHA256 library instead of open-coded HMAC
- Results: 94c274f914c9..5c7ec796258e (export)
Cheers,
Matt
Signature · 1 line
Sponsored by the NGI0 Core fund.