tests: Fix eap_fast_tlv_nak_oom and eap_fast_proto_phase2

Something broke eap_fast_tlv_nak_oom when moving from Ubuntu 14.04 to
16.04. OpenSSL.SSL.Connection() state_string() returns None in these
cases and the debug log prints for that were causing the case to fail.
For now, work around this by checking whether the state string is None
before trying to print it.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/tests/hwsim/test_eap_proto.py b/tests/hwsim/test_eap_proto.py
index b62fcc30982c43d2afebbe5c937b34d14b20bbc7..fe2dccebaab6cd61730b745ac0dc953c69dae8a4 100644 (file)
--- a/tests/hwsim/test_eap_proto.py
+++ b/tests/hwsim/test_eap_proto.py
@@ -8037,31 +8037,43 @@ def run_eap_fast_phase2(dev, test_payload, test_failure=True):
         ctx['sslctx'].set_cipher_list("ADH-AES128-SHA")
         ctx['conn'] = OpenSSL.SSL.Connection(ctx['sslctx'], None)
         ctx['conn'].set_accept_state()
-        logger.info("State: " + ctx['conn'].state_string())
+        state = ctx['conn'].state_string()
+        if state:
+            logger.info("State: " + state)
         ctx['conn'].bio_write(payload)
         try:
             ctx['conn'].do_handshake()
         except OpenSSL.SSL.WantReadError:
             pass
-        logger.info("State: " + ctx['conn'].state_string())
+        state = ctx['conn'].state_string()
+        if state:
+            logger.info("State: " + state)
         data = ctx['conn'].bio_read(4096)
-        logger.info("State: " + ctx['conn'].state_string())
+        state = ctx['conn'].state_string()
+        if state:
+            logger.info("State: " + state)
         return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
                            4 + 1 + 1 + len(data),
                            EAP_TYPE_FAST, 0x01) + data
 
     def process_clientkeyexchange(ctx, payload, appl_data):
         logger.info("Process ClientKeyExchange")
-        logger.info("State: " + ctx['conn'].state_string())
+        state = ctx['conn'].state_string()
+        if state:
+            logger.info("State: " + state)
         ctx['conn'].bio_write(payload)
         try:
             ctx['conn'].do_handshake()
         except OpenSSL.SSL.WantReadError:
             pass
         ctx['conn'].send(appl_data)
-        logger.info("State: " + ctx['conn'].state_string())
+        state = ctx['conn'].state_string()
+        if state:
+            logger.info("State: " + state)
         data = ctx['conn'].bio_read(4096)
-        logger.info("State: " + ctx['conn'].state_string())
+        state = ctx['conn'].state_string()
+        if state:
+            logger.info("State: " + state)
         return struct.pack(">BBHBB", EAP_CODE_REQUEST, ctx['id'],
                            4 + 1 + 1 + len(data),
                            EAP_TYPE_FAST, 0x01) + data