From 05d7214f4026d89a4b111e9bf0d4933a4847734f Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sun, 15 Sep 2013 14:03:15 -0500 Subject: crazy pep8 contortions --- tests/test_utils.py | 67 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 25 deletions(-) (limited to 'tests/test_utils.py') diff --git a/tests/test_utils.py b/tests/test_utils.py index 3768c6fc..56edb3a5 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -287,18 +287,27 @@ def test_load_cryptrec_vectors_from_file_encrypt(): def test_load_openssl_vectors_encrypt(): - vector_data = textwrap.dedent(""" - # We don't support CFB{1,8}-CAMELLIAxxx.{En,De}crypt - # For all CFB128 encrypts and decrypts, the transformed sequence is - # CAMELLIA-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec - # CFB128-CAMELLIA128.Encrypt - CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:14F7646187817EB586599146B82BD719:1 - CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:14F7646187817EB586599146B82BD719:AE2D8A571E03AC9C9EB76FAC45AF8E51:A53D28BB82DF741103EA4F921A44880B:1 - - # CFB128-CAMELLIA128.Decrypt - CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:14F7646187817EB586599146B82BD719:0 - CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:14F7646187817EB586599146B82BD719:AE2D8A571E03AC9C9EB76FAC45AF8E51:A53D28BB82DF741103EA4F921A44880B:0 - """).splitlines() + vector_data = textwrap.dedent( + """ + # We don't support CFB{1,8}-CAMELLIAxxx.{En,De}crypt + # For all CFB128 encrypts and decrypts, the transformed sequence is + # CAMELLIA-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec + # CFB128-CAMELLIA128.Encrypt + """ + "CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:" + "000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:" + "14F7646187817EB586599146B82BD719:1\n" + "CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:" + "14F7646187817EB586599146B82BD719:AE2D8A571E03AC9C9EB76FAC45AF8E51:" + "A53D28BB82DF741103EA4F921A44880B:1\n\n" + "# CFB128-CAMELLIA128.Decrypt\n" + "CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:" + "000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:" + "14F7646187817EB586599146B82BD719:0\n" + "CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:" + "14F7646187817EB586599146B82BD719:AE2D8A571E03AC9C9EB76FAC45AF8E51:" + "A53D28BB82DF741103EA4F921A44880B:0" + ).splitlines() assert load_openssl_vectors(vector_data, "ENCRYPT") == [ ( @@ -317,19 +326,27 @@ def test_load_openssl_vectors_encrypt(): def test_load_openssl_vectors_decrypt(): - vector_data = textwrap.dedent(""" - # We don't support CFB{1,8}-CAMELLIAxxx.{En,De}crypt - # For all CFB128 encrypts and decrypts, the transformed sequence is - # CAMELLIA-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec - # CFB128-CAMELLIA128.Encrypt - CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:14F7646187817EB586599146B82BD719:1 - CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:14F7646187817EB586599146B82BD719:AE2D8A571E03AC9C9EB76FAC45AF8E51:A53D28BB82DF741103EA4F921A44880B:1 - - # CFB128-CAMELLIA128.Decrypt - CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:A53D28BB82DF741103EA4F921A44880B:30C81C46A35CE411E5FBC1191A0A52EF:9C2157A664626D1DEF9EA420FDE69B96:0 - CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:9C2157A664626D1DEF9EA420FDE69B96:F69F2445DF4F9B17AD2B417BE66C3710:742A25F0542340C7BAEF24CA8482BB09:0 - - """).splitlines() + vector_data = textwrap.dedent( + """ + # We don't support CFB{1,8}-CAMELLIAxxx.{En,De}crypt + # For all CFB128 encrypts and decrypts, the transformed sequence is + # CAMELLIA-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec + # CFB128-CAMELLIA128.Encrypt + """ + "CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:" + "000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:" + "14F7646187817EB586599146B82BD719:1\n" + "CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:" + "14F7646187817EB586599146B82BD719:AE2D8A571E03AC9C9EB76FAC45AF8E51:" + "A53D28BB82DF741103EA4F921A44880B:1\n\n" + "# CFB128-CAMELLIA128.Decrypt\n" + "CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:" + "A53D28BB82DF741103EA4F921A44880B:30C81C46A35CE411E5FBC1191A0A52EF:" + "9C2157A664626D1DEF9EA420FDE69B96:0\n" + "CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:" + "9C2157A664626D1DEF9EA420FDE69B96:F69F2445DF4F9B17AD2B417BE66C3710:" + "742A25F0542340C7BAEF24CA8482BB09:0\n" + ).splitlines() assert load_openssl_vectors(vector_data, "DECRYPT") == [ ( -- cgit v1.2.3