From 677c2283e7399282bbe9da01dc81b4cc101e978f Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 10 Oct 2016 20:23:57 +0300 Subject: [PATCH] tests: Update eap_proto_psk_errors and ap_wpa2_eap_psk_oom The extension of aes_128_ctr_encrypt() to allow AES-192 and AES-256 to be used in addition to AES-128 for CTR mode encryption resulted in the backtrace for the function calls changing. Update the test cases that started failing due to that change. Signed-off-by: Jouni Malinen --- tests/hwsim/test_ap_eap.py | 4 ++-- tests/hwsim/test_eap_proto.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py index d851c4eda..9c5260c8d 100644 --- a/tests/hwsim/test_ap_eap.py +++ b/tests/hwsim/test_ap_eap.py @@ -2811,7 +2811,7 @@ def test_ap_wpa2_eap_psk_oom(dev, apdev): dev[0].request("REMOVE_NETWORK all") dev[0].wait_disconnected() - tests = [ (1, "aes_128_ctr_encrypt;aes_128_eax_encrypt"), + tests = [ (1, "aes_ctr_encrypt;aes_128_eax_encrypt"), (1, "omac1_aes_128;aes_128_eax_encrypt"), (2, "omac1_aes_128;aes_128_eax_encrypt"), (3, "omac1_aes_128;aes_128_eax_encrypt"), @@ -2819,7 +2819,7 @@ def test_ap_wpa2_eap_psk_oom(dev, apdev): (1, "omac1_aes_128;aes_128_eax_decrypt"), (2, "omac1_aes_128;aes_128_eax_decrypt"), (3, "omac1_aes_128;aes_128_eax_decrypt"), - (1, "aes_128_ctr_encrypt;aes_128_eax_decrypt") ] + (1, "aes_ctr_encrypt;aes_128_eax_decrypt") ] for count, func in tests: with fail_test(dev[0], count, func): dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="PSK", diff --git a/tests/hwsim/test_eap_proto.py b/tests/hwsim/test_eap_proto.py index 5e65475f7..b62fcc309 100644 --- a/tests/hwsim/test_eap_proto.py +++ b/tests/hwsim/test_eap_proto.py @@ -2930,8 +2930,8 @@ def test_eap_proto_psk_errors(dev, apdev): (8, "aes_128_encrypt_block;eap_psk_derive_keys;eap_psk_process_3"), (9, "aes_128_encrypt_block;eap_psk_derive_keys;eap_psk_process_3"), (10, "aes_128_encrypt_block;eap_psk_derive_keys;eap_psk_process_3"), - (1, "aes_128_ctr_encrypt;aes_128_eax_decrypt;eap_psk_process_3"), - (1, "aes_128_ctr_encrypt;aes_128_eax_encrypt;eap_psk_process_3") ] + (1, "aes_ctr_encrypt;aes_128_eax_decrypt;eap_psk_process_3"), + (1, "aes_ctr_encrypt;aes_128_eax_encrypt;eap_psk_process_3") ] for count, func in tests: with fail_test(dev[0], count, func): dev[0].connect("eap-test", key_mgmt="WPA-EAP", scan_freq="2412",