From: Christian Heimes <christian@python.org>
Date: Thu, 7 Sep 2017 23:45:39 +0000 (-0700)
Subject: [3.6] bpo-28958: Improve SSLContext error reporting. (GH-3414) (#3432)
X-Git-Tag: v3.6.3rc1~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c99b652f7909f86753b9e567ea18c95ee736e83;p=thirdparty%2FPython%2Fcpython.git

[3.6] bpo-28958: Improve SSLContext error reporting. (GH-3414) (#3432)

Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit 17c9ac9)
---

diff --git a/Misc/NEWS.d/next/Library/2017-09-06-19-41-01.bpo-28958.x4-K5F.rst b/Misc/NEWS.d/next/Library/2017-09-06-19-41-01.bpo-28958.x4-K5F.rst
new file mode 100644
index 000000000000..eb4e206be37d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-06-19-41-01.bpo-28958.x4-K5F.rst
@@ -0,0 +1,2 @@
+ssl.SSLContext() now uses OpenSSL error information when a context cannot be
+instantiated.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 25fb8090f431..ab30d212b9d1 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2643,8 +2643,7 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
         return NULL;
     }
     if (ctx == NULL) {
-        PyErr_SetString(PySSLErrorObject,
-                        "failed to allocate SSL context");
+        _setSSLError(NULL, 0, __FILE__, __LINE__);
         return NULL;
     }