aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-10-19 22:19:35 -0700
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-10-19 22:19:35 -0700
commit9c2cdcd5e9a62ed97f6d1282d613e52f3db26ee8 (patch)
tree1219218d212b309029dae2f55e0164c657024a29 /cryptography
parentf63ace86e4665c3413d905ec546ce6ef5b4e6bbb (diff)
parentb796621b2888f8573bfd42ed895c03667e3d5cb8 (diff)
downloadcryptography-9c2cdcd5e9a62ed97f6d1282d613e52f3db26ee8.tar.gz
cryptography-9c2cdcd5e9a62ed97f6d1282d613e52f3db26ee8.tar.bz2
cryptography-9c2cdcd5e9a62ed97f6d1282d613e52f3db26ee8.zip
Merge pull request #1418 from alex/fix-ec-complains
Fixes #1416 -- replaced assertions with error checking in EC key from numbers.
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index 567f1648..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)