summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-12-17 19:25:38 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-12-17 19:25:38 -0800
commit4597edf00274c71c1f71f0e75d0c6bcfd62dcb8a (patch)
treea376304d0cb5f812f3f3268e884392f096afc575
parent882e64bdc7370d850f02229db361063ff3a69fdf (diff)
parente813509bd7c5272ff14550cafd0977abd7a4b9ed (diff)
downloadcryptography-4597edf00274c71c1f71f0e75d0c6bcfd62dcb8a.tar.gz
Merge pull request #1540 from reaperhulk/update-changelog-0.70.7
0.7 changelog and version bump
-rw-r--r--CHANGELOG.rst10
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 6 insertions, 8 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a5e4684f9..5f295f2b0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,10 +1,8 @@
Changelog
=========
-0.7 - `master`_
-~~~~~~~~~~~~~~~
-
-.. note:: This version is not yet released and is under active development.
+0.7 - 2014-12-17
+~~~~~~~~~~~~~~~~
* Cryptography has been relicensed from the Apache Software License, Version
2.0, to being available under *either* the Apache Software License, Version
@@ -20,8 +18,8 @@ Changelog
:doc:`/hazmat/primitives/asymmetric/utils`.
* Added
:func:`~cryptography.hazmat.primitives.serialization.load_ssh_public_key` to
- support the loading of OpenSSH public keys (:rfc:`4253`). Currently, only RSA
- keys are supported.
+ support the loading of OpenSSH public keys (:rfc:`4253`). Only RSA and DSA
+ keys are currently supported.
* Added initial support for X.509 certificate parsing. See the
:doc:`X.509 documentation</x509>` for more information.
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index d4a5a64fb..f022b21d9 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__ = "0.7.dev1"
+__version__ = "0.7"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 5b321d033..5f36cb64f 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__ = "0.7.dev1"
+__version__ = "0.7"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"