From: Christian Heimes <christian@cheimes.de>
Date: Mon, 21 Oct 2013 17:48:22 +0000 (+0200)
Subject: Load SSL's error strings in hashlib.
X-Git-Tag: v3.4.0b1~571^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7ddbc855cdab3563f25bd4e9e759a46648f95e0;p=thirdparty%2FPython%2Fcpython.git

Load SSL's error strings in hashlib.
Without ERR_load_crypto_strings() functions like ERR_lib_error_string() return NULL.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 0221ffbbd97e..f60bbd181d5c 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 d71550059b0d..222e5efe5e0c 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