diff options
| -rw-r--r-- | CHANGELOG.rst | 8 | ||||
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | src/cryptography/hazmat/primitives/ciphers/aead.py | 4 | ||||
| -rw-r--r-- | src/cryptography/hazmat/primitives/kdf/kbkdf.py | 4 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
6 files changed, 15 insertions, 7 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f611d171f..fb68bb9e2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog ========= +.. _v2-1-2: + +2.1.2 - 2017-10-24 +~~~~~~~~~~~~~~~~~~ + +* Corrected a bug with the ``manylinux1`` wheels where OpenSSL's stack was + marked executable. + .. _v2-1-1: 2.1.1 - 2017-10-12 diff --git a/Jenkinsfile b/Jenkinsfile index 8d53f809a..11cbfd75c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -71,7 +71,7 @@ def configs = [ [ label: 'docker', imageName: 'pyca/cryptography-runner-ubuntu-rolling', - toxenvs: ['py27', 'py35', 'randomorder'], + toxenvs: ['py27', 'py36', 'randomorder'], ], [ label: 'docker', diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 3d6c8a031..a335c537c 100644 --- a/src/cryptography/__about__.py +++ b/src/cryptography/__about__.py @@ -14,7 +14,7 @@ __summary__ = ("cryptography is a package which provides cryptographic recipes" " and primitives to Python developers.") __uri__ = "https://github.com/pyca/cryptography" -__version__ = "2.1.1" +__version__ = "2.1.2" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" diff --git a/src/cryptography/hazmat/primitives/ciphers/aead.py b/src/cryptography/hazmat/primitives/ciphers/aead.py index 07b6bce61..415a45a95 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 29ac0fadb..14de56ebf 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): diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index eb880ff8c..04c6fe201 100644 --- a/vectors/cryptography_vectors/__about__.py +++ b/vectors/cryptography_vectors/__about__.py @@ -14,7 +14,7 @@ __summary__ = "Test vectors for the cryptography package." __uri__ = "https://github.com/pyca/cryptography" -__version__ = "2.1.1" +__version__ = "2.1.2" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |