aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-03-18 22:45:30 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2018-03-18 22:45:30 -0400
commit4601fbab9552b0fc938ae3864e9c14e4476231c0 (patch)
tree60ae44a126d415feb05a66fff6bb26fb14fa8d3e
parentcd6cf4aa7567ec7e870c19eeb5c200d8bf133ed9 (diff)
downloadcryptography-4601fbab9552b0fc938ae3864e9c14e4476231c0.tar.gz
cryptography-4601fbab9552b0fc938ae3864e9c14e4476231c0.tar.bz2
cryptography-4601fbab9552b0fc938ae3864e9c14e4476231c0.zip
2.2 release! (#4150)
* 2.2 release! * also change versions
-rw-r--r--CHANGELOG.rst7
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 5 insertions, 6 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 912a368f..84f3dbc5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,10 +3,8 @@ Changelog
.. _v2-2:
-2.2 - `master`_
-~~~~~~~~~~~~~~~
-
-.. note:: This version is not yet released and is under active development.
+2.2 - 2018-03-19
+~~~~~~~~~~~~~~~~
* **BACKWARDS INCOMPATIBLE:** Support for Python 2.6 has been dropped.
* Resolved a bug in ``HKDF`` that incorrectly constrained output size.
@@ -23,6 +21,7 @@ Changelog
and
:func:`~cryptography.hazmat.primitives.keywrap.aes_key_unwrap_with_padding`
.
+* Allow loading DSA keys with 224 bit ``q``.
.. _v2-1-4:
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index ee16ac8d..53d31c22 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.2.dev1"
+__version__ = "2.2"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 466a0167..70cca353 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.2.dev1"
+__version__ = "2.2"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"