From cf375eb2da67d156b65f5d6556bf2f048fdf5c54 Mon Sep 17 00:00:00 2001 From: Sabrina Dubroca Date: Fri, 12 Aug 2016 15:07:33 +0200 Subject: [PATCH] mka: Simplify ieee802_1x_mka_encode_icv_body() memory copying There is no need to maintain two os_memcpy() calls to cover different cmac lengths. Signed-off-by: Sabrina Dubroca --- src/pae/ieee802_1x_kay.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/pae/ieee802_1x_kay.c b/src/pae/ieee802_1x_kay.c index 3a93323e3..fe442d556 100644 --- a/src/pae/ieee802_1x_kay.c +++ b/src/pae/ieee802_1x_kay.c @@ -1756,12 +1756,9 @@ ieee802_1x_mka_encode_icv_body(struct ieee802_1x_mka_participant *participant, return -1; } - if (length != DEFAULT_ICV_LEN) { - os_memcpy(wpabuf_put(buf, length - MKA_HDR_LEN), cmac, - length - MKA_HDR_LEN); - } else { - os_memcpy(wpabuf_put(buf, length), cmac, length); - } + if (length != DEFAULT_ICV_LEN) + length -= MKA_HDR_LEN; + os_memcpy(wpabuf_put(buf, length), cmac, length); return 0; }