Removed name fro BlockCipher -- it's arbitrarily based on the format openssl uses for *some* ciphers
diff --git a/cryptography/primitives/block/base.py b/cryptography/primitives/block/base.py
index b84ca9c..50e9e9e 100644
--- a/cryptography/primitives/block/base.py
+++ b/cryptography/primitives/block/base.py
@@ -36,12 +36,6 @@
self._ctx = api.create_block_cipher_context(cipher, mode)
self._operation = None
- @property
- def name(self):
- return "{0}-{1}-{2}".format(
- self.cipher.name, self.cipher.key_size, self.mode.name,
- )
-
def encrypt(self, plaintext):
if self._ctx is None:
raise ValueError("BlockCipher was already finalized")
diff --git a/tests/primitives/test_block.py b/tests/primitives/test_block.py
index 774885f..f4d3f46 100644
--- a/tests/primitives/test_block.py
+++ b/tests/primitives/test_block.py
@@ -23,20 +23,11 @@
class TestBlockCipher(object):
- def test_cipher_name(self, api):
- cipher = BlockCipher(
- ciphers.AES(binascii.unhexlify(b"0" * 32)),
- modes.CBC(binascii.unhexlify(b"0" * 32)),
- api
- )
- assert cipher.name == "AES-128-CBC"
-
def test_instantiate_without_api(self):
- cipher = BlockCipher(
+ BlockCipher(
ciphers.AES(binascii.unhexlify(b"0" * 32)),
modes.CBC(binascii.unhexlify(b"0" * 32))
)
- assert cipher.name == "AES-128-CBC"
def test_use_after_finalize(self, api):
cipher = BlockCipher(