aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-27 12:29:58 +0900
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-27 12:30:29 +0900
commite4150bcc07fb2c68e3c860c31766b4282bba8740 (patch)
treeb688eae7a07be540e0cb2fd5ae44836afc8bf5d4 /src
parent3568563e0ecdec07606c8b5f3fed6eaea1fa95fd (diff)
downloadcryptography-e4150bcc07fb2c68e3c860c31766b4282bba8740.tar.gz
cryptography-e4150bcc07fb2c68e3c860c31766b4282bba8740.tar.bz2
cryptography-e4150bcc07fb2c68e3c860c31766b4282bba8740.zip
remove support for null points, improve docs
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/primitives/asymmetric/utils.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptography/hazmat/primitives/asymmetric/utils.py b/src/cryptography/hazmat/primitives/asymmetric/utils.py
index b62eadf0..57dea41a 100644
--- a/src/cryptography/hazmat/primitives/asymmetric/utils.py
+++ b/src/cryptography/hazmat/primitives/asymmetric/utils.py
@@ -79,9 +79,9 @@ def encode_ec_point(curve, x, y):
raise TypeError("curve must be an EllipticCurve instance")
if x is None:
- return b'\x00'
+ raise ValueError("null points are not supported")
else:
- # Get the ceiling of curve.key_size / 8
+ # key_size is in bits. Convert to bytes and round up
byte_length = (curve.key_size + 7) // 8
return (
b'\x04' + utils.int_to_bytes(x, byte_length) +
@@ -94,9 +94,9 @@ def decode_ec_point(curve, data):
raise TypeError("curve must be an EllipticCurve instance")
if data == b'\x00':
- return None, None
+ raise ValueError("null points are not supported")
elif data.startswith(b'\x04'):
- # Get the ceiling of curve.key_size / 8
+ # key_size is in bits. Convert to bytes and round up
byte_length = (curve.key_size + 7) // 8
if len(data) == 2 * byte_length + 1:
return (utils.int_from_bytes(data[1:byte_length + 1], 'big'),