aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2017-10-23 18:44:50 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2017-10-23 17:44:50 -0500
commitc0e31e691eefaa1ee00444b3f93fc6aa7fe48095 (patch)
tree930710f301fdfada69f11c217c310a34459fa230
parentf2a0333facdbe88160e23317956efd490127857a (diff)
downloadcryptography-c0e31e691eefaa1ee00444b3f93fc6aa7fe48095.tar.gz
cryptography-c0e31e691eefaa1ee00444b3f93fc6aa7fe48095.tar.bz2
cryptography-c0e31e691eefaa1ee00444b3f93fc6aa7fe48095.zip
Latest flake8 has some rules about variable names (#3996)
-rw-r--r--src/cryptography/hazmat/primitives/ciphers/aead.py4
-rw-r--r--src/cryptography/hazmat/primitives/kdf/kbkdf.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptography/hazmat/primitives/ciphers/aead.py b/src/cryptography/hazmat/primitives/ciphers/aead.py
index 07b6bce6..415a45a9 100644
--- a/src/cryptography/hazmat/primitives/ciphers/aead.py
+++ b/src/cryptography/hazmat/primitives/ciphers/aead.py
@@ -108,8 +108,8 @@ class AESCCM(object):
def _validate_lengths(self, nonce, data_len):
# For information about computing this, see
# https://tools.ietf.org/html/rfc3610#section-2.1
- l = 15 - len(nonce)
- if 2 ** (8 * l) < data_len:
+ l_val = 15 - len(nonce)
+ if 2 ** (8 * l_val) < data_len:
raise ValueError("Nonce too long for data")
def _check_params(self, nonce, data, associated_data):
diff --git a/src/cryptography/hazmat/primitives/kdf/kbkdf.py b/src/cryptography/hazmat/primitives/kdf/kbkdf.py
index 29ac0fad..14de56eb 100644
--- a/src/cryptography/hazmat/primitives/kdf/kbkdf.py
+++ b/src/cryptography/hazmat/primitives/kdf/kbkdf.py
@@ -139,9 +139,9 @@ class KBKDFHMAC(object):
if self._fixed_data and isinstance(self._fixed_data, bytes):
return self._fixed_data
- l = utils.int_to_bytes(self._length * 8, self._llen)
+ l_val = utils.int_to_bytes(self._length * 8, self._llen)
- return b"".join([self._label, b"\x00", self._context, l])
+ return b"".join([self._label, b"\x00", self._context, l_val])
def verify(self, key_material, expected_key):
if not constant_time.bytes_eq(self.derive(key_material), expected_key):