aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/hazmat/primitives/test_3des.py42
-rw-r--r--tests/hazmat/primitives/test_aes.py18
-rw-r--r--tests/hazmat/primitives/test_arc4.py2
-rw-r--r--tests/hazmat/primitives/test_blowfish.py22
-rw-r--r--tests/hazmat/primitives/test_camellia.py22
-rw-r--r--tests/hazmat/primitives/test_cast5.py2
6 files changed, 43 insertions, 65 deletions
diff --git a/tests/hazmat/primitives/test_3des.py b/tests/hazmat/primitives/test_3des.py
index 35745310..0db56f47 100644
--- a/tests/hazmat/primitives/test_3des.py
+++ b/tests/hazmat/primitives/test_3des.py
@@ -37,10 +37,8 @@ class TestTripleDES_CBC(object):
"TCBCvarkey.rsp",
"TCBCvartext.rsp",
],
- lambda **kwargs: algorithms.TripleDES(
- binascii.unhexlify(kwargs["keys"])
- ),
- lambda **kwargs: modes.CBC(binascii.unhexlify(kwargs["iv"])),
+ lambda keys, **kwargs: algorithms.TripleDES(binascii.unhexlify(keys)),
+ lambda iv, **kwargs: modes.CBC(binascii.unhexlify(iv)),
)
test_MMT = generate_encrypt_test(
@@ -51,10 +49,10 @@ class TestTripleDES_CBC(object):
"TCBCMMT2.rsp",
"TCBCMMT3.rsp",
],
- lambda **kwargs: algorithms.TripleDES(binascii.unhexlify(
- kwargs["key1"] + kwargs["key2"] + kwargs["key3"]
- )),
- lambda **kwargs: modes.CBC(binascii.unhexlify(kwargs["iv"])),
+ lambda key1, key2, key3, **kwargs: algorithms.TripleDES(
+ binascii.unhexlify(key1 + key2 + key3)
+ ),
+ lambda iv, **kwargs: modes.CBC(binascii.unhexlify(iv)),
)
@@ -69,10 +67,8 @@ class TestTripleDES_OFB(object):
"TOFBvartext.rsp",
"TOFBinvperm.rsp",
],
- lambda **kwargs: algorithms.TripleDES(
- binascii.unhexlify(kwargs["keys"])
- ),
- lambda **kwargs: modes.OFB(binascii.unhexlify(kwargs["iv"])),
+ lambda keys, **kwargs: algorithms.TripleDES(binascii.unhexlify(keys)),
+ lambda iv, **kwargs: modes.OFB(binascii.unhexlify(iv)),
)
test_MMT = generate_encrypt_test(
@@ -83,10 +79,10 @@ class TestTripleDES_OFB(object):
"TOFBMMT2.rsp",
"TOFBMMT3.rsp",
],
- lambda **kwargs: algorithms.TripleDES(binascii.unhexlify(
- kwargs["key1"] + kwargs["key2"] + kwargs["key3"]
- )),
- lambda **kwargs: modes.OFB(binascii.unhexlify(kwargs["iv"])),
+ lambda key1, key2, key3, **kwargs: algorithms.TripleDES(
+ binascii.unhexlify(key1 + key2 + key3)
+ ),
+ lambda iv, **kwargs: modes.OFB(binascii.unhexlify(iv)),
)
@@ -101,10 +97,8 @@ class TestTripleDES_CFB(object):
"TCFB64varkey.rsp",
"TCFB64vartext.rsp",
],
- lambda **kwargs: algorithms.TripleDES(
- binascii.unhexlify(kwargs["keys"])
- ),
- lambda **kwargs: modes.CFB(binascii.unhexlify(kwargs["iv"])),
+ lambda keys, **kwargs: algorithms.TripleDES(binascii.unhexlify(keys)),
+ lambda iv, **kwargs: modes.CFB(binascii.unhexlify(iv)),
)
test_MMT = generate_encrypt_test(
@@ -115,8 +109,8 @@ class TestTripleDES_CFB(object):
"TCFB64MMT2.rsp",
"TCFB64MMT3.rsp",
],
- lambda **kwargs: algorithms.TripleDES(binascii.unhexlify(
- kwargs["key1"] + kwargs["key2"] + kwargs["key3"]
- )),
- lambda **kwargs: modes.CFB(binascii.unhexlify(kwargs["iv"])),
+ lambda key1, key2, key3, **kwargs: algorithms.TripleDES(
+ binascii.unhexlify(key1 + key2 + key3)
+ ),
+ lambda iv, **kwargs: modes.CFB(binascii.unhexlify(iv)),
)
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py
index d706cbd8..9e5a3cb5 100644
--- a/tests/hazmat/primitives/test_aes.py
+++ b/tests/hazmat/primitives/test_aes.py
@@ -45,8 +45,8 @@ class TestAES(object):
"CBCMMT192.rsp",
"CBCMMT256.rsp",
],
- lambda **kwargs: algorithms.AES(binascii.unhexlify(kwargs["key"])),
- lambda **kwargs: modes.CBC(binascii.unhexlify(kwargs["iv"])),
+ lambda key, **kwargs: algorithms.AES(binascii.unhexlify(key)),
+ lambda iv, **kwargs: modes.CBC(binascii.unhexlify(iv)),
)
test_ECB = generate_encrypt_test(
@@ -69,7 +69,7 @@ class TestAES(object):
"ECBMMT192.rsp",
"ECBMMT256.rsp",
],
- lambda **kwargs: algorithms.AES(binascii.unhexlify(kwargs["key"])),
+ lambda key, **kwargs: algorithms.AES(binascii.unhexlify(key)),
lambda **kwargs: modes.ECB(),
)
@@ -93,8 +93,8 @@ class TestAES(object):
"OFBMMT192.rsp",
"OFBMMT256.rsp",
],
- lambda **kwargs: algorithms.AES(binascii.unhexlify(kwargs["key"])),
- lambda **kwargs: modes.OFB(binascii.unhexlify(kwargs["iv"])),
+ lambda key, **kwargs: algorithms.AES(binascii.unhexlify(key)),
+ lambda iv, **kwargs: modes.OFB(binascii.unhexlify(iv)),
)
test_CFB = generate_encrypt_test(
@@ -117,16 +117,16 @@ class TestAES(object):
"CFB128MMT192.rsp",
"CFB128MMT256.rsp",
],
- lambda **kwargs: algorithms.AES(binascii.unhexlify(kwargs["key"])),
- lambda **kwargs: modes.CFB(binascii.unhexlify(kwargs["iv"])),
+ lambda key, **kwargs: algorithms.AES(binascii.unhexlify(key)),
+ lambda iv, **kwargs: modes.CFB(binascii.unhexlify(iv)),
)
test_CTR = generate_encrypt_test(
load_openssl_vectors,
os.path.join("ciphers", "AES", "CTR"),
["aes-128-ctr.txt", "aes-192-ctr.txt", "aes-256-ctr.txt"],
- lambda **kwargs: algorithms.AES(binascii.unhexlify(kwargs["key"])),
- lambda **kwargs: modes.CTR(binascii.unhexlify(kwargs["iv"])),
+ lambda key, **kwargs: algorithms.AES(binascii.unhexlify(key)),
+ lambda iv, **kwargs: modes.CTR(binascii.unhexlify(iv)),
only_if=lambda backend: backend.cipher_supported(
algorithms.AES("\x00" * 16), modes.CTR("\x00" * 16)
),
diff --git a/tests/hazmat/primitives/test_arc4.py b/tests/hazmat/primitives/test_arc4.py
index 7ce93061..a9ef2bbe 100644
--- a/tests/hazmat/primitives/test_arc4.py
+++ b/tests/hazmat/primitives/test_arc4.py
@@ -35,7 +35,7 @@ class TestARC4(object):
"rfc-6229-192.txt",
"rfc-6229-256.txt",
],
- lambda **kwargs: algorithms.ARC4(binascii.unhexlify((kwargs["key"]))),
+ lambda key, **kwargs: algorithms.ARC4(binascii.unhexlify(key)),
only_if=lambda backend: backend.cipher_supported(
algorithms.ARC4("\x00" * 16), None
),
diff --git a/tests/hazmat/primitives/test_blowfish.py b/tests/hazmat/primitives/test_blowfish.py
index 3e0e9025..065855d7 100644
--- a/tests/hazmat/primitives/test_blowfish.py
+++ b/tests/hazmat/primitives/test_blowfish.py
@@ -27,9 +27,7 @@ class TestBlowfish(object):
load_nist_vectors,
os.path.join("ciphers", "Blowfish"),
["bf-ecb.txt"],
- lambda **kwargs: algorithms.Blowfish(
- binascii.unhexlify(kwargs["key"])
- ),
+ lambda key, **kwargs: algorithms.Blowfish(binascii.unhexlify(key)),
lambda **kwargs: modes.ECB(),
only_if=lambda backend: backend.cipher_supported(
algorithms.Blowfish("\x00" * 56), modes.ECB()
@@ -41,10 +39,8 @@ class TestBlowfish(object):
load_nist_vectors,
os.path.join("ciphers", "Blowfish"),
["bf-cbc.txt"],
- lambda **kwargs: algorithms.Blowfish(
- binascii.unhexlify(kwargs["key"])
- ),
- lambda **kwargs: modes.CBC(binascii.unhexlify(kwargs["iv"])),
+ lambda key, **kwargs: algorithms.Blowfish(binascii.unhexlify(key)),
+ lambda iv, **kwargs: modes.CBC(binascii.unhexlify(iv)),
only_if=lambda backend: backend.cipher_supported(
algorithms.Blowfish("\x00" * 56), modes.CBC("\x00" * 8)
),
@@ -55,10 +51,8 @@ class TestBlowfish(object):
load_nist_vectors,
os.path.join("ciphers", "Blowfish"),
["bf-ofb.txt"],
- lambda **kwargs: algorithms.Blowfish(
- binascii.unhexlify(kwargs["key"])
- ),
- lambda **kwargs: modes.OFB(binascii.unhexlify(kwargs["iv"])),
+ lambda key, **kwargs: algorithms.Blowfish(binascii.unhexlify(key)),
+ lambda iv, **kwargs: modes.OFB(binascii.unhexlify(iv)),
only_if=lambda backend: backend.cipher_supported(
algorithms.Blowfish("\x00" * 56), modes.OFB("\x00" * 8)
),
@@ -69,10 +63,8 @@ class TestBlowfish(object):
load_nist_vectors,
os.path.join("ciphers", "Blowfish"),
["bf-cfb.txt"],
- lambda **kwargs: algorithms.Blowfish(
- binascii.unhexlify(kwargs["key"])
- ),
- lambda **kwargs: modes.CFB(binascii.unhexlify(kwargs["iv"])),
+ lambda key, **kwargs: algorithms.Blowfish(binascii.unhexlify(key)),
+ lambda iv, **kwargs: modes.CFB(binascii.unhexlify(iv)),
only_if=lambda backend: backend.cipher_supported(
algorithms.Blowfish("\x00" * 56), modes.CFB("\x00" * 8)
),
diff --git a/tests/hazmat/primitives/test_camellia.py b/tests/hazmat/primitives/test_camellia.py
index e11d590a..6e5fe682 100644
--- a/tests/hazmat/primitives/test_camellia.py
+++ b/tests/hazmat/primitives/test_camellia.py
@@ -33,9 +33,7 @@ class TestCamellia(object):
"camellia-192-ecb.txt",
"camellia-256-ecb.txt"
],
- lambda **kwargs: algorithms.Camellia(
- binascii.unhexlify((kwargs["key"]))
- ),
+ lambda key, **kwargs: algorithms.Camellia(binascii.unhexlify(key)),
lambda **kwargs: modes.ECB(),
only_if=lambda backend: backend.cipher_supported(
algorithms.Camellia("\x00" * 16), modes.ECB()
@@ -47,10 +45,8 @@ class TestCamellia(object):
load_openssl_vectors,
os.path.join("ciphers", "Camellia"),
["camellia-cbc.txt"],
- lambda **kwargs: algorithms.Camellia(
- binascii.unhexlify((kwargs["key"]))
- ),
- lambda **kwargs: modes.CBC(binascii.unhexlify(kwargs["iv"])),
+ lambda key, **kwargs: algorithms.Camellia(binascii.unhexlify(key)),
+ lambda iv, **kwargs: modes.CBC(binascii.unhexlify(iv)),
only_if=lambda backend: backend.cipher_supported(
algorithms.Camellia("\x00" * 16), modes.CBC("\x00" * 16)
),
@@ -61,10 +57,8 @@ class TestCamellia(object):
load_openssl_vectors,
os.path.join("ciphers", "Camellia"),
["camellia-ofb.txt"],
- lambda **kwargs: algorithms.Camellia(
- binascii.unhexlify((kwargs["key"]))
- ),
- lambda **kwargs: modes.OFB(binascii.unhexlify(kwargs["iv"])),
+ lambda key, **kwargs: algorithms.Camellia(binascii.unhexlify(key)),
+ lambda iv, **kwargs: modes.OFB(binascii.unhexlify(iv)),
only_if=lambda backend: backend.cipher_supported(
algorithms.Camellia("\x00" * 16), modes.OFB("\x00" * 16)
),
@@ -75,10 +69,8 @@ class TestCamellia(object):
load_openssl_vectors,
os.path.join("ciphers", "Camellia"),
["camellia-cfb.txt"],
- lambda **kwargs: algorithms.Camellia(
- binascii.unhexlify((kwargs["key"]))
- ),
- lambda **kwargs: modes.CFB(binascii.unhexlify(kwargs["iv"])),
+ lambda key, **kwargs: algorithms.Camellia(binascii.unhexlify(key)),
+ lambda iv, **kwargs: modes.CFB(binascii.unhexlify(iv)),
only_if=lambda backend: backend.cipher_supported(
algorithms.Camellia("\x00" * 16), modes.CFB("\x00" * 16)
),
diff --git a/tests/hazmat/primitives/test_cast5.py b/tests/hazmat/primitives/test_cast5.py
index 10c6ef39..406f9b55 100644
--- a/tests/hazmat/primitives/test_cast5.py
+++ b/tests/hazmat/primitives/test_cast5.py
@@ -27,7 +27,7 @@ class TestCAST5(object):
load_nist_vectors,
os.path.join("ciphers", "CAST5"),
["cast5-ecb.txt"],
- lambda **kwargs: algorithms.CAST5(binascii.unhexlify((kwargs["key"]))),
+ lambda key, **kwargs: algorithms.CAST5(binascii.unhexlify((key))),
lambda **kwargs: modes.ECB(),
only_if=lambda backend: backend.cipher_supported(
algorithms.CAST5("\x00" * 16), modes.ECB()
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-06 09:19:48 +0000