From b796621b2888f8573bfd42ed895c03667e3d5cb8 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 19 Oct 2014 18:42:01 -0700 Subject: Do these checks in pure python eagerly. We get errors in different places, depending on py2k vs. py3k if we don't. --- cryptography/hazmat/backends/openssl/backend.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py index f1cf908a..bb1a3f3d 100644 --- a/cryptography/hazmat/backends/openssl/backend.py +++ b/cryptography/hazmat/backends/openssl/backend.py @@ -984,6 +984,11 @@ class Backend(object): values. """ + if x < 0 or y < 0: + raise ValueError( + "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) @@ -1005,11 +1010,8 @@ class Backend(object): res = get_func(group, point, check_x, check_y, bn_ctx) assert res == 1 - if self._lib.BN_cmp(bn_x, check_x) != 0: - raise ValueError("Invalid EC key.") - - if self._lib.BN_cmp(bn_y, check_y) != 0: - raise ValueError("Invalid EC key.") + assert self._lib.BN_cmp(bn_x, check_x) == 0 + assert self._lib.BN_cmp(bn_y, check_y) == 0 res = self._lib.EC_KEY_set_public_key(ctx, point) assert res == 1 -- cgit v1.2.3