summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-12-10 14:47:44 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2015-12-10 14:47:44 -0500
commitd0237e6dcdbbedaa50f88b6cf821f9944b734678 (patch)
tree05101242609b97db87c0838d23d831d646bdabbe
parent030606a6768cdb3cab611fe986ee4570e6aca5b1 (diff)
parentc5f16c9e38d3b0aeff7834bbc65ad0cda1471422 (diff)
downloadcryptography-1.1.x.tar.gz
Merge pull request #2519 from reaperhulk/1.1.2-changelog1.1.21.1.x
changelog and version bump for 1.1.2
-rw-r--r--CHANGELOG.rst9
-rw-r--r--docs/spelling_wordlist.txt1
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
4 files changed, 12 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 19bfad05f..6177514bd 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,15 @@
Changelog
=========
+1.1.2 - 2015-12-10
+~~~~~~~~~~~~~~~~~~
+
+* Fixed a SIGBUS crash with the OS X wheels caused by redefinition of a
+ method.
+* Fixed a runtime error ``undefined symbol EC_GFp_nistp224_method`` that
+ occurred with some OpenSSL installations.
+* Updated Windows and OS X wheels to be compiled against OpenSSL 1.0.2e.
+
1.1.1 - 2015-11-19
~~~~~~~~~~~~~~~~~~
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
index dc8bcd0b9..6def7959a 100644
--- a/docs/spelling_wordlist.txt
+++ b/docs/spelling_wordlist.txt
@@ -56,6 +56,7 @@ preprocessors
pseudorandom
pyOpenSSL
relicensed
+runtime
Schneier
scrypt
Serializers
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 02e50ac49..d37e562f2 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__ = "1.1.1"
+__version__ = "1.1.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 d37028d89..2b75778b7 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__ = "1.1.1"
+__version__ = "1.1.2"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"