diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-24 08:00:10 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-10-21 23:00:24 -0500 |
| commit | 9837cb15b84fea92ffce3306d14160a8c11b1c65 (patch) | |
| tree | 532610680f8894875ad78108bbf2d2ada1793509 /tests/hazmat | |
| parent | 2d79836e9dbafd217f2febb61b964157600dc9f5 (diff) | |
| download | cryptography-9837cb15b84fea92ffce3306d14160a8c11b1c65.tar.gz cryptography-9837cb15b84fea92ffce3306d14160a8c11b1c65.tar.bz2 cryptography-9837cb15b84fea92ffce3306d14160a8c11b1c65.zip | |
make engine addition idempotent
Threading issues keep cropping up. ENGINE_add already
acquires a lock at the C layer via CRYPTO_w_lock (provided you
have registered the locking callbacks) so let's try to use that.
As part of this we'll try to init the openssl locks, but of course
there's potentially a race there as well. Clearly this isn't the real
fix but it might improve the situation while we try to determine what to
do.
Diffstat (limited to 'tests/hazmat')
| -rw-r--r-- | tests/hazmat/bindings/test_openssl.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py index 20171fa7..76a9218b 100644 --- a/tests/hazmat/bindings/test_openssl.py +++ b/tests/hazmat/bindings/test_openssl.py @@ -89,8 +89,8 @@ class TestOpenSSL(object): def test_add_engine_more_than_once(self): b = Binding() - with pytest.raises(RuntimeError): - b._register_osrandom_engine() + b._register_osrandom_engine() + assert b.lib.ERR_get_error() == 0 def test_ssl_ctx_options(self): # Test that we're properly handling 32-bit unsigned on all platforms. |