diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-03 15:16:51 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-03 15:16:51 -0800 |
| commit | f36fcdbd055c236641e8704bfa559d8bbf274b61 (patch) | |
| tree | 6e0975eb6e151804ad22c27232940600f035a63c | |
| parent | aa4692c112d756fc12980f7039b030caec27bc0d (diff) | |
| parent | 873730c89f0d8a6ac39639cdc97b069ebb2d3e6c (diff) | |
| download | cryptography-0.2.x.tar.gz | |
backport EVP_R_DISABLED_FOR_FIPS removal, increment for 0.2.2
| -rw-r--r-- | cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/err.py | 1 | ||||
| -rw-r--r-- | docs/changelog.rst | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/cryptography/__about__.py b/cryptography/__about__.py index 19a928a98..1fe3bb3fe 100644 --- a/cryptography/__about__.py +++ b/cryptography/__about__.py @@ -22,7 +22,7 @@ __summary__ = ("cryptography is a package designed to expose cryptographic " "recipes and primitives to Python developers.") __uri__ = "https://github.com/pyca/cryptography" -__version__ = "0.2.1" +__version__ = "0.2.2" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" diff --git a/cryptography/hazmat/bindings/openssl/err.py b/cryptography/hazmat/bindings/openssl/err.py index ddb60ef76..56e9a6bc5 100644 --- a/cryptography/hazmat/bindings/openssl/err.py +++ b/cryptography/hazmat/bindings/openssl/err.py @@ -151,7 +151,6 @@ static const int EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED; static const int EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH; static const int EVP_R_DECODE_ERROR; static const int EVP_R_DIFFERENT_KEY_TYPES; -static const int EVP_R_DISABLED_FOR_FIPS; static const int EVP_R_ENCODE_ERROR; static const int EVP_R_INITIALIZATION_ERROR; static const int EVP_R_INPUT_NOT_INITIALIZED; diff --git a/docs/changelog.rst b/docs/changelog.rst index 3e929061b..602be7cdb 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,8 +1,14 @@ Changelog ========= +0.2.2 - 2014-03-03 +~~~~~~~~~~~~~~~~~~ + +* Removed a constant definition that was causing compilation problems with specific versions of OpenSSL. + 0.2.1 - 2014-02-22 ~~~~~~~~~~~~~~~~~~ + * Fix a bug where importing cryptography from multiple paths could cause initialization to fail. 0.2 - 2014-02-20 |