diff --git a/Misc/NEWS.d/next/Library/2024-11-28-14-24-12.gh-issue-127360.HVKt-c.rst b/Misc/NEWS.d/next/Library/2024-11-28-14-24-12.gh-issue-127360.HVKt-c.rst
new file mode 100644
index 00000000000000..4772aef71e658f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-11-28-14-24-12.gh-issue-127360.HVKt-c.rst
@@ -0,0 +1,4 @@
+When a descriptive error message cannot be provided for an
+:exc:`ssl.SSLError`, the "unknown error" message now shows the internal
+error code (as retrieved by ``ERR_get_error`` and similar OpenSSL
+functions).
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index e5b8bf21002ea5..a538370c7dd6c2 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -473,6 +473,7 @@ fill_and_set_sslerror(_sslmodulestate *state,
PyObject *err_value = NULL, *reason_obj = NULL, *lib_obj = NULL;
PyObject *verify_obj = NULL, *verify_code_obj = NULL;
PyObject *init_value, *msg, *key;
+ PyUnicodeWriter *writer = NULL;
if (errcode != 0) {
int lib, reason;
@@ -495,11 +496,10 @@ fill_and_set_sslerror(_sslmodulestate *state,
if (lib_obj == NULL && PyErr_Occurred()) {
goto fail;
}
- if (errstr == NULL)
+ if (errstr == NULL) {
errstr = ERR_reason_error_string(errcode);
+ }
}
- if (errstr == NULL)
- errstr = "unknown error";
/* verify code for cert validation error */
if ((sslsock != NULL) && (type == state->PySSLCertVerificationErrorObject)) {
@@ -539,20 +539,50 @@ fill_and_set_sslerror(_sslmodulestate *state,
}
}
- if (verify_obj && reason_obj && lib_obj)
- msg = PyUnicode_FromFormat("[%S: %S] %s: %S (_ssl.c:%d)",
- lib_obj, reason_obj, errstr, verify_obj,
- lineno);
- else if (reason_obj && lib_obj)
- msg = PyUnicode_FromFormat("[%S: %S] %s (_ssl.c:%d)",
- lib_obj, reason_obj, errstr, lineno);
- else if (lib_obj)
- msg = PyUnicode_FromFormat("[%S] %s (_ssl.c:%d)",
- lib_obj, errstr, lineno);
- else
- msg = PyUnicode_FromFormat("%s (_ssl.c:%d)", errstr, lineno);
- if (msg == NULL)
+ // Format message roughly as:
+ // [lib_obj: reason_obj] errstr: verify_obj (_ssl.c:lineno)
+ // with parts missing/replaced if unavailable
+ writer = PyUnicodeWriter_Create(64);
+ if (!writer) {
+ goto fail;
+ }
+ if (lib_obj) {
+ if (PyUnicodeWriter_Format(writer, "[%S", lib_obj) < 0) {
+ goto fail;
+ }
+ if (reason_obj) {
+ if (PyUnicodeWriter_Format(writer, ": %S", reason_obj) < 0) {
+ goto fail;
+ }
+ }
+ if (PyUnicodeWriter_WriteUTF8(writer, "] ", 2) < 0) {
+ goto fail;
+ }
+ }
+ if (errstr) {
+ if (PyUnicodeWriter_Format(writer, "%s", errstr) < 0) {
+ goto fail;
+ }
+ }
+ else {
+ if (PyUnicodeWriter_Format(
+ writer, "unknown error (0x%x)", errcode) < 0) {
+ goto fail;
+ }
+ }
+ if (verify_obj) {
+ if (PyUnicodeWriter_Format(writer, ": %S", verify_obj) < 0) {
+ goto fail;
+ }
+ }
+ if (PyUnicodeWriter_Format(writer, " (_ssl.c:%d)", lineno) < 0) {
goto fail;
+ }
+ msg = PyUnicodeWriter_Finish(writer);
+ writer = NULL;
+ if (!msg) {
+ goto fail;
+ }
init_value = Py_BuildValue("iN", ERR_GET_REASON(ssl_errno), msg);
if (init_value == NULL)
@@ -587,6 +617,7 @@ fill_and_set_sslerror(_sslmodulestate *state,
Py_XDECREF(err_value);
Py_XDECREF(verify_code_obj);
Py_XDECREF(verify_obj);
+ PyUnicodeWriter_Discard(writer);
}
static int
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy