diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/primitives/test_cast5.py | 41 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_ciphers.py | 15 | 
2 files changed, 1 insertions, 55 deletions
diff --git a/tests/hazmat/primitives/test_cast5.py b/tests/hazmat/primitives/test_cast5.py deleted file mode 100644 index d65a86b2..00000000 --- a/tests/hazmat/primitives/test_cast5.py +++ /dev/null @@ -1,41 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -#    http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from __future__ import absolute_import, division, print_function - -import binascii -import os - -import pytest - -from cryptography.hazmat.primitives.ciphers import algorithms, modes - -from .utils import generate_encrypt_test -from ...utils import load_nist_vectors - - -@pytest.mark.supported( -    only_if=lambda backend: backend.cipher_supported( -        algorithms.CAST5("\x00" * 16), modes.ECB() -    ), -    skip_message="Does not support CAST5 ECB", -) -@pytest.mark.cipher -class TestCAST5(object): -    test_ECB = generate_encrypt_test( -        load_nist_vectors, -        os.path.join("ciphers", "CAST5"), -        ["cast5-ecb.txt"], -        lambda key, **kwargs: algorithms.CAST5(binascii.unhexlify((key))), -        lambda **kwargs: modes.ECB(), -    ) diff --git a/tests/hazmat/primitives/test_ciphers.py b/tests/hazmat/primitives/test_ciphers.py index 653f7ce6..6a7b2f93 100644 --- a/tests/hazmat/primitives/test_ciphers.py +++ b/tests/hazmat/primitives/test_ciphers.py @@ -18,7 +18,7 @@ import binascii  import pytest  from cryptography.hazmat.primitives.ciphers.algorithms import ( -    AES, Camellia, TripleDES, Blowfish, CAST5, ARC4 +    AES, Camellia, TripleDES, Blowfish, ARC4  ) @@ -80,19 +80,6 @@ class TestBlowfish(object):              Blowfish(binascii.unhexlify(b"0" * 6)) -class TestCAST5(object): -    @pytest.mark.parametrize(("key", "keysize"), [ -        (b"0" * (keysize // 4), keysize) for keysize in range(40, 129, 8) -    ]) -    def test_key_size(self, key, keysize): -        cipher = CAST5(binascii.unhexlify(key)) -        assert cipher.key_size == keysize - -    def test_invalid_key_size(self): -        with pytest.raises(ValueError): -            CAST5(binascii.unhexlify(b"0" * 34)) - -  class TestARC4(object):      @pytest.mark.parametrize(("key", "keysize"), [          (b"0" * 10, 40),  | 
