From d862933de5c344fcdf99ab2f43f3bf8da65f3e41 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 13 Nov 2016 15:55:22 -0500 Subject: C locking callback (#3226) * Remove Python OpenSSL locking callback and replace it with one in C 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. * fixes for some issues * unused * revert these changes * these two for good measure * missing param * sigh, syntax * delete tests that assumed an ability to mess with locks * style fixes * licensing stuff * utf8 * Unicode. Huh. What it isn't good for, absolutely nothing. --- LICENSE | 3 +++ 1 file changed, 3 insertions(+) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index b11f379e..bf6a3de1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,6 @@ This software is made available under the terms of *either* of the licenses found in LICENSE.APACHE or LICENSE.BSD. Contributions to cryptography are made under the terms of *both* these licenses. + +The code used in the OpenSSL locking callback is derived from the same in +Python itself, and is licensed under the terms of the PSF License Agreement. -- cgit v1.2.3