mesh: Fix decryption when on more than one Network
PATCH v2 1/1 mesh: Fix decryption when on more than one Network
Multiple networks use different IV Index's, so we should only use decryption cache after successful decoding.
--- mesh/net-keys.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
mesh/net-keys.c +7 -4
@@ -216,8 +216,14 @@ uint32_t net_key_decrypt(uint32_t iv_index, const uint8_t *pkt, size_t len,if (iv_pkt != iv_flag) iv_index--; -if (cache_len == len &&memcmp (pkt, cache_pkt, len) ==0 ) +/* If we already successfully decrypted this packet, use cached data */ +if (cache_id && cache_len == len && !memcmp (pkt, cache_pkt, len)) { +/* IV Index must match what was used to decrypt */ +if (cache_iv_index != iv_index) +return 0 ; + goto done; + } cache_id =0 ;memcpy (cache_pkt, pkt, len);
@@ -228,9 +234,6 @@ uint32_t net_key_decrypt(uint32_t iv_index, const uint8_t *pkt, size_t len,l_queue_foreach (keys, decrypt_net_pkt,NULL ); done: -if (cache_iv_index != iv_index) -return 0 ; -if (cache_id) { *plain = cache_plain; *plain_len = cache_plainlen;
Signature · 1 line
2.14.5
Patch Applied
Quoted 40 lines · Brian Gix
Multiple networks use different IV Index's, so we should only use decryption cache after successful decoding.
--- mesh/net-keys.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)mesh/net-keys.c +1
-1@@ -216,8 +216,14 @@ uint32_t net_key_decrypt(uint32_t iv_index, const uint8_t *pkt, size_t len, if (iv_pkt != iv_flag) iv_index--; - if (cache_len == len && memcmp(pkt, cache_pkt, len) == 0) + /* If we already successfully decrypted this packet, use cacheddata */
mesh/net-keys.c +1
-0+ if (cache_id && cache_len == len && !memcmp(pkt, cache_pkt,len)) {
mesh/net-keys.c +5
-3+/* IV Index must match what was used to decrypt */ +if (cache_iv_index != iv_index) +return 0 ; + goto done; + } cache_id =0 ;memcpy (cache_pkt, pkt, len);@@ -228,9 +234,6 @@ uint32_t net_key_decrypt(uint32_t iv_index, const uint8_t *pkt, size_t len,l_queue_foreach (keys ,decrypt_net_pkt ,NULL ); done: -if (cache_iv_index != iv_index) -return 0 ; -if (cache_id) { *plain = cache_plain;
*plain_len=cache_plainlen;