diff options
| author | Glyph <glyph@twistedmatrix.com> | 2015-06-26 23:09:46 -0700 |
|---|---|---|
| committer | Glyph <glyph@twistedmatrix.com> | 2015-06-26 23:09:46 -0700 |
| commit | d70c98d28effdc410d5ac773e0e461fb548a40e0 (patch) | |
| tree | 07b3d4c6ac771401d57765d219eef6ecada94400 /tests/hazmat | |
| parent | b51d246eb6ccaed7920ba6dd6a816f74d1158c16 (diff) | |
| download | cryptography-d70c98d28effdc410d5ac773e0e461fb548a40e0.tar.gz cryptography-d70c98d28effdc410d5ac773e0e461fb548a40e0.tar.bz2 cryptography-d70c98d28effdc410d5ac773e0e461fb548a40e0.zip | |
pointer shenanigans
apparently (?) ENGINE_by_id treats its ID as an opaque *pointer* key and
not actually as a string, and while CPython's CFFI support seems to
manage to preserve the pointer identity when using the same Python
string, PyPy doesn't. Fix things to use a cffi-wrapped pointer again
and tests pass on PyPy.
Diffstat (limited to 'tests/hazmat')
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index b24f03a8..6a2e8a77 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -223,9 +223,7 @@ class TestOpenSSLRandomEngine(object): # for all these tests. backend.activate_osrandom_engine() current_default = backend._lib.ENGINE_get_default_RAND() - name = backend._ffi.string( - backend._lib.ENGINE_get_name(current_default) - ) + name = backend._lib.ENGINE_get_name(current_default) assert name == backend._binding._osrandom_engine_name def test_osrandom_engine_is_default(self, tmpdir): @@ -259,7 +257,9 @@ class TestOpenSSLRandomEngine(object): stdout=out ) - osrandom_engine_name = backend._binding._osrandom_engine_name + osrandom_engine_name = backend._ffi.string( + backend._binding._osrandom_engine_name + ) assert engine_name.read().encode('ascii') == osrandom_engine_name @@ -277,15 +277,14 @@ class TestOpenSSLRandomEngine(object): backend.activate_osrandom_engine() e = backend._lib.ENGINE_get_default_RAND() name = backend._lib.ENGINE_get_name(e) - assert (backend._ffi.string(name) == - backend._binding._osrandom_engine_name) + assert name == backend._binding._osrandom_engine_name res = backend._lib.ENGINE_free(e) assert res == 1 def test_activate_builtin_random(self): e = backend._lib.ENGINE_get_default_RAND() assert e != backend._ffi.NULL - name = backend._ffi.string(backend._lib.ENGINE_get_name(e)) + name = backend._lib.ENGINE_get_name(e) assert name == backend._binding._osrandom_engine_name res = backend._lib.ENGINE_free(e) assert res == 1 @@ -303,13 +302,13 @@ class TestOpenSSLRandomEngine(object): def test_activate_osrandom_already_default(self): e = backend._lib.ENGINE_get_default_RAND() - name = backend._ffi.string(backend._lib.ENGINE_get_name(e)) + name = backend._lib.ENGINE_get_name(e) assert name == backend._binding._osrandom_engine_name res = backend._lib.ENGINE_free(e) assert res == 1 backend.activate_osrandom_engine() e = backend._lib.ENGINE_get_default_RAND() - name = backend._ffi.string(backend._lib.ENGINE_get_name(e)) + name = backend._lib.ENGINE_get_name(e) assert name == backend._binding._osrandom_engine_name res = backend._lib.ENGINE_free(e) assert res == 1 |