IEEE P802.11ah/D10.0 PV1 CCMP test vectors
[mech_eap.git] / wlantest / test_vectors.c
index c17e92e..b15e5b3 100644 (file)
 
 #include "utils/common.h"
 #include "utils/eloop.h"
+#include "common/ieee802_11_defs.h"
 #include "wlantest.h"
 
 
-extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-
-
 static void test_vector_tkip(void)
 {
        u8 tk[] = {
@@ -140,6 +137,212 @@ static void test_vector_ccmp(void)
 }
 
 
+static void test_vector_ccmp_pv1(void)
+{
+       u8 tk[] = { 0xc9, 0x7c, 0x1f, 0x67, 0xce, 0x37, 0x11, 0x85,
+                   0x51, 0x4a, 0x8a, 0x19, 0xf2, 0xbd, 0xd5, 0x2f };
+       u8 pn[8];
+       u8 frame1[] = {
+               0x61, 0x00, 0xa2, 0xae, 0xa5, 0xb8, 0xfc, 0xba,
+               0x07, 0x00, 0x80, 0x33,
+               0xf8, 0xba, 0x1a, 0x55, 0xd0, 0x2f, 0x85, 0xae,
+               0x96, 0x7b, 0xb6, 0x2f, 0xb6, 0xcd, 0xa8, 0xeb,
+               0x7e, 0x78, 0xa0, 0x50
+       };
+       u8 frame2[] = {
+               0x61, 0x00, 0xa2, 0xae, 0xa5, 0xb8, 0xfc, 0xba,
+               0x07, 0x20, 0x80, 0x33, 0x02, 0xd2, 0xe1, 0x28,
+               0xa5, 0x7c,
+               0xf8, 0xba, 0x1a, 0x55, 0xd0, 0x2f, 0x85, 0xae,
+               0x96, 0x7b, 0xb6, 0x2f, 0xb6, 0xcd, 0xa8, 0xeb,
+               0x7e, 0x78, 0xa0, 0x50
+       };
+       u8 frame3[] = {
+               0x6d, 0x00, 0xa2, 0xae, 0xa5, 0xb8, 0xfc, 0xba,
+               0x52, 0x30, 0xf1, 0x84, 0x44, 0x08, 0x80, 0x33,
+               0xf8, 0xba, 0x1a, 0x55, 0xd0, 0x2f, 0x85, 0xae,
+               0x96, 0x7b, 0xb6, 0x2f, 0xb6, 0xcd, 0xa8, 0xeb,
+               0x7e, 0x78, 0xa0, 0x50
+       };
+       u8 *enc;
+       size_t enc_len;
+       u8 fcs[4];
+       u8 bssid[ETH_ALEN] = { 0xa2, 0xae, 0xa5, 0xb8, 0xfc, 0xba };
+       u8 da[ETH_ALEN] = { 0x02, 0xd2, 0xe1, 0x28, 0xa5, 0x7c };
+       u8 sa[ETH_ALEN] = { 0x52, 0x30, 0xf1, 0x84, 0x44, 0x08 };
+       u16 aid = 7;
+       u32 bpn = 123;
+       u16 sc = 0x3380;
+       int key_id = 0;
+       u16 fc;
+       int tid = 3;
+       u16 sid;
+
+       wpa_printf(MSG_INFO,
+                  "\nIEEE P802.11ah/D10.0, J.6.4 CCMP PV1 test vectors\n");
+
+       wpa_printf(MSG_INFO, "BSSID: " MACSTR, MAC2STR(bssid));
+       wpa_printf(MSG_INFO, "DA: " MACSTR, MAC2STR(da));
+       wpa_printf(MSG_INFO, "SA: " MACSTR, MAC2STR(sa));
+       wpa_printf(MSG_INFO, "Association ID: %u", aid);
+       wpa_printf(MSG_INFO, "Base PN: %u (0x%08x)", bpn, bpn);
+       wpa_printf(MSG_INFO, "SC = 0x%04x (FragNum=%u SeqNum=%u)",
+                  sc, WLAN_GET_SEQ_FRAG(sc), WLAN_GET_SEQ_SEQ(sc));
+       wpa_printf(MSG_INFO, "TID = %u", tid);
+       wpa_printf(MSG_INFO, "Key ID: %u", key_id);
+       wpa_hexdump(MSG_INFO, "TK", tk, sizeof(tk));
+       wpa_printf(MSG_INFO, "PN = SC||BPN");
+       WPA_PUT_LE16(&pn[0], sc);
+       WPA_PUT_LE32(&pn[2], bpn);
+       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");
+       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)",
+                  fc,
+                  fc & WLAN_FC_PVER,
+                  (fc & (BIT(2) | BIT(3) | BIT(4))) >> 2,
+                  (fc & (BIT(5) | BIT(6) | BIT(7))) >> 5,
+                  !!(fc & BIT(8)),
+                  !!(fc & BIT(9)),
+                  !!(fc & BIT(10)),
+                  !!(fc & BIT(11)),
+                  !!(fc & BIT(12)),
+                  !!(fc & BIT(13)),
+                  !!(fc & BIT(14)),
+                  !!(fc & BIT(15)));
+       wpa_printf(MSG_INFO, "A1=" MACSTR, MAC2STR(&frame1[2]));
+       sid = WPA_GET_LE16(&frame1[8]);
+       wpa_printf(MSG_INFO,
+                  "A2=%02x %02x (SID: AID=%u A3_Present=%u A4_Present=%u A-MSDU=%u); corresponds to 52:30:f1:84:44:08 in uncompressed header",
+                  frame1[8], frame1[9],
+                  sid & ~(BIT(13) | BIT(14) | BIT(15)),
+                  !!(sid & BIT(13)),
+                  !!(sid & BIT(14)),
+                  !!(sid & BIT(15)));
+       sc = WPA_GET_LE16(&frame1[10]);
+       wpa_printf(MSG_INFO, "Sequence Control: %02x %02x (FN=%u SN=%u)",
+                  frame1[10], frame1[11],
+                  WLAN_GET_SEQ_FRAG(sc), WLAN_GET_SEQ_SEQ(sc));
+       wpa_printf(MSG_INFO, "A3 not present; corresponds to 02:d2:e1:28:a5:7c in uncompressed header");
+       wpa_printf(MSG_INFO, "A4 not present");
+       wpa_hexdump(MSG_INFO, "Plaintext Frame Header", frame1, 12);
+       wpa_hexdump(MSG_INFO, "Plaintext Frame Body",
+                   frame1 + 12, sizeof(frame1) - 12);
+
+       enc = ccmp_encrypt_pv1(tk, &frame1[2], sa, da, frame1, sizeof(frame1),
+                              12, pn, key_id, &enc_len);
+       if (enc == NULL) {
+               wpa_printf(MSG_ERROR, "Failed to encrypt CCMP frame");
+               return;
+       }
+
+       wpa_hexdump(MSG_INFO, "Encrypted Frame Header", enc, 12);
+       wpa_hexdump(MSG_INFO, "Encrypted Frame Frame Body",
+                   enc + 12, enc_len - 12);
+       WPA_PUT_LE32(fcs, crc32(enc, enc_len));
+       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");
+       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)",
+                  fc,
+                  fc & WLAN_FC_PVER,
+                  (fc & (BIT(2) | BIT(3) | BIT(4))) >> 2,
+                  (fc & (BIT(5) | BIT(6) | BIT(7))) >> 5,
+                  !!(fc & BIT(8)),
+                  !!(fc & BIT(9)),
+                  !!(fc & BIT(10)),
+                  !!(fc & BIT(11)),
+                  !!(fc & BIT(12)),
+                  !!(fc & BIT(13)),
+                  !!(fc & BIT(14)),
+                  !!(fc & BIT(15)));
+       wpa_printf(MSG_INFO, "A1=" MACSTR, MAC2STR(&frame2[2]));
+       sid = WPA_GET_LE16(&frame2[8]);
+       wpa_printf(MSG_INFO,
+                  "A2=%02x %02x (SID: AID=%u A3_Present=%u A4_Present=%u A-MSDU=%u); corresponds to 52:30:f1:84:44:08 in uncompressed header",
+                  frame2[8], frame2[9],
+                  sid & ~(BIT(13) | BIT(14) | BIT(15)),
+                  !!(sid & BIT(13)),
+                  !!(sid & BIT(14)),
+                  !!(sid & BIT(15)));
+       sc = WPA_GET_LE16(&frame2[10]);
+       wpa_printf(MSG_INFO, "Sequence Control: %02x %02x (FN=%u SN=%u)",
+                  frame2[10], frame2[11],
+                  WLAN_GET_SEQ_FRAG(sc), WLAN_GET_SEQ_SEQ(sc));
+       wpa_printf(MSG_INFO, "A3=" MACSTR, MAC2STR(&frame2[12]));
+       wpa_printf(MSG_INFO, "A4 not present");
+       wpa_hexdump(MSG_INFO, "Plaintext Frame Header", frame2, 18);
+       wpa_hexdump(MSG_INFO, "Plaintext Frame Body",
+                   frame2 + 18, sizeof(frame2) - 18);
+
+       enc = ccmp_encrypt_pv1(tk, &frame2[2], sa, &frame2[12],
+                              frame2, sizeof(frame2), 18, pn, key_id,
+                              &enc_len);
+       if (enc == NULL) {
+               wpa_printf(MSG_ERROR, "Failed to encrypt CCMP frame");
+               return;
+       }
+
+       wpa_hexdump(MSG_INFO, "Encrypted Frame Header", enc, 18);
+       wpa_hexdump(MSG_INFO, "Encrypted Frame Frame Body",
+                   enc + 18, enc_len - 18);
+       WPA_PUT_LE32(fcs, crc32(enc, enc_len));
+       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");
+       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)",
+                  fc,
+                  fc & WLAN_FC_PVER,
+                  (fc & (BIT(2) | BIT(3) | BIT(4))) >> 2,
+                  (fc & (BIT(5) | BIT(6) | BIT(7))) >> 5,
+                  !!(fc & BIT(8)),
+                  !!(fc & BIT(9)),
+                  !!(fc & BIT(10)),
+                  !!(fc & BIT(11)),
+                  !!(fc & BIT(12)),
+                  !!(fc & BIT(13)),
+                  !!(fc & BIT(14)),
+                  !!(fc & BIT(15)));
+       wpa_printf(MSG_INFO, "A1=" MACSTR, MAC2STR(&frame3[2]));
+       wpa_printf(MSG_INFO, "A2=" MACSTR, MAC2STR(&frame3[8]));
+       sc = WPA_GET_LE16(&frame3[14]);
+       wpa_printf(MSG_INFO, "Sequence Control: %02x %02x (FN=%u SN=%u)",
+                  frame3[14], frame3[15],
+                  WLAN_GET_SEQ_FRAG(sc), WLAN_GET_SEQ_SEQ(sc));
+       wpa_printf(MSG_INFO,
+                  "A3 not present; corresponds to 02:d2:e1:28:a5:7c in uncompressed header");
+       wpa_printf(MSG_INFO, "A4 not present");
+       wpa_hexdump(MSG_INFO, "Plaintext Frame Header", frame3, 16);
+       wpa_hexdump(MSG_INFO, "Plaintext Frame Body",
+                   frame3 + 16, sizeof(frame3) - 16);
+
+       enc = ccmp_encrypt_pv1(tk, &frame3[2], &frame3[8], da,
+                              frame3, sizeof(frame3), 16, pn, key_id,
+                              &enc_len);
+       if (enc == NULL) {
+               wpa_printf(MSG_ERROR, "Failed to encrypt CCMP frame");
+               return;
+       }
+
+       wpa_hexdump(MSG_INFO, "Encrypted Frame Header", enc, 16);
+       wpa_hexdump(MSG_INFO, "Encrypted Frame Frame Body",
+                   enc + 16, enc_len - 16);
+       WPA_PUT_LE32(fcs, crc32(enc, enc_len));
+       wpa_hexdump(MSG_INFO, "Encrypted Frame FCS", fcs, sizeof(fcs));
+
+       wpa_debug_level = MSG_INFO;
+}
+
+
 static void test_vector_bip(void)
 {
        u8 igtk[] = {
@@ -163,7 +366,8 @@ static void test_vector_bip(void)
        wpa_hexdump(MSG_INFO, "IPN", ipn, sizeof(ipn));
        wpa_hexdump(MSG_INFO, "Plaintext frame", frame, sizeof(frame));
 
-       prot = bip_protect(igtk, frame, sizeof(frame), ipn, 4, &prot_len);
+       prot = bip_protect(igtk, sizeof(igtk), frame, sizeof(frame),
+                          ipn, 4, &prot_len);
        if (prot == NULL) {
                wpa_printf(MSG_ERROR, "Failed to protect BIP frame");
                return;
@@ -235,7 +439,7 @@ struct gcmp_test {
        u8 encr[300];
 };
 
-static struct gcmp_test gcmp_vectors[] =
+static const struct gcmp_test gcmp_vectors[] =
 {
        {
                .tk = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
@@ -351,7 +555,7 @@ static struct gcmp_test gcmp_vectors[] =
 };
 
 
-static int run_gcmp(int idx, struct gcmp_test *vector)
+static int run_gcmp(int idx, const struct gcmp_test *vector)
 {
        u8 *enc, *plain;
        size_t enc_len, plain_len;
@@ -437,7 +641,7 @@ static int test_vector_gcmp(void)
 }
 
 
-static void test_vector_gcmp_256(void)
+static int test_vector_gcmp_256(void)
 {
        u8 tk[] = { 0xc9, 0x7c, 0x1f, 0x67, 0xce, 0x37, 0x11, 0x85,
                    0x51, 0x4a, 0x8a, 0x19, 0xf2, 0xbd, 0xd5, 0x2f,
@@ -457,11 +661,26 @@ static void test_vector_gcmp_256(void)
                0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
                0x26, 0x27
        };
+       u8 encr[] = {
+               0x88, 0x48, 0x0b, 0x00, 0x0f, 0xd2, 0xe1, 0x28,
+               0xa5, 0x7c, 0x50, 0x30, 0xf1, 0x84, 0x44, 0x08,
+               0x50, 0x30, 0xf1, 0x84, 0x44, 0x08, 0x80, 0x33,
+               0x03, 0x00, 0x08, 0x2b, 0x00, 0x20, 0x5f, 0x5f,
+               0x89, 0x00, 0x65, 0x83, 0x43, 0xc8, 0xb1, 0x44,
+               0x47, 0xd9, 0x21, 0x1d, 0xef, 0xd4, 0x6a, 0xd8,
+               0x9c, 0x71, 0x0c, 0x6f, 0xc3, 0x33, 0x33, 0x23,
+               0x6e, 0x39, 0x97, 0xb9, 0x17, 0x6a, 0x5a, 0x8b,
+               0xe7, 0x79, 0xb2, 0x12, 0x66, 0x55, 0x5e, 0x70,
+               0xad, 0x79, 0x11, 0x43, 0x16, 0x85, 0x90, 0x95,
+               0x47, 0x3d, 0x5b, 0x1b, 0xd5, 0x96, 0xb3, 0xde,
+               0xa3, 0xbf
+       };
        u8 *enc, *plain;
        size_t enc_len, plain_len;
        u8 fcs[4];
+       int err = 0;
 
-       wpa_printf(MSG_INFO, "\nGCMP-256 test vector\n");
+       wpa_printf(MSG_INFO, "\nIEEE P802.11ac/D7.0, M.11.1 GCMP-256 test vector\n");
 
        wpa_hexdump(MSG_INFO, "TK", tk, sizeof(tk));
        wpa_hexdump(MSG_INFO, "PN", pn, sizeof(pn));
@@ -472,10 +691,14 @@ static void test_vector_gcmp_256(void)
                           pn, 0, &enc_len);
        if (enc == NULL) {
                wpa_printf(MSG_ERROR, "Failed to encrypt GCMP frame");
-               return;
+               return 1;
        }
 
        wpa_hexdump(MSG_INFO, "Encrypted MPDU (without FCS)", enc, enc_len);
+       if (enc_len != sizeof(encr) || os_memcmp(enc, encr, enc_len) != 0) {
+               wpa_printf(MSG_ERROR, "GCMP-256 test vector mismatch");
+               err++;
+       }
        WPA_PUT_LE32(fcs, crc32(enc, enc_len));
        wpa_hexdump(MSG_INFO, "FCS", fcs, sizeof(fcs));
 
@@ -487,20 +710,23 @@ static void test_vector_gcmp_256(void)
 
        if (plain == NULL) {
                wpa_printf(MSG_ERROR, "Failed to decrypt GCMP frame");
-               return;
+               return 1;
        }
 
        if (plain_len != sizeof(frame) - 26 ||
            os_memcmp(plain, frame + 26, plain_len) != 0) {
                wpa_hexdump(MSG_ERROR, "Decryption result did not match",
                            plain, plain_len);
+               err++;
        }
 
        os_free(plain);
+
+       return err;
 }
 
 
-static void test_vector_ccmp_256(void)
+static int test_vector_ccmp_256(void)
 {
        u8 tk[] = { 0xc9, 0x7c, 0x1f, 0x67, 0xce, 0x37, 0x11, 0x85,
                    0x51, 0x4a, 0x8a, 0x19, 0xf2, 0xbd, 0xd5, 0x2f,
@@ -515,11 +741,24 @@ static void test_vector_ccmp_256(void)
                0x96, 0x7b, 0xb6, 0x2f, 0xb6, 0xcd, 0xa8, 0xeb,
                0x7e, 0x78, 0xa0, 0x50
        };
+       u8 encr[] = {
+               0x08, 0x48, 0xc3, 0x2c, 0x0f, 0xd2, 0xe1, 0x28,
+               0xa5, 0x7c, 0x50, 0x30, 0xf1, 0x84, 0x44, 0x08,
+               0xab, 0xae, 0xa5, 0xb8, 0xfc, 0xba, 0x80, 0x33,
+               0x0c, 0xe7, 0x00, 0x20, 0x76, 0x97, 0x03, 0xb5,
+               0x6d, 0x15, 0x5d, 0x88, 0x32, 0x66, 0x82, 0x56,
+               0xd6, 0xa9, 0x2b, 0x78, 0xe1, 0x1d, 0x8e, 0x54,
+               0x49, 0x5d, 0xd1, 0x74, 0x80, 0xaa, 0x56, 0xc9,
+               0x49, 0x2e, 0x88, 0x2b, 0x97, 0x64, 0x2f, 0x80,
+               0xd5, 0x0f, 0xe9, 0x7b
+
+       };
        u8 *enc, *plain;
        size_t enc_len, plain_len;
        u8 fcs[4];
+       int err = 0;
 
-       wpa_printf(MSG_INFO, "\nCCMP-256 test vector\n");
+       wpa_printf(MSG_INFO, "\nIEEE P802.11ac/D7.0, M.6.4 CCMP-256 test vector\n");
 
        wpa_hexdump(MSG_INFO, "TK", tk, sizeof(tk));
        wpa_hexdump(MSG_INFO, "PN", pn, sizeof(pn));
@@ -530,10 +769,14 @@ static void test_vector_ccmp_256(void)
                               &enc_len);
        if (enc == NULL) {
                wpa_printf(MSG_ERROR, "Failed to encrypt CCMP frame");
-               return;
+               return 1;
        }
 
        wpa_hexdump(MSG_INFO, "Encrypted MPDU (without FCS)", enc, enc_len);
+       if (enc_len != sizeof(encr) || os_memcmp(enc, encr, enc_len) != 0) {
+               wpa_printf(MSG_ERROR, "CCMP-256 test vector mismatch");
+               err++;
+       }
        WPA_PUT_LE32(fcs, crc32(enc, enc_len));
        wpa_hexdump(MSG_INFO, "FCS", fcs, sizeof(fcs));
 
@@ -545,20 +788,23 @@ static void test_vector_ccmp_256(void)
 
        if (plain == NULL) {
                wpa_printf(MSG_ERROR, "Failed to decrypt CCMP-256 frame");
-               return;
+               return 1;
        }
 
        if (plain_len != sizeof(frame) - 24 ||
            os_memcmp(plain, frame + 24, plain_len) != 0) {
                wpa_hexdump(MSG_ERROR, "Decryption result did not match",
                            plain, plain_len);
+               err++;
        }
 
        os_free(plain);
+
+       return err;
 }
 
 
-static void test_vector_bip_gmac_128(void)
+static int test_vector_bip_gmac_128(void)
 {
        u8 igtk[] = {
                0x4e, 0xa9, 0x54, 0x3e, 0x09, 0xcf, 0x2b, 0x1e,
@@ -571,10 +817,20 @@ static void test_vector_bip_gmac_128(void)
                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
                0x02, 0x00
        };
+       u8 res[] = {
+               0xc0, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+               0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+               0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+               0x02, 0x00, 0x4c, 0x18, 0x04, 0x00, 0x04, 0x00,
+               0x00, 0x00, 0x00, 0x00, 0x3e, 0xd8, 0x62, 0xfb,
+               0x0f, 0x33, 0x38, 0xdd, 0x33, 0x86, 0xc8, 0x97,
+               0xe2, 0xed, 0x05, 0x3d
+       };
        u8 *prot;
        size_t prot_len;
+       int err = 0;
 
-       wpa_printf(MSG_INFO, "\nBIP-GMAC-128 with broadcast "
+       wpa_printf(MSG_INFO, "\nIEEE P802.11ac/D7.0, M.9.1 BIP-GMAC-128 with broadcast "
                   "Deauthentication frame\n");
 
        wpa_hexdump(MSG_INFO, "IGTK", igtk, sizeof(igtk));
@@ -585,15 +841,21 @@ static void test_vector_bip_gmac_128(void)
                                ipn, 4, &prot_len);
        if (prot == NULL) {
                wpa_printf(MSG_ERROR, "Failed to protect BIP-GMAC-128 frame");
-               return;
+               return 1;
        }
 
        wpa_hexdump(MSG_INFO, "Protected MPDU (without FCS)", prot, prot_len);
+       if (prot_len != sizeof(res) || os_memcmp(res, prot, prot_len) != 0) {
+               wpa_printf(MSG_ERROR, "BIP-GMAC-128 test vector mismatch");
+               err++;
+       }
        os_free(prot);
+
+       return err;
 }
 
 
-static void test_vector_bip_gmac_256(void)
+static int test_vector_bip_gmac_256(void)
 {
        u8 igtk[] = {
                0x4e, 0xa9, 0x54, 0x3e, 0x09, 0xcf, 0x2b, 0x1e,
@@ -608,11 +870,20 @@ static void test_vector_bip_gmac_256(void)
                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
                0x02, 0x00
        };
+       u8 res[] = {
+               0xc0, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+               0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+               0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+               0x02, 0x00, 0x4c, 0x18, 0x04, 0x00, 0x04, 0x00,
+               0x00, 0x00, 0x00, 0x00, 0x23, 0xbe, 0x59, 0xdc,
+               0xc7, 0x02, 0x2e, 0xe3, 0x83, 0x62, 0x7e, 0xbb,
+               0x10, 0x17, 0xdd, 0xfc
+       };
        u8 *prot;
        size_t prot_len;
+       int err = 0;
 
-       wpa_printf(MSG_INFO, "\nBIP-GMAC-256 with broadcast "
-                  "Deauthentication frame\n");
+       wpa_printf(MSG_INFO, "\nIEEE P802.11ac/D7.0, M.9.1 BIP-GMAC-256 with broadcast Deauthentication frame\n");
 
        wpa_hexdump(MSG_INFO, "IGTK", igtk, sizeof(igtk));
        wpa_hexdump(MSG_INFO, "IPN", ipn, sizeof(ipn));
@@ -622,11 +893,17 @@ static void test_vector_bip_gmac_256(void)
                                ipn, 4, &prot_len);
        if (prot == NULL) {
                wpa_printf(MSG_ERROR, "Failed to protect BIP-GMAC-256 frame");
-               return;
+               return 1;
        }
 
        wpa_hexdump(MSG_INFO, "Protected MPDU (without FCS)", prot, prot_len);
+       if (prot_len != sizeof(res) || os_memcmp(res, prot, prot_len) != 0) {
+               wpa_printf(MSG_ERROR, "BIP-GMAC-128 test vector mismatch");
+               err++;
+       }
        os_free(prot);
+
+       return err;
 }
 
 
@@ -642,13 +919,14 @@ int main(int argc, char *argv[])
 
        test_vector_tkip();
        test_vector_ccmp();
+       test_vector_ccmp_pv1();
        test_vector_bip();
        test_vector_ccmp_mgmt();
        errors += test_vector_gcmp();
-       test_vector_gcmp_256();
-       test_vector_ccmp_256();
-       test_vector_bip_gmac_128();
-       test_vector_bip_gmac_256();
+       errors += test_vector_gcmp_256();
+       errors += test_vector_ccmp_256();
+       errors += test_vector_bip_gmac_128();
+       errors += test_vector_bip_gmac_256();
 
        if (errors)
                wpa_printf(MSG_INFO, "One or more test vectors failed");