[3.9] gh-107077: Raise SSLCertVerificationError even if the error is set via SSL_ERROR_SYSCALL (GH-107586) (#107590)

miss-islington · pablogsal · Yhg1s · web-flow · commit 468ba95c7976 · 2024-02-21T17:02:34.000+01:00
(cherry picked from commit 77e0919) Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com> Co-authored-by: T. Wouters <thomas@python.org> Co-authored-by: Łukasz Langa <lukasz@langa.pl> Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
diff --git a/Misc/NEWS.d/next/Library/2023-08-03-12-52-19.gh-issue-107077.-pzHD6.rst b/Misc/NEWS.d/next/Library/2023-08-03-12-52-19.gh-issue-107077.-pzHD6.rst
@@ -0,0 +1,6 @@
+Seems that in some conditions, OpenSSL will return ``SSL_ERROR_SYSCALL``
+instead of ``SSL_ERROR_SSL`` when a certification verification has failed,
+but the error parameters will still contain ``ERR_LIB_SSL`` and
+``SSL_R_CERTIFICATE_VERIFY_FAILED``. We are now detecting this situation and
+raising the appropiate ``ssl.SSLCertVerificationError``. Patch by Pablo
+Galindo
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -817,6 +817,10 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno)
                     errstr = "Some I/O error occurred";
                 }
             } else {
+                if (ERR_GET_LIB(e) == ERR_LIB_SSL &&
+                        ERR_GET_REASON(e) == SSL_R_CERTIFICATE_VERIFY_FAILED) {
+                    type = PySSLCertVerificationErrorObject;
+                }
                 p = PY_SSL_ERROR_SYSCALL;
             }
             break;

Original file line number	Diff line number	Diff line change
`@@ -817,6 +817,10 @@ PySSL_SetError(PySSLSocket sslsock, int ret, const char filename, int lineno)`
`817`	`817`	`errstr = "Some I/O error occurred";`
`818`	`818`	`}`
`819`	`819`	`} else {`
	`820`	`+ if (ERR_GET_LIB(e) == ERR_LIB_SSL &&`
	`821`	`+ ERR_GET_REASON(e) == SSL_R_CERTIFICATE_VERIFY_FAILED) {`
	`822`	`+ type = PySSLCertVerificationErrorObject;`
	`823`	`+ }`
`820`	`824`	`p = PY_SSL_ERROR_SYSCALL;`
`821`	`825`	`}`
`822`	`826`	`break;`