From fab0b06d170c1f4fe0e2ea610ac28b82cb521b76 Mon Sep 17 00:00:00 2001 From: Piotr Lizonczyk Date: Sun, 24 Feb 2019 12:38:54 +0100 Subject: [PATCH] Upgrade to Cryptography 2.5 --- noise/backends/default/keypairs.py | 13 +++++++------ requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/noise/backends/default/keypairs.py b/noise/backends/default/keypairs.py index 800e46d..5e74ddf 100644 --- a/noise/backends/default/keypairs.py +++ b/noise/backends/default/keypairs.py @@ -1,3 +1,4 @@ +from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives.asymmetric import x25519, x448 from noise.exceptions import NoiseValueError @@ -9,16 +10,16 @@ class KeyPair25519(KeyPair): def from_private_bytes(cls, private_bytes): if len(private_bytes) != 32: raise NoiseValueError('Invalid length of private_bytes! Should be 32') - private = x25519.X25519PrivateKey._from_private_bytes(private_bytes) + private = x25519.X25519PrivateKey.from_private_bytes(private_bytes) public = private.public_key() - return cls(private=private, public=public, public_bytes=public.public_bytes()) + return cls(private=private, public=public, public_bytes=public.public_bytes(encoding=serialization.Encoding.Raw, format=serialization.PublicFormat.Raw)) @classmethod def from_public_bytes(cls, public_bytes): if len(public_bytes) != 32: raise NoiseValueError('Invalid length of public_bytes! Should be 32') public = x25519.X25519PublicKey.from_public_bytes(public_bytes) - return cls(public=public, public_bytes=public.public_bytes()) + return cls(public=public, public_bytes=public.public_bytes(encoding=serialization.Encoding.Raw, format=serialization.PublicFormat.Raw)) class KeyPair448(KeyPair): @@ -26,13 +27,13 @@ class KeyPair448(KeyPair): def from_private_bytes(cls, private_bytes): if len(private_bytes) != 56: raise NoiseValueError('Invalid length of private_bytes! Should be 56') - private = x448.X448PrivateKey._from_private_bytes(private_bytes) + private = x448.X448PrivateKey.from_private_bytes(private_bytes) public = private.public_key() - return cls(private=private, public=public, public_bytes=public.public_bytes()) + return cls(private=private, public=public, public_bytes=public.public_bytes(encoding=serialization.Encoding.Raw, format=serialization.PublicFormat.Raw)) @classmethod def from_public_bytes(cls, public_bytes): if len(public_bytes) != 56: raise NoiseValueError('Invalid length of private_bytes! Should be 56') public = x448.X448PublicKey.from_public_bytes(public_bytes) - return cls(public=public, public_bytes=public.public_bytes()) + return cls(public=public, public_bytes=public.public_bytes(encoding=serialization.Encoding.Raw, format=serialization.PublicFormat.Raw)) diff --git a/requirements.txt b/requirements.txt index bb58975..34d60e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -git+git://github.com/pyca/cryptography@master +cryptography>=2.5 diff --git a/setup.py b/setup.py index 34fd012..964f35d 100644 --- a/setup.py +++ b/setup.py @@ -35,6 +35,6 @@ setup( ], keywords='cryptography noiseprotocol noise security', packages=find_packages(exclude=['contrib', 'docs', 'tests', 'examples']), - install_requires=['cryptography>=2.1.4'], + install_requires=['cryptography>=2.5'], python_requires='~=3.5', # we like 3.5, 3.6, and beyond, but not 4.0 )