DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Minor formatting changes to CCMP test vectors

Browse source 
Signed-off-by: Henry Ptasinski <henry@e78com.com>
This commit is contained in:
Henry Ptasinski 2023-07-13 15:29:32 +02:00 committed by Jouni Malinen
parent 30771e6e05
commit 34841cfd9a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wlantest/ccmp.c
View file

@ -172,7 +172,7 @@ u8 * ccmp_decrypt(const u8 *tk, const struct ieee80211_hdr *hdr,
os_memset(aad, 0, sizeof(aad)); os_memset(aad, 0, sizeof(aad));
ccmp_aad_nonce(hdr, data, a1, a2, a3, aad, &aad_len, nonce); 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 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, if (aes_ccm_ad(tk, 16, nonce, 8, data + 8, mlen, aad, aad_len,
data + 8 + mlen, plain) < 0) { 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)); os_memset(aad, 0, sizeof(aad));
ccmp_aad_nonce(hdr, crypt + hdrlen, a1, a2, a3, aad, &aad_len, nonce); 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 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, if (aes_ccm_ae(tk, 16, nonce, 8, frame + hdrlen, plen, aad, aad_len,
pos, pos + plen) < 0) { 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)); os_memset(aad, 0, sizeof(aad));
ccmp_aad_nonce_pv1(crypt, a1, a2, a3, pn, aad, &aad_len, nonce); 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 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, if (aes_ccm_ae(tk, 16, nonce, 8, frame + hdrlen, plen, aad, aad_len,
pos, pos + plen) < 0) { pos, pos + plen) < 0) {

6
wlantest/test_vectors.c
View file

@ -200,7 +200,7 @@ static void test_vector_ccmp_pv1(void)
wpa_hexdump(MSG_INFO, "PN (PN0..PN5)", pn, sizeof(pn)); wpa_hexdump(MSG_INFO, "PN (PN0..PN5)", pn, sizeof(pn));
wpa_printf(MSG_INFO, 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); fc = WPA_GET_LE16(frame1);
wpa_printf(MSG_INFO, 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)", "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_hexdump(MSG_INFO, "Encrypted Frame FCS", fcs, sizeof(fcs));
wpa_printf(MSG_INFO, 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); fc = WPA_GET_LE16(frame2);
wpa_printf(MSG_INFO, 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)", "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_hexdump(MSG_INFO, "Encrypted Frame FCS", fcs, sizeof(fcs));
wpa_printf(MSG_INFO, 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); fc = WPA_GET_LE16(frame3);
wpa_printf(MSG_INFO, 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)", "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)",