Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pyca/cryptography
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.3.1
Choose a base ref
...
head repository: pyca/cryptography
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.3.2
Choose a head ref
  • 1 commit
  • 8 files changed
  • 1 contributor

Commits on Feb 7, 2021

  1. correct buffer overflows cause by integer overflow in openssl (#5747) 

    * 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
    @alex
    alex authored Feb 7, 2021
    Copy the full SHA
    82b6ce2 View commit details
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ jobs:

linux-distros:
runs-on: ubuntu-latest
container: ${{ matrix.IMAGE.IMAGE }}
container: ghcr.io/${{ matrix.IMAGE.IMAGE }}
strategy:
matrix:
IMAGE:
@@ -91,7 +91,7 @@ jobs:
- {IMAGE: "pyca/cryptography-runner-centos8-fips", TOXENV: "py36", FIPS: true}
- {IMAGE: "pyca/cryptography-runner-stretch", TOXENV: "py27"}
- {IMAGE: "pyca/cryptography-runner-buster", TOXENV: "py37"}
- {IMAGE: "pyca/cryptography-runner-bullseye", TOXENV: "py38"}
- {IMAGE: "pyca/cryptography-runner-bullseye", TOXENV: "py39"}
- {IMAGE: "pyca/cryptography-runner-sid", TOXENV: "py39"}
- {IMAGE: "pyca/cryptography-runner-ubuntu-bionic", TOXENV: "py36"}
- {IMAGE: "pyca/cryptography-runner-ubuntu-focal", TOXENV: "py38"}
2 changes: 1 addition & 1 deletion .github/workflows/wheel-builder.yml
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ on:
jobs:
manylinux:
runs-on: ubuntu-latest
container: ${{ matrix.MANYLINUX.CONTAINER }}
container: ghcr.io/${{ matrix.MANYLINUX.CONTAINER }}
strategy:
matrix:
PYTHON: ["cp27-cp27m", "cp27-cp27mu", "cp36-cp36m"]
6 changes: 3 additions & 3 deletions .zuul.d/jobs.yaml
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@
vars:
wheel_builds:
- platform: manylinux2014_aarch64
image: pyca/cryptography-manylinux2014_aarch64
image: ghcr.io/pyca/cryptography-manylinux2014_aarch64
pythons:
- cp36-cp36m

@@ -55,13 +55,13 @@
vars:
wheel_builds:
- platform: manylinux1_x86_64
image: pyca/cryptography-manylinux1:x86_64
image: ghcr.io/pyca/cryptography-manylinux1:x86_64
pythons:
- cp27-cp27m
- cp27-cp27mu
- cp36-cp36m
- platform: manylinux2010_x86_64
image: pyca/cryptography-manylinux2010:x86_64
image: ghcr.io/pyca/cryptography-manylinux2010:x86_64
pythons:
- cp27-cp27m
- cp27-cp27mu
9 changes: 9 additions & 0 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Changelog
=========

.. _v3-3-2:

3.3.2 - 2021-02-07
~~~~~~~~~~~~~~~~~~

* **SECURITY ISSUE:** Fixed a bug where certain sequences of ``update()`` calls
when symmetrically encrypting very large payloads (>2GB) could result in an
integer overflow, leading to buffer overflows. *CVE-2020-36242*

.. _v3-3-1:

3.3.1 - 2020-12-09
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@

# General information about the project.
project = "Cryptography"
copyright = "2013-2020, Individual Contributors"
copyright = "2013-2021, Individual Contributors"

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
4 changes: 2 additions & 2 deletions src/cryptography/__about__.py
View file
Original file line number Diff line number Diff line change
@@ -22,10 +22,10 @@
)
__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__)
2 changes: 1 addition & 1 deletion src/cryptography/hazmat/backends/openssl/ciphers.py
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
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
4 changes: 2 additions & 2 deletions vectors/cryptography_vectors/__about__.py
View file
Original file line number Diff line number Diff line change
@@ -20,10 +20,10 @@

__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 %s" % __author__
__copyright__ = "Copyright 2013-2021 %s" % __author__