aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat
diff options
context:
space:
mode:
authorAlex Stapleton <alexs@prol.etari.at>2015-01-18 17:15:47 +0000
committerAlex Stapleton <alex@ly.st>2015-01-22 16:38:13 +0000
commitd76aa47f9797b9bfa02e1f22b593f1c16a3edc13 (patch)
treea0a871dbd653a0d8c20107450f5c868d6d47ffc0 /tests/hazmat
parentf48f69d6654a10a46e34323747c54e0f0ccb7eef (diff)
downloadcryptography-d76aa47f9797b9bfa02e1f22b593f1c16a3edc13.tar.gz
cryptography-d76aa47f9797b9bfa02e1f22b593f1c16a3edc13.tar.bz2
cryptography-d76aa47f9797b9bfa02e1f22b593f1c16a3edc13.zip
Move around bits of the EC test suite to work around awful PyPy bug
Diffstat (limited to 'tests/hazmat')
-rw-r--r--tests/hazmat/backends/test_openssl.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py
index b6bb5491..5b5c7bd7 100644
--- a/tests/hazmat/backends/test_openssl.py
+++ b/tests/hazmat/backends/test_openssl.py
@@ -249,19 +249,6 @@ class TestOpenSSLRandomEngine(object):
assert res == 1
assert backend._ffi.buffer(buf)[:] != "\x00" * 500
- def test_activate_osrandom_already_default(self):
- e = backend._lib.ENGINE_get_default_RAND()
- name = backend._lib.ENGINE_get_name(e)
- assert name == backend._lib.Cryptography_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._lib.ENGINE_get_name(e)
- assert name == backend._lib.Cryptography_osrandom_engine_name
- res = backend._lib.ENGINE_free(e)
- assert res == 1
-
def test_activate_osrandom_no_default(self):
backend.activate_builtin_random()
e = backend._lib.ENGINE_get_default_RAND()
@@ -292,6 +279,19 @@ class TestOpenSSLRandomEngine(object):
e = backend._lib.ENGINE_get_default_RAND()
assert e == backend._ffi.NULL
+ def test_activate_osrandom_already_default(self):
+ e = backend._lib.ENGINE_get_default_RAND()
+ name = backend._lib.ENGINE_get_name(e)
+ assert name == backend._lib.Cryptography_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._lib.ENGINE_get_name(e)
+ assert name == backend._lib.Cryptography_osrandom_engine_name
+ res = backend._lib.ENGINE_free(e)
+ assert res == 1
+
class TestOpenSSLRSA(object):
def test_generate_rsa_parameters_supported(self):