-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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.
- Loading branch information
1 parent
562b9a9
commit d862933
Showing
5 changed files
with
118 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and | ||
the Individual or Organization ("Licensee") accessing and otherwise using Python | ||
2.7.12 software in source or binary form and its associated documentation. | ||
|
||
2. Subject to the terms and conditions of this License Agreement, PSF hereby | ||
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, | ||
analyze, test, perform and/or display publicly, prepare derivative works, | ||
distribute, and otherwise use Python 2.7.12 alone or in any derivative | ||
version, provided, however, that PSF's License Agreement and PSF's notice of | ||
copyright, i.e., "Copyright © 2001-2016 Python Software Foundation; All Rights | ||
Reserved" are retained in Python 2.7.12 alone or in any derivative version | ||
prepared by Licensee. | ||
|
||
3. In the event Licensee prepares a derivative work that is based on or | ||
incorporates Python 2.7.12 or any part thereof, and wants to make the | ||
derivative work available to others as provided herein, then Licensee hereby | ||
agrees to include in any such work a brief summary of the changes made to Python | ||
2.7.12. | ||
|
||
4. PSF is making Python 2.7.12 available to Licensee on an "AS IS" basis. | ||
PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF | ||
EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR | ||
WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE | ||
USE OF PYTHON 2.7.12 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. | ||
|
||
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 2.7.12 | ||
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF | ||
MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.7.12, OR ANY DERIVATIVE | ||
THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. | ||
|
||
6. This License Agreement will automatically terminate upon a material breach of | ||
its terms and conditions. | ||
|
||
7. Nothing in this License Agreement shall be deemed to create any relationship | ||
of agency, partnership, or joint venture between PSF and Licensee. This License | ||
Agreement does not grant permission to use PSF trademarks or trade name in a | ||
trademark sense to endorse or promote products or services of Licensee, or any | ||
third party. | ||
|
||
8. By copying, installing or otherwise using Python 2.7.12, Licensee agrees | ||
to be bound by the terms and conditions of this License Agreement. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters