summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-10-21 17:48:22 (GMT)
committerChristian Heimes <christian@cheimes.de>2013-10-21 17:48:22 (GMT)
commitb7ddbc855cdab3563f25bd4e9e759a46648f95e0 (patch)
tree8960e8b149c87539663277be5f57649f30f59e67
parent1a82f7e6a56ab014d5e9035b613fd4e837da5103 (diff)
downloadcpython-b7ddbc855cdab3563f25bd4e9e759a46648f95e0.zip
cpython-b7ddbc855cdab3563f25bd4e9e759a46648f95e0.tar.gz
cpython-b7ddbc855cdab3563f25bd4e9e759a46648f95e0.tar.bz2
Load SSL's error strings in hashlib.
Without ERR_load_crypto_strings() functions like ERR_lib_error_string() return NULL.
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_hashopenssl.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 0221ffb..f60bbd1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,8 @@ Core and Builtins
Library
-------
+- Load SSL's error strings in hashlib.
+
- Issue #18527: Upgrade internal copy of zlib to 1.2.8.
- Issue #19274: Add a filterfunc parameter to PyZipFile.writepy.
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index d715500..222e5ef 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -847,6 +847,7 @@ PyInit__hashlib(void)
PyObject *m, *openssl_md_meth_names;
OpenSSL_add_all_digests();
+ ERR_load_crypto_strings();
/* TODO build EVP_functions openssl_* entries dynamically based
* on what hashes are supported rather than listing many