diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2021-02-07 11:36:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 10:36:56 -0600 |
| commit | 82b6ce28389f0a317bc55ba2091a74b346db7cae (patch) | |
| tree | 7664b5f2c5af817e737da24d729ecb93ea011e42 /src/cryptography | |
| parent | 1ff0d50948bbb6f2aa53d5648f1188a567d941cd (diff) | |
| download | cryptography-3.3.x.tar.gz | |
* correct buffer overflows cause by integer overflow in openssl
frustratingly, there is no test for this -- that's because testing this
requires allocating more memory than is available in CI.
fixes #5615.
* backport CI fixes
* another CI backport
Diffstat (limited to 'src/cryptography')
| -rw-r--r-- | src/cryptography/__about__.py | 4 | ||||
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/ciphers.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 0c7eaaa09..f81650925 100644 --- a/src/cryptography/__about__.py +++ b/src/cryptography/__about__.py @@ -22,10 +22,10 @@ __summary__ = ( ) __uri__ = "https://github.com/pyca/cryptography" -__version__ = "3.3.1" +__version__ = "3.3.2" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" __license__ = "BSD or Apache License, Version 2.0" -__copyright__ = "Copyright 2013-2020 {}".format(__author__) +__copyright__ = "Copyright 2013-2021 {}".format(__author__) diff --git a/src/cryptography/hazmat/backends/openssl/ciphers.py b/src/cryptography/hazmat/backends/openssl/ciphers.py index 1e805d235..ad5dad3f7 100644 --- a/src/cryptography/hazmat/backends/openssl/ciphers.py +++ b/src/cryptography/hazmat/backends/openssl/ciphers.py @@ -17,7 +17,7 @@ from cryptography.hazmat.primitives.ciphers import modes class _CipherContext(object): _ENCRYPT = 1 _DECRYPT = 0 - _MAX_CHUNK_SIZE = 2 ** 31 - 1 + _MAX_CHUNK_SIZE = 2 ** 30 - 1 def __init__(self, backend, cipher, mode, operation): self._backend = backend |