Skip to content

Commit 77e0919

Browse files
pablogsalYhg1s
andauthored
gh-107077: Raise SSLCertVerificationError even if the error is set via SSL_ERROR_SYSCALL (#107586)
Co-authored-by: T. Wouters <[email protected]>
1 parent a73daf5 commit 77e0919

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Seems that in some conditions, OpenSSL will return ``SSL_ERROR_SYSCALL``
2+
instead of ``SSL_ERROR_SSL`` when a certification verification has failed,
3+
but the error parameters will still contain ``ERR_LIB_SSL`` and
4+
``SSL_R_CERTIFICATE_VERIFY_FAILED``. We are now detecting this situation and
5+
raising the appropiate ``ssl.SSLCertVerificationError``. Patch by Pablo
6+
Galindo

Modules/_ssl.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,10 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno)
667667
errstr = "Some I/O error occurred";
668668
}
669669
} else {
670+
if (ERR_GET_LIB(e) == ERR_LIB_SSL &&
671+
ERR_GET_REASON(e) == SSL_R_CERTIFICATE_VERIFY_FAILED) {
672+
type = state->PySSLCertVerificationErrorObject;
673+
}
670674
p = PY_SSL_ERROR_SYSCALL;
671675
}
672676
break;

0 commit comments

Comments
 (0)