From dde593335808cae97704f0036e92a220a1653075 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sun, 16 Mar 2014 17:57:20 -0400
Subject: change rsa nist loader to use strings for algorithm name

---
 tests/test_utils.py | 6 +++---
 tests/utils.py      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test_utils.py b/tests/test_utils.py
index 433dab04..6d2ef362 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1075,7 +1075,7 @@ def test_load_rsa_nist_vectors():
             "modulus": int("bcb47b2e0dafcba81ff2a2b5cb115ca7e757184c9d72bcdcda"
                            "707a146b3b4e29989d", 16),
             "public_exponent": 65537,
-            "algorithm": b"SHA1",
+            "algorithm": "SHA1",
             "salt_length": 20,
             "msg": b"1248f62a4389f42f7b4bb131053d6c88a994db2075b912ccbe3ea7dc6"
                    b"11714f14e",
@@ -1086,7 +1086,7 @@ def test_load_rsa_nist_vectors():
             "modulus": int("bcb47b2e0dafcba81ff2a2b5cb115ca7e757184c9d72bcdcda"
                            "707a146b3b4e29989d", 16),
             "public_exponent": 65537,
-            "algorithm": b"SHA384",
+            "algorithm": "SHA384",
             "salt_length": 20,
             "msg": b"e511903c2f1bfba245467295ac95413ac4746c984c3750a728c388aa6"
                    b"28b0ebf",
@@ -1096,7 +1096,7 @@ def test_load_rsa_nist_vectors():
         {
             "modulus": 78187493520,
             "public_exponent": 65537,
-            "algorithm": b"SHA512",
+            "algorithm": "SHA512",
             "salt_length": 20,
             "msg": b"3456781293fab829",
             "s": b"deadbeef0000"
diff --git a/tests/utils.py b/tests/utils.py
index 720a9054..6a8a2b5e 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -329,7 +329,7 @@ def load_rsa_nist_vectors(vector_data):
                 "modulus": n,
                 "public_exponent": e,
                 "salt_length": salt_length,
-                "algorithm": value.encode("ascii")
+                "algorithm": value
             }
             data.append(test_data)
             continue
-- 
cgit v1.2.3