crypto: refactor sha code
Subsystems (2)
Paolo Abeni
cover crypto: refactor sha code
patch 1/4 refactor the crypto code to make it easier transitioning to sha256. It includes feedback from Peter about helper renaming.
The following patches update the rest of the tree to the new helper name. Overall this should generate 3 conflicts along the rebase.
Paolo Abeni (1):
crypto: refactor crypto helpers.
net/mptcp/crypto.c | 142 +++++++++++++++++++++---------------------- net/mptcp/protocol.h | 10 +-- net/mptcp/token.c | 10 +-- 3 files changed, 78 insertions(+), 84 deletions(-)
Signature · 1 line
2.21.0
Paolo Abeni
PATCH 1/4 crypto: refactor crypto helpers.
Rename hash helpers from *_sha1 to *_sha.
Refactor the crypto code to make it easier transitioning to crypto/sha.h primitives (and thus sha256). Additionally, fix 2 buglets:
- mptcp_crypto_hmac_sha() computed uncorrect 'idsn' value on BE systems
- workspace should be clearer _after_ sha computation, to avoid leaking sensitive info
Squash-to: "mptcp: Add key generation and token tree"
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
--- net/mptcp/crypto.c | 142 +++++++++++++++++++++---------------------- net/mptcp/protocol.h | 10 +-- net/mptcp/token.c | 10 +-- 3 files changed, 78 insertions(+), 84 deletions(-)
net/mptcp/crypto.c +68 -74
@@ -22,107 +22,101 @@#include <linux/kernel.h> #include <linux/cryptohash.h> -#include <linux/random.h> -#include <linux/siphash.h> #include <asm/unaligned.h> #include "protocol.h" -void mptcp_crypto_key_sha1 (u64 key,u32 *token,u64 *idsn) -{ +struct sha1_state {u32 workspace[SHA_WORKSPACE_WORDS ]; -u32 mptcp_hashed_key[SHA_DIGEST_WORDS ]; -u8 input[64 ]; +u32 digest[SHA_DIGEST_WORDS ]; +unsigned int count; +}; -memset (workspace,0 ,sizeof (workspace)); +static void sha1_init (struct sha1_state *state) +{ +sha_init (state->digest); + state->count =0 ; +} -/* Initialize input with appropriate padding */ -memset (&input[9 ],0 ,sizeof (input) -10 );/* -10, because the last byte -* is explicitly set too -*/ -put_unaligned_be64 (key, input); - input[8 ] =0x80 ;/* Padding: First bit after message = 1 */ - input[63 ] =0x40 ;/* Padding: Length of the message = 64 bits */ +static void sha1_update (struct sha1_state *state,u8 *input) +{ +sha_transform (state->digest, input, state->workspace); + state->count +=SHA_MESSAGE_BYTES ; +} -sha_init (mptcp_hashed_key); -sha_transform (mptcp_hashed_key, input, workspace); +static void sha1_pad_final (struct sha1_state *state,u8 *input,unsigned length, +__be32 *mptcp_hashed_key) +{ +int i; + + input[length] =0x80 ; +memset (&input[length +1 ],0 ,SHA_MESSAGE_BYTES - length -9 ); +put_unaligned_be64 ((length + state->count) <<3 , + &input[SHA_MESSAGE_BYTES -8 ]); + +sha_transform (state->digest, input, state->workspace); +for (i =0 ; i <SHA_DIGEST_WORDS ; ++i) +put_unaligned_be32 (state->digest[i], &mptcp_hashed_key[i]); + +memzero_explicit (state->workspace,SHA_WORKSPACE_WORDS <<2 ); +} + +void mptcp_crypto_key_sha (u64 key,u32 *token,u64 *idsn) +{ +__be32 mptcp_hashed_key[SHA_DIGEST_WORDS ]; +u8 input[SHA_MESSAGE_BYTES ]; +struct sha1_state state; + +sha1_init (&state); +put_unaligned_be64 (key, input); +sha1_pad_final (&state, input,8 , mptcp_hashed_key);if (token) - *token = mptcp_hashed_key[0 ]; + *token =be32_to_cpu (mptcp_hashed_key[0 ]);if (idsn) - *idsn = ((u64 )mptcp_hashed_key[3 ] <<32 ) + mptcp_hashed_key[4 ]; + *idsn =be64_to_cpu (*((__be64 *)&mptcp_hashed_key[3 ])); } -void mptcp_crypto_hmac_sha1 (u64 key1,u64 key2,u32 nonce1,u32 nonce2, +void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u32 nonce1,u32 nonce2,u32 *hash_out) { -u32 workspace[SHA_WORKSPACE_WORDS ]; -u8 input[128 ];/* 2 512-bit blocks */ +u8 input[SHA_MESSAGE_BYTES *2 ]; +struct sha1_state state; +u8 key1be[8 ]; +u8 key2be[8 ];int i; -int index; -u8 key_1[8 ]; -u8 key_2[8 ]; -u8 nonce_1[4 ]; -u8 nonce_2[4 ]; - -memset (workspace,0 ,sizeof (workspace)); -put_unaligned_be64 (key1, key_1); -put_unaligned_be64 (key2, key_2); -put_unaligned_be32 (nonce1, nonce_1); -put_unaligned_be32 (nonce2, nonce_2); +put_unaligned_be64 (key1, key1be); +put_unaligned_be64 (key2, key2be);/* Generate key xored with ipad */ -memset (input,0x36 ,64 ); +memset (input,0x36 ,SHA_MESSAGE_BYTES );for (i =0 ; i <8 ; i++) - input[i] ^= key_1[i]; + input[i] ^= key1be[i];for (i =0 ; i <8 ; i++) - input[i +8 ] ^= key_2[i]; - - index =64 ; -memcpy (&input[index], nonce_1,4 ); - index =68 ; -memcpy (&input[index], nonce_2,4 ); - index =72 ; + input[i +8 ] ^= key2be[i]; - input[index] =0x80 ;/* Padding: First bit after message = 1 */ -memset (&input[index +1 ],0 , (126 - index)); +put_unaligned_be32 (nonce1, &input[SHA_MESSAGE_BYTES ]); +put_unaligned_be32 (nonce2, &input[SHA_MESSAGE_BYTES +4 ]); -/* Padding: Length of the message = 512 + message length (bits) */ - input[126 ] =0x02 ; - input[127 ] = ((index -64 ) *8 );/* Message length (bits) */ +sha1_init (&state); +sha1_update (&state, input); -sha_init (hash_out); -sha_transform (hash_out, input, workspace); -memset (workspace,0 ,sizeof (workspace)); - -sha_transform (hash_out, &input[64 ], workspace); -memset (workspace,0 ,sizeof (workspace)); - -for (i =0 ; i <5 ; i++) - hash_out[i] = (__force u32 )cpu_to_be32 (hash_out[i]); +/* emit sha256(K1 || msg) on the second input block, so we can +* reuse 'input' for the last hashing +*/ +sha1_pad_final (&state, &input[SHA_MESSAGE_BYTES ],8 , + (__force __be32 *)&input[SHA_MESSAGE_BYTES ]);/* Prepare second part of hmac */ -memset (input,0x5C ,64 ); +memset (input,0x5C ,SHA_MESSAGE_BYTES );for (i =0 ; i <8 ; i++) - input[i] ^= key_1[i]; + input[i] ^= key1be[i];for (i =0 ; i <8 ; i++) - input[i +8 ] ^= key_2[i]; - -memcpy (&input[64 ], hash_out,20 ); - input[84 ] =0x80 ; -memset (&input[85 ],0 ,41 ); - -/* Padding: Length of the message = 512 + 160 bits */ - input[126 ] =0x02 ; - input[127 ] =0xA0 ; - -sha_init (hash_out); -sha_transform (hash_out, input, workspace); -memset (workspace,0 ,sizeof (workspace)); - -sha_transform (hash_out, &input[64 ], workspace); + input[i +8 ] ^= key2be[i]; -for (i =0 ; i <5 ; i++) - hash_out[i] = (__force u32 )cpu_to_be32 (hash_out[i]); +sha1_init (&state); +sha1_update (&state, input); +sha1_pad_final (&state, &input[SHA_MESSAGE_BYTES ],SHA_DIGEST_WORDS <<2 , + (__be32 *)hash_out); }
net/mptcp/protocol.h +5 -5
@@ -128,8 +128,8 @@ int mptcp_token_new_accept(u32 token);void mptcp_token_update_accept (struct sock *sk,struct sock *conn);void mptcp_token_destroy (u32 token); -void mptcp_crypto_key_sha1 (u64 key,u32 *token,u64 *idsn); -static inline void mptcp_crypto_key_gen_sha1 (u64 *key,u32 *token,u64 *idsn) +void mptcp_crypto_key_sha (u64 key,u32 *token,u64 *idsn); +static inline void mptcp_crypto_key_gen_sha (u64 *key,u32 *token,u64 *idsn) {/* we might consider a faster version that computes the key as a * hash of some information available in the MPTCP socket. Use
@@ -138,10 +138,10 @@ static inline void mptcp_crypto_key_gen_sha1(u64 *key, u32 *token, u64 *idsn)* the same time. */ get_random_bytes (key,sizeof (u64)); - mptcp_crypto_key_sha1(*key, token, idsn); + mptcp_crypto_key_sha(*key, token, idsn); } -void mptcp_crypto_hmac_sha1 (u64 key1,u64 key2,u32 nonce1,u32 nonce2, -u32 *hash_out); +void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u32 nonce1,u32 nonce2, +u32 *hash_out);#endif /* __MPTCP_PROTOCOL_H */
net/mptcp/token.c +5 -5
@@ -57,9 +57,9 @@ int mptcp_token_new_request(struct request_sock *req)while (1 ) {u32 token; -mptcp_crypto_key_gen_sha1 (&subflow_req->local_key, - &subflow_req->token, - &subflow_req->idsn); +mptcp_crypto_key_gen_sha (&subflow_req->local_key, + &subflow_req->token, + &subflow_req->idsn);pr_debug ("req=%p local_key=%llu, token=%u, idsn=%llu\n" , req, subflow_req->local_key, subflow_req->token, subflow_req->idsn);
@@ -103,8 +103,8 @@ int mptcp_token_new_connect(struct sock *sk)while (1 ) {u32 token; -mptcp_crypto_key_gen_sha1 (&subflow->local_key, &subflow->token, - &subflow->idsn); +mptcp_crypto_key_gen_sha (&subflow->local_key, &subflow->token, + &subflow->idsn);pr_debug ("ssk=%p, local_key=%llu, token=%u, idsn=%llu\n" , sk, subflow->local_key, subflow->token, subflow->idsn);
Signature · 1 line
2.21.0
Paolo Abeni
PATCH 2/4 squash-to "mptcp: Write MPTCP DSS headers to outgoing data packets"
In reply to Paolo Abeni--- net/mptcp/options.c | 4 ++-- net/mptcp/protocol.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
net/mptcp/options.c +2 -2
@@ -248,8 +248,8 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,if (msk) { opts->ext_copy.data_ack = msk->ack_seq; }else { -mptcp_crypto_key_sha1 (mptcp_subflow_ctx (sk)->remote_key, -NULL , &opts->ext_copy.data_ack); +mptcp_crypto_key_sha (mptcp_subflow_ctx (sk)->remote_key, +NULL , &opts->ext_copy.data_ack); opts->ext_copy.data_ack++; }
net/mptcp/protocol.c +2 -2
@@ -298,7 +298,7 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,mptcp_token_update_accept (new_sock->sk, new_mptcp_sock); msk->subflow =NULL ; -mptcp_crypto_key_sha1 (msk->remote_key,NULL , &ack_seq); +mptcp_crypto_key_sha (msk->remote_key,NULL , &ack_seq); msk->write_seq = subflow->idsn +1 ; ack_seq++; msk->ack_seq = ack_seq;
@@ -426,7 +426,7 @@ void mptcp_finish_connect(struct sock *sk, int mp_capable) msk->token = subflow->token; msk->write_seq = subflow->idsn +1 ; subflow->rel_write_seq =1 ; -mptcp_crypto_key_sha1 (msk->remote_key,NULL , &ack_seq); +mptcp_crypto_key_sha (msk->remote_key,NULL , &ack_seq); ack_seq++; msk->ack_seq = ack_seq;list_add (&subflow->node, &msk->conn_list);
Signature · 1 line
2.21.0
Paolo Abeni
PATCH 3/4 Squash-to: "mptcp: Add handling of outgoing MP_JOIN requests"
In reply to Paolo Abeni--- net/mptcp/subflow.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
net/mptcp/subflow.c +8 -8
@@ -172,9 +172,9 @@ static bool subflow_thmac_valid(struct mptcp_subflow_context *subflow)u8 hmac[MPTCPOPT_HMAC_LEN ];u64 thmac; -mptcp_crypto_hmac_sha1 (subflow->remote_key, subflow->local_key, - subflow->remote_nonce, subflow->local_nonce, - (u32 *)hmac); +mptcp_crypto_hmac_sha (subflow->remote_key, subflow->local_key, + subflow->remote_nonce, subflow->local_nonce, + (u32 *)hmac); thmac =get_unaligned_be64 (hmac); pr_debug("subflow=%p, token=%u, thmac=%llu, subflow->thmac=%llu\n",
@@ -214,10 +214,10 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)return ; } -mptcp_crypto_hmac_sha1 (subflow->local_key, subflow->remote_key, - subflow->local_nonce, - subflow->remote_nonce, - (u32 *)subflow->hmac); +mptcp_crypto_hmac_sha (subflow->local_key, subflow->remote_key, + subflow->local_nonce, + subflow->remote_nonce, + (u32 *)subflow->hmac);mptcp_finish_join (sk); subflow->conn_finished =1 ;
@@ -697,7 +697,7 @@ int mptcp_subflow_connect(struct sock *sk, struct sockaddr *local,if (err) goto failed; -mptcp_crypto_key_sha1 (subflow->remote_key, &remote_token,NULL ); +mptcp_crypto_key_sha (subflow->remote_key, &remote_token,NULL );pr_debug ("msk=%p remote_token=%u" , msk, remote_token); subflow->remote_token = remote_token; subflow->remote_id = remote_id;
Signature · 1 line
2.21.0
Paolo Abeni
PATCH 4/4 Squash-to: mptcp: Add handling of incoming MP_JOIN requests
In reply to Paolo Abeni--- net/mptcp/subflow.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/mptcp/subflow.c +6 -6
@@ -70,9 +70,9 @@ static bool subflow_token_join_request(struct request_sock *req,get_random_bytes (&subflow_req->local_nonce,sizeof (u32)); -mptcp_crypto_hmac_sha1 (msk->local_key, msk->remote_key, - subflow_req->local_nonce, - subflow_req->remote_nonce, (u32 *)hmac); +mptcp_crypto_hmac_sha (msk->local_key, msk->remote_key, + subflow_req->local_nonce, + subflow_req->remote_nonce, (u32 *)hmac); subflow_req->thmac =get_unaligned_be64 (hmac);
@@ -238,9 +238,9 @@ static bool subflow_hmac_valid(const struct request_sock *req,if (!msk)return false; -mptcp_crypto_hmac_sha1 (msk->remote_key, msk->local_key, - subflow_req->remote_nonce, - subflow_req->local_nonce, (u32 *)hmac); +mptcp_crypto_hmac_sha (msk->remote_key, msk->local_key, + subflow_req->remote_nonce, + subflow_req->local_nonce, (u32 *)hmac); ret = true;if (crypto_memneq (hmac, rx_opt->mptcp.hmac,sizeof (hmac)))
Signature · 1 line
2.21.0
Paolo Abeni
Quoted 5 lines · Paolo Abeni
patch 1/4 refactor the crypto code to make it easier transitioning to sha256. It includes feedback from Peter about helper renaming.
The following patches update the rest of the tree to the new helper name. Overall this should generate 3 conflicts along the rebase.
Addendum:
The squashed tree is avaialble here:
https://github.com/pabeni/mptcp/tree/sha_cleanup_2
I verified the new code ensuring that the genrated seq number matched the expectation of the wireshark dissector.
Cheers,
Paolo
Matthieu Baerts
Hi Paolo,
Quoted 3 lines · Paolo Abeni
Quoted 2 lines · Paolo Abeni
patch 1/4 refactor the crypto code to make it easier transitioning to sha256. It includes feedback from Peter about helper renaming.
Thank you for this new version!
It looks good to me after a very very quick review (but the first patch is hard to read).
Quoted 11 lines
Quoted 2 lines
The following patches update the rest of the tree to the new helper name. Overall this should generate 3 conflicts along the rebase.
Addendum:
The squashed tree is avaialble here:
https://github.com/pabeni/mptcp/tree/sha_cleanup_2
I verified the new code ensuring that the genrated seq number matched the expectation of the wireshark dissector.
Great!
Because it looks OK and you checked different stuffs, do you want me to:
- replace the tree with the commits from your branch? (if needed, we can of course do other fixes later)
- stop the CI job, wait for a proper review and then replace the tree?
- or wait for a proper review and then I apply the changes, looking at your branch in case of conflict but doing all of that with TopGit to ease the review? :)
Cheers,
Matt
Quoted 7 lines
Cheers,
Paolo
_______________________________________________
mptcp mailing list -- mptcp(a)lists.01.org
To unsubscribe send an email to mptcp-leave(a)lists.01.org
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
Paolo Abeni
Quoted 26 lines · Matthieu Baerts
Hi Paolo,
Quoted 3 lines · Paolo Abeni
Quoted 2 lines · Paolo Abeni
patch 1/4 refactor the crypto code to make it easier transitioning to sha256. It includes feedback from Peter about helper renaming.
Thank you for this new version!
It looks good to me after a very very quick review (but the first patch is hard to read).
Quoted 11 lines
Quoted 2 lines
The following patches update the rest of the tree to the new helper name. Overall this should generate 3 conflicts along the rebase.
Addendum:
The squashed tree is avaialble here:
https://github.com/pabeni/mptcp/tree/sha_cleanup_2
I verified the new code ensuring that the genrated seq number matched the expectation of the wireshark dissector.
Great!
Quoted 7 lines
Because it looks OK and you checked different stuffs, do you want me to:
- replace the tree with the commits from your branch? (if needed, we can of course do other fixes later)
- stop the CI job, wait for a proper review and then replace the tree?
- or wait for a proper review and then I apply the changes, looking at your branch in case of conflict but doing all of that with TopGit to ease the review? :)
I think the first 2 options are the better ones.
It would be nice if someone give this an additional review ;)
Cheers,
Paolo
Matthieu Baerts
Hi Paolo,
Quoted 35 lines · Paolo Abeni
Quoted 26 lines · Matthieu Baerts
Hi Paolo,
Quoted 3 lines · Paolo Abeni
Quoted 2 lines · Paolo Abeni
patch 1/4 refactor the crypto code to make it easier transitioning to sha256. It includes feedback from Peter about helper renaming.
Thank you for this new version!
It looks good to me after a very very quick review (but the first patch is hard to read).
Quoted 11 lines
Quoted 2 lines
The following patches update the rest of the tree to the new helper name. Overall this should generate 3 conflicts along the rebase.
Addendum:
The squashed tree is avaialble here:
https://github.com/pabeni/mptcp/tree/sha_cleanup_2
I verified the new code ensuring that the genrated seq number matched the expectation of the wireshark dissector.
Great!
Quoted 7 lines
Because it looks OK and you checked different stuffs, do you want me to:
- replace the tree with the commits from your branch? (if needed, we can of course do other fixes later)
- stop the CI job, wait for a proper review and then replace the tree?
- or wait for a proper review and then I apply the changes, looking at your branch in case of conflict but doing all of that with TopGit to ease the review? :)
Quoted 3 lines
I think the first 2 options are the better ones.
It would be nice if someone give this an additional review ;)
OK for me!
I just paused the CI job then. I hope not for too long :-)
Cheers,
Matt
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
Peter Krystad
Hi Paolo & Matt -
Quoted 38 lines · Matthieu Baerts
Hi Paolo,
Quoted 35 lines · Paolo Abeni
Quoted 33 lines · Matthieu Baerts
Hi Paolo,
Quoted 3 lines · Paolo Abeni
Quoted 2 lines · Paolo Abeni
patch 1/4 refactor the crypto code to make it easier transitioning to sha256. It includes feedback from Peter about helper renaming.
Thank you for this new version!
It looks good to me after a very very quick review (but the first patch is hard to read).
Quoted 11 lines
Quoted 2 lines
The following patches update the rest of the tree to the new helper name. Overall this should generate 3 conflicts along the rebase.
Addendum:
The squashed tree is avaialble here:
https://github.com/pabeni/mptcp/tree/sha_cleanup_2
I verified the new code ensuring that the genrated seq number matched the expectation of the wireshark dissector.
Great!
Because it looks OK and you checked different stuffs, do you want me to:
- replace the tree with the commits from your branch? (if needed, we can of course do other fixes later)
- stop the CI job, wait for a proper review and then replace the tree?
- or wait for a proper review and then I apply the changes, looking at your branch in case of conflict but doing all of that with TopGit to ease the review? :)
Quoted 7 lines
Quoted 3 lines
I think the first 2 options are the better ones.
It would be nice if someone give this an additional review ;)
OK for me!
I just paused the CI job then. I hope not for too long :-)
This looks good to me. I'll double-check interop with mptcp.org after it is merged.
Peter.
Quoted 2 lines
Cheers,
Matt
Matthieu Baerts
Hi Peter, Paolo,
Quoted 44 lines · Peter Krystad
Hi Paolo & Matt -
Quoted 40 lines · Matthieu Baerts
Hi Paolo,
Quoted 37 lines · Paolo Abeni
Quoted 26 lines · Matthieu Baerts
Hi Paolo,
Quoted 3 lines · Paolo Abeni
Quoted 2 lines · Paolo Abeni
patch 1/4 refactor the crypto code to make it easier transitioning to sha256. It includes feedback from Peter about helper renaming.
Thank you for this new version!
It looks good to me after a very very quick review (but the first patch is hard to read).
Quoted 11 lines
Quoted 2 lines
The following patches update the rest of the tree to the new helper name. Overall this should generate 3 conflicts along the rebase.
Addendum:
The squashed tree is avaialble here:
https://github.com/pabeni/mptcp/tree/sha_cleanup_2
I verified the new code ensuring that the genrated seq number matched the expectation of the wireshark dissector.
Great!
Quoted 7 lines
Because it looks OK and you checked different stuffs, do you want me to:
- replace the tree with the commits from your branch? (if needed, we can of course do other fixes later)
- stop the CI job, wait for a proper review and then replace the tree?
- or wait for a proper review and then I apply the changes, looking at your branch in case of conflict but doing all of that with TopGit to ease the review? :)I think the first 2 options are the better ones.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
It would be nice if someone give this an additional review ;)
OK for me!
I just paused the CI job then. I hope not for too long :-)
This looks good to me. I'll double-check interop with mptcp.org after it is merged.
Great, thank you for the patches and the reviews!
I just recreated the tree using Paolo's branch. Tests are still OK!
Syncing with the latest net-next now and checking that all commits can still compile.
Cheers,
Matt
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
Peter Krystad
Hi Paolo, Matt -
Quoted 54 lines · Matthieu Baerts
Hi Peter, Paolo,
Quoted 51 lines · Peter Krystad
Hi Paolo & Matt -
Quoted 38 lines · Matthieu Baerts
Hi Paolo,
Quoted 35 lines · Paolo Abeni
Quoted 33 lines · Matthieu Baerts
Hi Paolo,
Quoted 3 lines · Paolo Abeni
Quoted 2 lines · Paolo Abeni
patch 1/4 refactor the crypto code to make it easier transitioning to sha256. It includes feedback from Peter about helper renaming.
Thank you for this new version!
It looks good to me after a very very quick review (but the first patch is hard to read).
Quoted 11 lines
Quoted 2 lines
The following patches update the rest of the tree to the new helper name. Overall this should generate 3 conflicts along the rebase.
Addendum:
The squashed tree is avaialble here:
https://github.com/pabeni/mptcp/tree/sha_cleanup_2
I verified the new code ensuring that the genrated seq number matched the expectation of the wireshark dissector.
Great!
Because it looks OK and you checked different stuffs, do you want me to:
- replace the tree with the commits from your branch? (if needed, we can of course do other fixes later)
- stop the CI job, wait for a proper review and then replace the tree?
- or wait for a proper review and then I apply the changes, looking at your branch in case of conflict but doing all of that with TopGit to ease the review? :)Quoted 7 lines
Quoted 3 lines
I think the first 2 options are the better ones.
It would be nice if someone give this an additional review ;)
OK for me!
I just paused the CI job then. I hope not for too long :-)
This looks good to me. I'll double-check interop with mptcp.org after it is merged.
mptcp.org interop is OK.
Peter.
Quoted 9 lines
Great, thank you for the patches and the reviews!
I just recreated the tree using Paolo's branch. Tests are still OK!
Syncing with the latest net-next now and checking that all commits can still compile.
Cheers,
Matt
Matthieu Baerts
Hi Peter,
Quoted 52 lines · Peter Krystad
Hi Paolo, Matt -
Quoted 48 lines · Matthieu Baerts
Hi Peter, Paolo,
Quoted 45 lines · Peter Krystad
Hi Paolo & Matt -
Quoted 42 lines · Matthieu Baerts
Hi Paolo,
Quoted 38 lines · Paolo Abeni
Quoted 26 lines · Matthieu Baerts
Hi Paolo,
Quoted 3 lines · Paolo Abeni
Quoted 2 lines · Paolo Abeni
patch 1/4 refactor the crypto code to make it easier transitioning to sha256. It includes feedback from Peter about helper renaming.
Thank you for this new version!
It looks good to me after a very very quick review (but the first patch is hard to read).
Quoted 11 lines
Quoted 2 lines
The following patches update the rest of the tree to the new helper name. Overall this should generate 3 conflicts along the rebase.
Addendum:
The squashed tree is avaialble here:
https://github.com/pabeni/mptcp/tree/sha_cleanup_2
I verified the new code ensuring that the genrated seq number matched the expectation of the wireshark dissector.
Great!
Quoted 7 lines
Because it looks OK and you checked different stuffs, do you want me to:
- replace the tree with the commits from your branch? (if needed, we can of course do other fixes later)
- stop the CI job, wait for a proper review and then replace the tree?
- or wait for a proper review and then I apply the changes, looking at your branch in case of conflict but doing all of that with TopGit to ease the review? :)I think the first 2 options are the better ones.
It would be nice if someone give this an additional review ;)
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
OK for me!
I just paused the CI job then. I hope not for too long :-)
This looks good to me. I'll double-check interop with mptcp.org after it is merged.
mptcp.org interop is OK.
Great, thank you for having checked that!
Cheers,
Matt
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