jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Enable Suite B test cases with GnuTLS

Browse source 
Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2017-12-28 18:48:23 +02:00
parent 0039b972af
commit 9acd0bebab
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tests/hwsim/test_suite_b.py
View file

@ -22,6 +22,8 @@ def check_suite_b_capa(dev):
def check_suite_b_tls_lib(dev): def check_suite_b_tls_lib(dev):
tls = dev[0].request("GET tls_library") tls = dev[0].request("GET tls_library")
if tls.startswith("GnuTLS"):
return
if not tls.startswith("OpenSSL"): if not tls.startswith("OpenSSL"):
raise HwsimSkip("TLS library not supported for Suite B: " + tls) raise HwsimSkip("TLS library not supported for Suite B: " + tls)
supported = False supported = False
@ -64,7 +66,8 @@ def test_suite_b(dev, apdev):
private_key="auth_serv/ec-user.key", private_key="auth_serv/ec-user.key",
pairwise="GCMP", group="GCMP", scan_freq="2412") pairwise="GCMP", group="GCMP", scan_freq="2412")
tls_cipher = dev[0].get_status_field("EAP TLS cipher") tls_cipher = dev[0].get_status_field("EAP TLS cipher")
if tls_cipher != "ECDHE-ECDSA-AES128-GCM-SHA256": if tls_cipher != "ECDHE-ECDSA-AES128-GCM-SHA256" and \
tls_cipher != "ECDHE-ECDSA-AES-128-GCM-AEAD":
raise Exception("Unexpected TLS cipher: " + tls_cipher) raise Exception("Unexpected TLS cipher: " + tls_cipher)
bss = dev[0].get_bss(apdev[0]['bssid']) bss = dev[0].get_bss(apdev[0]['bssid'])
@ -171,7 +174,8 @@ def test_suite_b_192(dev, apdev):
private_key="auth_serv/ec2-user.key", private_key="auth_serv/ec2-user.key",
pairwise="GCMP-256", group="GCMP-256", scan_freq="2412") pairwise="GCMP-256", group="GCMP-256", scan_freq="2412")
tls_cipher = dev[0].get_status_field("EAP TLS cipher") tls_cipher = dev[0].get_status_field("EAP TLS cipher")
if tls_cipher != "ECDHE-ECDSA-AES256-GCM-SHA384": if tls_cipher != "ECDHE-ECDSA-AES256-GCM-SHA384" and \
tls_cipher != "ECDHE-ECDSA-AES-256-GCM-AEAD":
raise Exception("Unexpected TLS cipher: " + tls_cipher) raise Exception("Unexpected TLS cipher: " + tls_cipher)
cipher = dev[0].get_status_field("mgmt_group_cipher") cipher = dev[0].get_status_field("mgmt_group_cipher")
if cipher != "BIP-GMAC-256": if cipher != "BIP-GMAC-256":
@ -351,7 +355,10 @@ def run_suite_b_192_rsa(dev, apdev, no_ecdh=False, no_dhe=False):
private_key="auth_serv/rsa3072-user.key", private_key="auth_serv/rsa3072-user.key",
pairwise="GCMP-256", group="GCMP-256", scan_freq="2412") pairwise="GCMP-256", group="GCMP-256", scan_freq="2412")
tls_cipher = dev[0].get_status_field("EAP TLS cipher") tls_cipher = dev[0].get_status_field("EAP TLS cipher")
if tls_cipher != "ECDHE-RSA-AES256-GCM-SHA384" and tls_cipher != "DHE-RSA-AES256-GCM-SHA384": if tls_cipher != "ECDHE-RSA-AES256-GCM-SHA384" and \
tls_cipher != "DHE-RSA-AES256-GCM-SHA384" and \
tls_cipher != "ECDHE-RSA-AES-256-GCM-AEAD" and \
tls_cipher != "DHE-RSA-AES-256-GCM-AEAD":
raise Exception("Unexpected TLS cipher: " + tls_cipher) raise Exception("Unexpected TLS cipher: " + tls_cipher)
cipher = dev[0].get_status_field("mgmt_group_cipher") cipher = dev[0].get_status_field("mgmt_group_cipher")
if cipher != "BIP-GMAC-256": if cipher != "BIP-GMAC-256":
@ -401,7 +408,10 @@ def test_suite_b_192_rsa_insufficient_key(dev, apdev):
dev[0].request("DISCONNECT") dev[0].request("DISCONNECT")
if ev is None: if ev is None:
raise Exception("Certificate error not reported") raise Exception("Certificate error not reported")
if "reason=11" not in ev or "err='Insufficient RSA modulus size'" not in ev: if "reason=11" in ev and "err='Insufficient RSA modulus size'" in ev:
return
if "reason=7" in ev and "err='certificate uses insecure algorithm'" in ev:
return
raise Exception("Unexpected error reason: " + ev) raise Exception("Unexpected error reason: " + ev)
def test_suite_b_192_rsa_insufficient_dh(dev, apdev): def test_suite_b_192_rsa_insufficient_dh(dev, apdev):
@ -470,5 +480,6 @@ def test_suite_b_192_rsa_radius(dev, apdev):
pairwise="GCMP-256", group="GCMP-256", pairwise="GCMP-256", group="GCMP-256",
group_mgmt="BIP-GMAC-256", scan_freq="2412") group_mgmt="BIP-GMAC-256", scan_freq="2412")
tls_cipher = dev[0].get_status_field("EAP TLS cipher") tls_cipher = dev[0].get_status_field("EAP TLS cipher")
if tls_cipher != "ECDHE-RSA-AES256-GCM-SHA384": if tls_cipher != "ECDHE-RSA-AES256-GCM-SHA384" and \
tls_cipher != "ECDHE-RSA-AES-256-GCM-AEAD":
raise Exception("Unexpected TLS cipher: " + tls_cipher) raise Exception("Unexpected TLS cipher: " + tls_cipher)