mirror of
https://github.com/saymrwulf/cryptography.git
synced 2026-05-14 20:37:55 +00:00
remove CAST5 for first release
This commit is contained in:
parent
7ec30af9a5
commit
0f72bdadc4
4 changed files with 2 additions and 76 deletions
|
|
@ -22,7 +22,7 @@ from cryptography.hazmat.backends.interfaces import (
|
|||
)
|
||||
from cryptography.hazmat.primitives import interfaces
|
||||
from cryptography.hazmat.primitives.ciphers.algorithms import (
|
||||
AES, Blowfish, Camellia, CAST5, TripleDES, ARC4,
|
||||
AES, Blowfish, Camellia, TripleDES, ARC4,
|
||||
)
|
||||
from cryptography.hazmat.primitives.ciphers.modes import (
|
||||
CBC, CTR, ECB, OFB, CFB, GCM,
|
||||
|
|
@ -107,11 +107,6 @@ class Backend(object):
|
|||
mode_cls,
|
||||
GetCipherByName("bf-{mode.name}")
|
||||
)
|
||||
self.register_cipher_adapter(
|
||||
CAST5,
|
||||
ECB,
|
||||
GetCipherByName("cast5-ecb")
|
||||
)
|
||||
self.register_cipher_adapter(
|
||||
ARC4,
|
||||
type(None),
|
||||
|
|
|
|||
|
|
@ -90,21 +90,6 @@ class Blowfish(object):
|
|||
return len(self.key) * 8
|
||||
|
||||
|
||||
@utils.register_interface(interfaces.BlockCipherAlgorithm)
|
||||
@utils.register_interface(interfaces.CipherAlgorithm)
|
||||
class CAST5(object):
|
||||
name = "CAST5"
|
||||
block_size = 64
|
||||
key_sizes = frozenset(range(40, 129, 8))
|
||||
|
||||
def __init__(self, key):
|
||||
self.key = _verify_key_size(self, key)
|
||||
|
||||
@property
|
||||
def key_size(self):
|
||||
return len(self.key) * 8
|
||||
|
||||
|
||||
@utils.register_interface(interfaces.CipherAlgorithm)
|
||||
class ARC4(object):
|
||||
name = "RC4"
|
||||
|
|
|
|||
|
|
@ -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(),
|
||||
)
|
||||
|
|
@ -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),
|
||||
|
|
|
|||
Loading…
Reference in a new issue