From 51331179361f225d52fcdc60bc026fbb45bac459 Mon Sep 17 00:00:00 2001 From: Mictronics Date: Fri, 27 Dec 2024 16:12:26 +0100 Subject: [PATCH] Fix issue #5665. (#5678) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix issue #5665. --------- Co-authored-by: Ben Meadors Co-authored-by: Thomas Göttgens Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com> --- src/mesh/aes-ccm.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mesh/aes-ccm.cpp b/src/mesh/aes-ccm.cpp index 8bc2989bf..a650ba2fc 100644 --- a/src/mesh/aes-ccm.cpp +++ b/src/mesh/aes-ccm.cpp @@ -18,12 +18,9 @@ static void WPA_PUT_BE16(uint8_t *a, uint16_t val) static void xor_aes_block(uint8_t *dst, const uint8_t *src) { - uint32_t *d = (uint32_t *)dst; - uint32_t *s = (uint32_t *)src; - *d++ ^= *s++; - *d++ ^= *s++; - *d++ ^= *s++; - *d++ ^= *s++; + for (uint8_t i = 0; i < AES_BLOCK_SIZE; i++) { + dst[i] ^= src[i]; + } } static void aes_ccm_auth_start(size_t M, size_t L, const uint8_t *nonce, const uint8_t *aad, size_t aad_len, size_t plain_len, uint8_t *x)