From 34841cfd9aba6d75f4aa9b2f1cea6c6514e86956 Mon Sep 17 00:00:00 2001 From: Henry Ptasinski Date: Thu, 13 Jul 2023 15:29:32 +0200 Subject: [PATCH] Minor formatting changes to CCMP test vectors Signed-off-by: Henry Ptasinski --- wlantest/ccmp.c | 6 +++--- wlantest/test_vectors.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wlantest/ccmp.c b/wlantest/ccmp.c index e1978e787..d6594b9ca 100644 --- a/wlantest/ccmp.c +++ b/wlantest/ccmp.c @@ -172,7 +172,7 @@ u8 * ccmp_decrypt(const u8 *tk, const struct ieee80211_hdr *hdr, os_memset(aad, 0, sizeof(aad)); ccmp_aad_nonce(hdr, data, a1, a2, a3, aad, &aad_len, nonce); wpa_hexdump(MSG_EXCESSIVE, "CCMP AAD", aad, aad_len); - wpa_hexdump(MSG_EXCESSIVE, "CCMP nonce", nonce, 13); + wpa_hexdump(MSG_EXCESSIVE, "CCM Nonce", nonce, 13); if (aes_ccm_ad(tk, 16, nonce, 8, data + 8, mlen, aad, aad_len, data + 8 + mlen, plain) < 0) { @@ -237,7 +237,7 @@ u8 * ccmp_encrypt(const u8 *tk, u8 *frame, size_t len, size_t hdrlen, os_memset(aad, 0, sizeof(aad)); ccmp_aad_nonce(hdr, crypt + hdrlen, a1, a2, a3, aad, &aad_len, nonce); wpa_hexdump(MSG_EXCESSIVE, "CCMP AAD", aad, aad_len); - wpa_hexdump(MSG_EXCESSIVE, "CCMP nonce", nonce, 13); + wpa_hexdump(MSG_EXCESSIVE, "CCM Nonce", nonce, 13); if (aes_ccm_ae(tk, 16, nonce, 8, frame + hdrlen, plen, aad, aad_len, pos, pos + plen) < 0) { @@ -279,7 +279,7 @@ u8 * ccmp_encrypt_pv1(const u8 *tk, const u8 *a1, const u8 *a2, const u8 *a3, os_memset(aad, 0, sizeof(aad)); ccmp_aad_nonce_pv1(crypt, a1, a2, a3, pn, aad, &aad_len, nonce); wpa_hexdump(MSG_EXCESSIVE, "CCMP AAD", aad, aad_len); - wpa_hexdump(MSG_EXCESSIVE, "CCMP nonce", nonce, sizeof(nonce)); + wpa_hexdump(MSG_EXCESSIVE, "CCM Nonce", nonce, sizeof(nonce)); if (aes_ccm_ae(tk, 16, nonce, 8, frame + hdrlen, plen, aad, aad_len, pos, pos + plen) < 0) { diff --git a/wlantest/test_vectors.c b/wlantest/test_vectors.c index c228488ba..f2517cb8c 100644 --- a/wlantest/test_vectors.c +++ b/wlantest/test_vectors.c @@ -200,7 +200,7 @@ static void test_vector_ccmp_pv1(void) wpa_hexdump(MSG_INFO, "PN (PN0..PN5)", pn, sizeof(pn)); wpa_printf(MSG_INFO, - "\nPV1 test vector #1:\nHeader compression used and A3 was previously stored at the receiver\n"); + "\nPV1 test vector #1:\nHeader compression used and A3 was previously stored at the receiver"); fc = WPA_GET_LE16(frame1); wpa_printf(MSG_INFO, "FC=0x%04x (PV=%u Type=%u PTID/Subtype=%u From_DS=%u More_Fragments=%u Power_Management=%u More_Data=%u Protected_Frame=%u End_of_SP=%u Relayed_Frame=%u Ack_Policy=%u)", @@ -249,7 +249,7 @@ static void test_vector_ccmp_pv1(void) wpa_hexdump(MSG_INFO, "Encrypted Frame FCS", fcs, sizeof(fcs)); wpa_printf(MSG_INFO, - "\nPV1 test vector #2:\nHeader compression used and A3 was not previously stored at the receiver\n"); + "\nPV1 test vector #2:\nHeader compression used and A3 was not previously stored at the receiver"); fc = WPA_GET_LE16(frame2); wpa_printf(MSG_INFO, "FC=0x%04x (PV=%u Type=%u PTID/Subtype=%u From_DS=%u More_Fragments=%u Power_Management=%u More_Data=%u Protected_Frame=%u End_of_SP=%u Relayed_Frame=%u Ack_Policy=%u)", @@ -299,7 +299,7 @@ static void test_vector_ccmp_pv1(void) wpa_hexdump(MSG_INFO, "Encrypted Frame FCS", fcs, sizeof(fcs)); wpa_printf(MSG_INFO, - "\nPV1 test vector #3:\nType 3 frame from SA to DA(=BSSID) (i.e., no separate DA in this example)\n"); + "\nPV1 test vector #3:\nType 3 frame from SA to DA(=BSSID) (i.e., no separate DA in this example)"); fc = WPA_GET_LE16(frame3); wpa_printf(MSG_INFO, "FC=0x%04x (PV=%u Type=%u PTID/Subtype=%u From_DS=%u More_Fragments=%u Power_Management=%u More_Data=%u Protected_Frame=%u End_of_SP=%u Relayed_Frame=%u Ack_Policy=%u)",