mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-07 17:57:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

closes bpo-41235: Fix the error handling in SSLContext.load_dh_params() (GH-21385)

Browse source
This commit is contained in:
Zackery Spytz 2020-07-07 22:21:58 -06:00 • committed by GitHub
parent 6f13adf59e
commit aebc049557
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Library/2020-07-07-21-56-26.bpo-41235.H2csMU.rst Normal file
View file

@ -0,0 +1 @@
Fix the error handling in :meth:`ssl.SSLContext.load_dh_params`.

6
Modules/_ssl.c
View file

@ -4309,8 +4309,10 @@ _ssl__SSLContext_load_dh_params(PySSLContext *self, PyObject *filepath)
} }
return NULL; return NULL;
} }
if (SSL_CTX_set_tmp_dh(self->ctx, dh) == 0) if (!SSL_CTX_set_tmp_dh(self->ctx, dh)) {
_setSSLError(NULL, 0, __FILE__, __LINE__); DH_free(dh);
return _setSSLError(NULL, 0, __FILE__, __LINE__);
}
DH_free(dh); DH_free(dh);
Py_RETURN_NONE; Py_RETURN_NONE;
} }