C locking callback #3226
C locking callback #3226
Conversation
The Python OpenSSL locking callback is unsafe; if GC is triggered during the callback's invocation, it can result in the callback being invoked reentrantly, which can lead to deadlocks. This patch replaces it with one in C that gets built at compile time via cffi along with the rest of the OpenSSL binding.
|
jenkins, retest this please. |
|
I don't think the previous implementation failed gracefully in such cases. On Tue, Nov 8, 2016 at 12:47 AM, Paul Kehrer [email protected]
"I disapprove of what you say, but I will defend to the death your right to |
| int _setup_ssl_threads(void) { | ||
| unsigned int i; | ||
|
|
||
| if (_ssl_locks == NULL) { |
There was a problem hiding this comment.
Does it make sense to check for CRYPTO_get_locking_callback() == NULL as well?
There was a problem hiding this comment.
It looks like in this version we call __import__("_ssl") but then we register our callback anyway. We should check to see if the callback is already registered before we register anything.
There was a problem hiding this comment.
The if cls.lib.CRYPTO_get_locking_callback() != cls.ffi.NULL is still there.
There was a problem hiding this comment.
Sigh, the problems with just looking at diffs. Yep, this is fine then.
| @@ -1,3 +1,5 @@ | |||
| # -*- coding: utf8 -*- | |||
There was a problem hiding this comment.
The copyright symbol. I copied it directly out o the license file.
|
Jenkins, retest this please. |
No description provided.