aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-01-23 08:25:07 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-01-23 08:25:07 -0600
commitb9690abdb3b8afc0599a30deddd06a1681286d47 (patch)
tree7f4b92ddd0c694818718ec28a1e3c6d527ec5cd2 /tests
parent418053a577b00a99d45036dc87d711e19d3867e9 (diff)
parentd76aa47f9797b9bfa02e1f22b593f1c16a3edc13 (diff)
downloadcryptography-b9690abdb3b8afc0599a30deddd06a1681286d47.tar.gz
cryptography-b9690abdb3b8afc0599a30deddd06a1681286d47.tar.bz2
cryptography-b9690abdb3b8afc0599a30deddd06a1681286d47.zip
Merge pull request #1634 from public/deprecate-dsa
Move DSA* interfaces to interfaces.dsa module
Diffstat (limited to 'tests')
-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):