diff options
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 12 | ||||
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 26 |
2 files changed, 20 insertions, 18 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index 34efdce9..75d7e32f 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -985,9 +985,6 @@ class Backend(object): "Invalid EC key. Both x and y must be non-negative." ) - bn_x = self._int_to_bn(x) - bn_y = self._int_to_bn(y) - set_func, get_func, group = ( self._ec_key_determine_group_get_set_funcs(ctx) ) @@ -996,6 +993,9 @@ class Backend(object): assert point != self._ffi.NULL point = self._ffi.gc(point, self._lib.EC_POINT_free) + bn_x = self._int_to_bn(x) + bn_y = self._int_to_bn(y) + with self._tmp_bn_ctx() as bn_ctx: check_x = self._lib.BN_CTX_get(bn_ctx) check_y = self._lib.BN_CTX_get(bn_ctx) @@ -1006,8 +1006,10 @@ class Backend(object): res = get_func(group, point, check_x, check_y, bn_ctx) assert res == 1 - assert self._lib.BN_cmp(bn_x, check_x) == 0 - assert self._lib.BN_cmp(bn_y, check_y) == 0 + res = self._lib.BN_cmp(bn_x, check_x) + assert res == 0 + res = self._lib.BN_cmp(bn_y, check_y) + assert res == 0 res = self._lib.EC_KEY_set_public_key(ctx, point) assert res == 1 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): |