aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/test_3des.py
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-12-21 10:53:50 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-12-21 10:53:50 -0600
commit687d0f849fd88eeaa6fe8968091a9d79b7f96901 (patch)
treebe7e8a8233e2420f761928c4a5a83ae8e6492570 /tests/hazmat/primitives/test_3des.py
parenta620b7dfc15cf945a589e9d472b01db6f48a50a5 (diff)
downloadcryptography-687d0f849fd88eeaa6fe8968091a9d79b7f96901.tar.gz
cryptography-687d0f849fd88eeaa6fe8968091a9d79b7f96901.tar.bz2
cryptography-687d0f849fd88eeaa6fe8968091a9d79b7f96901.zip
use both kwargs and named args in lambdas for clarity
Diffstat (limited to 'tests/hazmat/primitives/test_3des.py')
-rw-r--r--tests/hazmat/primitives/test_3des.py42
1 files changed, 18 insertions, 24 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)),
)