From 2d0afd3485a6349924f921d12dc94a302999ae20 Mon Sep 17 00:00:00 2001 From: Vladyslav Moisieienkov Date: Wed, 20 Jun 2018 14:21:33 +0200 Subject: Add clearer message when key type is not bytes (#4289) * Add clearer message in Cipher when key is not bytes * Change location of key type check to verify_key_size function * Replace formated error message with static * Add key type check tests to all ciphers constructors * Change key type error message to lowercase --- src/cryptography/hazmat/primitives/ciphers/algorithms.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/cryptography/hazmat/primitives/ciphers/algorithms.py b/src/cryptography/hazmat/primitives/ciphers/algorithms.py index 99a837e4..68a9e330 100644 --- a/src/cryptography/hazmat/primitives/ciphers/algorithms.py +++ b/src/cryptography/hazmat/primitives/ciphers/algorithms.py @@ -12,6 +12,9 @@ from cryptography.hazmat.primitives.ciphers.modes import ModeWithNonce def _verify_key_size(algorithm, key): + # Verify that the key is instance of bytes + utils._check_bytes("key", key) + # Verify that the key size matches the expected key size if len(key) * 8 not in algorithm.key_sizes: raise ValueError("Invalid key size ({0}) for {1}.".format( -- cgit v1.2.3