diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-11-13 15:55:22 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-11-13 12:55:22 -0800 |
| commit | d862933de5c344fcdf99ab2f43f3bf8da65f3e41 (patch) | |
| tree | 16d73c47a45f939336fe5e41bf45293097a5a222 /LICENSE | |
| parent | 562b9a905596f3e58b27be584a9532aa3a4dc833 (diff) | |
| download | cryptography-d862933de5c344fcdf99ab2f43f3bf8da65f3e41.tar.gz cryptography-d862933de5c344fcdf99ab2f43f3bf8da65f3e41.tar.bz2 cryptography-d862933de5c344fcdf99ab2f43f3bf8da65f3e41.zip | |
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.
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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. |