aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS.rst2
-rw-r--r--CHANGELOG.rst11
-rw-r--r--cryptography/hazmat/bindings/openssl/err.py2
-rw-r--r--docs/installation.rst4
4 files changed, 15 insertions, 4 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst
index a7821be0..250b717b 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -16,5 +16,5 @@ PGP key fingerprints are enclosed in parentheses.
* Stephen Holsapple <sholsapp@gmail.com>
* Terry Chia <terrycwk1994@gmail.com>
* Matthew Iversen <matt@notevencode.com> (2F04 3DCC D6E6 D5AC D262 2E0B C046 E8A8 7452 2973)
-* Mohammed Attia <skeuomorf@gmail.com>
+* Mohammed Attia <skeuomorf@gmail.com> (854A F9C5 9FF5 6E38 B17D 9587 2D70 E1ED 5290 D357)
* Michael Hart <michael.hart1994@gmail.com>
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8258279b..e1f8b115 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,17 @@ Changelog
.. note:: This version is not yet released and is under active development.
+0.6.1 - 2014-10-15
+~~~~~~~~~~~~~~~~~~
+
+* Updated Windows wheels to be compiled against OpenSSL 1.0.1j.
+* Fixed an issue where OpenSSL 1.0.1j changed the errors returned by some
+ functions.
+* Added our license file to the ``cryptography-vectors`` package.
+* Implemented DSA hash truncation support (per FIPS 186-3) in the OpenSSL
+ backend. This works around an issue in 1.0.0, 1.0.0a, and 1.0.0b where
+ truncation was not implemented.
+
0.6 - 2014-09-29
~~~~~~~~~~~~~~~~
diff --git a/cryptography/hazmat/bindings/openssl/err.py b/cryptography/hazmat/bindings/openssl/err.py
index 627b8a68..4e44a2eb 100644
--- a/cryptography/hazmat/bindings/openssl/err.py
+++ b/cryptography/hazmat/bindings/openssl/err.py
@@ -334,7 +334,7 @@ static const int EC_F_EC_GROUP_NEW_BY_CURVE_NAME = 0;
static const long Cryptography_HAS_RSA_R_PKCS_DECODING_ERROR = 1;
#else
static const long Cryptography_HAS_RSA_R_PKCS_DECODING_ERROR = 0;
-static const int RSA_R_PKCS_DECODING_ERROR = 0;
+static const long RSA_R_PKCS_DECODING_ERROR = 0;
#endif
"""
diff --git a/docs/installation.rst b/docs/installation.rst
index 76f0439a..d1b6e69d 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -25,12 +25,12 @@ OpenSSL releases:
* ``OpenSSL 0.9.8e-fips-rhel5`` (``RHEL/CentOS 5``)
* ``OpenSSL 0.9.8k``
-* ``OpenSSL 0.9.8y``
+* ``OpenSSL 0.9.8za``
* ``OpenSSL 1.0.0-fips`` (``RHEL/CentOS 6.4``)
* ``OpenSSL 1.0.1``
* ``OpenSSL 1.0.1e-fips`` (``RHEL/CentOS 7``)
* ``OpenSSL 1.0.1e-freebsd``
-* ``OpenSSL 1.0.1h``
+* ``OpenSSL 1.0.1-latest`` (The most recent 1.0.1 release)
* ``OpenSSL 1.0.2 beta``
On Windows