From 674758ed5994daa0620b69dd7a610b2006b6efdb Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 3 May 2020 11:43:23 +0300 Subject: [PATCH] tests: Provide digestmod to hmac.new() for Python 3.8 Python 3.8 removed the previously used default of MD5 algorithm, so provide the explicit digestmod=hashlib.md5 parameter to the couple of places that were missing it. Signed-off-by: Jouni Malinen --- tests/hwsim/test_eap_proto.py | 2 +- tests/hwsim/test_radius.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/test_eap_proto.py b/tests/hwsim/test_eap_proto.py index 59519bd6b..7494b429a 100644 --- a/tests/hwsim/test_eap_proto.py +++ b/tests/hwsim/test_eap_proto.py @@ -106,7 +106,7 @@ def start_radius_server(eap_handler): logger.info("No EAP request available") reply.code = pyrad.packet.AccessChallenge - hmac_obj = hmac.new(reply.secret) + hmac_obj = hmac.new(reply.secret, digestmod=hashlib.md5) hmac_obj.update(struct.pack("B", reply.code)) hmac_obj.update(struct.pack("B", reply.id)) diff --git a/tests/hwsim/test_radius.py b/tests/hwsim/test_radius.py index 84163f36d..16a29ec85 100644 --- a/tests/hwsim/test_radius.py +++ b/tests/hwsim/test_radius.py @@ -760,7 +760,7 @@ def test_radius_das_disconnect(dev, apdev): def add_message_auth_req(req): req.authenticator = req.CreateAuthenticator() - hmac_obj = hmac.new(req.secret) + hmac_obj = hmac.new(req.secret, digestmod=hashlib.md5) hmac_obj.update(struct.pack("B", req.code)) hmac_obj.update(struct.pack("B", req.id)) @@ -1046,7 +1046,7 @@ def test_radius_protocol(dev, apdev): pw = b"incorrect" else: pw = reply.secret - hmac_obj = hmac.new(pw) + hmac_obj = hmac.new(pw, digestmod=hashlib.md5) hmac_obj.update(struct.pack("B", reply.code)) hmac_obj.update(struct.pack("B", reply.id)) @@ -1389,7 +1389,7 @@ def test_radius_auth_force_invalid_client_addr(dev, apdev): def add_message_auth(req): req.authenticator = req.CreateAuthenticator() - hmac_obj = hmac.new(req.secret) + hmac_obj = hmac.new(req.secret, digestmod=hashlib.md5) hmac_obj.update(struct.pack("B", req.code)) hmac_obj.update(struct.pack("B", req.id))