From b45731b94d7a50b4b4ca39e6a571fc5c19f509b4 Mon Sep 17 00:00:00 2001 From: michael-hart Date: Tue, 23 Sep 2014 23:10:32 +0100 Subject: Part 1 of rebase, with corrections for pep8 --- tests/hazmat/primitives/test_serialization.py | 36 ++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'tests/hazmat/primitives/test_serialization.py') diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index d369e8f4..4bc7e811 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -24,6 +24,7 @@ from cryptography.hazmat.primitives import interfaces from cryptography.hazmat.primitives.asymmetric import ec from cryptography.hazmat.primitives.serialization import ( load_pem_pkcs8_private_key, load_pem_private_key, + load_pem_public_key, load_pem_traditional_openssl_private_key ) @@ -38,7 +39,7 @@ class TestPEMSerialization(object): def test_load_pem_rsa_private_key(self, backend): key = load_vectors_from_file( os.path.join( - "asymmetric", "Traditional_OpenSSL_Serialization", "key1.pem"), + "asymmetric", "PEM_Serialization", "rsa_private_key.pem"), lambda pemfile: load_pem_private_key( pemfile.read().encode(), b"123456", backend ) @@ -49,6 +50,17 @@ class TestPEMSerialization(object): if isinstance(key, interfaces.RSAPrivateKeyWithNumbers): _check_rsa_private_numbers(key.private_numbers()) + def test_load_dsa_private_key(self, backend): + key = load_vectors_from_file( + os.path.join( + "asymmetric", "PEM_Serialization", "dsa_private_key.pem"), + lambda pemfile: load_pem_private_key( + pemfile.read().encode(), b"123456", backend + ) + ) + assert key + assert isinstance(key, interfaces.DSAPrivateKey) + @pytest.mark.parametrize( ("key_file", "password"), [ @@ -70,6 +82,28 @@ class TestPEMSerialization(object): assert key assert isinstance(key, interfaces.EllipticCurvePrivateKey) + def test_load_pem_rsa_public_key(self, backend): + key = load_vectors_from_file( + os.path.join( + "asymmetric", "PEM_Serialization", "rsa_public_key.pem"), + lambda pemfile: load_pem_public_key( + pemfile.read().encode(), backend + ) + ) + assert key + assert isinstance(key, interfaces.RSAPublicKey) + + def test_load_pem_dsa_public_key(self, backend): + key = load_vectors_from_file( + os.path.join( + "asymmetric", "PEM_Serialization", "dsa_public_key.pem"), + lambda pemfile: load_pem_public_key( + pemfile.read().encode(), backend + ) + ) + assert key + assert isinstance(key, interfaces.DSAPublicKey) + @pytest.mark.traditional_openssl_serialization class TestTraditionalOpenSSLSerialization(object): -- cgit v1.2.3 From 801e8c1b88b77e9feb8ad57af166c4b52b15f22a Mon Sep 17 00:00:00 2001 From: michael-hart Date: Fri, 26 Sep 2014 00:32:25 +0100 Subject: Added all changes lost in merge reset --- tests/hazmat/primitives/test_serialization.py | 37 +++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'tests/hazmat/primitives/test_serialization.py') diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index 4bc7e811..2ee096be 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -82,21 +82,40 @@ class TestPEMSerialization(object): assert key assert isinstance(key, interfaces.EllipticCurvePrivateKey) - def test_load_pem_rsa_public_key(self, backend): - key = load_vectors_from_file( + @pytest.mark.parametrize( + ("key_file"), + [ + os.path.join("asymmetric", "PKCS8", "unenc-rsa-pkcs8.pub.pem"), os.path.join( "asymmetric", "PEM_Serialization", "rsa_public_key.pem"), + ), + ] + ) + def test_load_pem_rsa_public_key(self, key_file, backend): + key = load_vectors_from_file( + key_file, lambda pemfile: load_pem_public_key( pemfile.read().encode(), backend ) ) assert key assert isinstance(key, interfaces.RSAPublicKey) + if isinstance(key, interfaces.RSAPublicKeyWithNumbers): + numbers = key.public_numbers() + assert numbers.e == 65537 - def test_load_pem_dsa_public_key(self, backend): + @pytest.mark.parametrize( + ("key_file"), + [ + os.path.join("asymmetric", "PKCS8", "unenc-dsa-pkcs8.pub.pem"), + os.path.join( + "asymmetric", "PEM_Serialization", + "dsa_public_key.pem" +), ), + ] + def test_load_pem_dsa_public_key(self, keyfile, backend): key = load_vectors_from_file( - os.path.join( - "asymmetric", "PEM_Serialization", "dsa_public_key.pem"), + keyfile, lambda pemfile: load_pem_public_key( pemfile.read().encode(), backend ) @@ -104,6 +123,14 @@ class TestPEMSerialization(object): assert key assert isinstance(key, interfaces.DSAPublicKey) + def test_load_pem_ec_public_key(self, backend): + key = load_vectors_from_file( + os.path.join("asymmetric", "PEM_Serialization", + "ec_public_key.pem"), + lambda pemfile: load_pem_public_key( + pemfile.read().encode(), backend + ) + ) @pytest.mark.traditional_openssl_serialization class TestTraditionalOpenSSLSerialization(object): -- cgit v1.2.3 From fe2cd085cffe05fbdec02164a93de7812acb44dd Mon Sep 17 00:00:00 2001 From: michael-hart Date: Fri, 26 Sep 2014 01:01:50 +0100 Subject: Corrected tests --- tests/hazmat/primitives/test_serialization.py | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'tests/hazmat/primitives/test_serialization.py') diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index 2ee096be..7cbd3f71 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -88,7 +88,6 @@ class TestPEMSerialization(object): os.path.join("asymmetric", "PKCS8", "unenc-rsa-pkcs8.pub.pem"), os.path.join( "asymmetric", "PEM_Serialization", "rsa_public_key.pem"), - ), ] ) def test_load_pem_rsa_public_key(self, key_file, backend): @@ -105,17 +104,17 @@ class TestPEMSerialization(object): assert numbers.e == 65537 @pytest.mark.parametrize( - ("key_file"), - [ - os.path.join("asymmetric", "PKCS8", "unenc-dsa-pkcs8.pub.pem"), - os.path.join( + ("key_file"), + [ + os.path.join("asymmetric", "PKCS8", "unenc-dsa-pkcs8.pub.pem"), + os.path.join( "asymmetric", "PEM_Serialization", - "dsa_public_key.pem" -), ), - ] - def test_load_pem_dsa_public_key(self, keyfile, backend): + "dsa_public_key.pem"), + ] + ) + def test_load_pem_dsa_public_key(self, key_file, backend): key = load_vectors_from_file( - keyfile, + key_file, lambda pemfile: load_pem_public_key( pemfile.read().encode(), backend ) @@ -123,14 +122,6 @@ class TestPEMSerialization(object): assert key assert isinstance(key, interfaces.DSAPublicKey) - def test_load_pem_ec_public_key(self, backend): - key = load_vectors_from_file( - os.path.join("asymmetric", "PEM_Serialization", - "ec_public_key.pem"), - lambda pemfile: load_pem_public_key( - pemfile.read().encode(), backend - ) - ) @pytest.mark.traditional_openssl_serialization class TestTraditionalOpenSSLSerialization(object): -- cgit v1.2.3 From 2ca899115b80dba47b65a8255bbbce1cce2ce238 Mon Sep 17 00:00:00 2001 From: michael-hart Date: Tue, 23 Sep 2014 23:10:32 +0100 Subject: Part 1 of rebase, with corrections for pep8 --- tests/hazmat/primitives/test_serialization.py | 28 +++++---------------------- 1 file changed, 5 insertions(+), 23 deletions(-) (limited to 'tests/hazmat/primitives/test_serialization.py') diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index 7cbd3f71..4bc7e811 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -82,39 +82,21 @@ class TestPEMSerialization(object): assert key assert isinstance(key, interfaces.EllipticCurvePrivateKey) - @pytest.mark.parametrize( - ("key_file"), - [ - os.path.join("asymmetric", "PKCS8", "unenc-rsa-pkcs8.pub.pem"), + def test_load_pem_rsa_public_key(self, backend): + key = load_vectors_from_file( os.path.join( "asymmetric", "PEM_Serialization", "rsa_public_key.pem"), - ] - ) - def test_load_pem_rsa_public_key(self, key_file, backend): - key = load_vectors_from_file( - key_file, lambda pemfile: load_pem_public_key( pemfile.read().encode(), backend ) ) assert key assert isinstance(key, interfaces.RSAPublicKey) - if isinstance(key, interfaces.RSAPublicKeyWithNumbers): - numbers = key.public_numbers() - assert numbers.e == 65537 - @pytest.mark.parametrize( - ("key_file"), - [ - os.path.join("asymmetric", "PKCS8", "unenc-dsa-pkcs8.pub.pem"), - os.path.join( - "asymmetric", "PEM_Serialization", - "dsa_public_key.pem"), - ] - ) - def test_load_pem_dsa_public_key(self, key_file, backend): + def test_load_pem_dsa_public_key(self, backend): key = load_vectors_from_file( - key_file, + os.path.join( + "asymmetric", "PEM_Serialization", "dsa_public_key.pem"), lambda pemfile: load_pem_public_key( pemfile.read().encode(), backend ) -- cgit v1.2.3 From 254811fd619188610298485a66885784944c1de8 Mon Sep 17 00:00:00 2001 From: michael-hart Date: Fri, 26 Sep 2014 00:32:25 +0100 Subject: Added all changes lost in merge reset --- tests/hazmat/primitives/test_serialization.py | 37 +++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'tests/hazmat/primitives/test_serialization.py') diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index 4bc7e811..2ee096be 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -82,21 +82,40 @@ class TestPEMSerialization(object): assert key assert isinstance(key, interfaces.EllipticCurvePrivateKey) - def test_load_pem_rsa_public_key(self, backend): - key = load_vectors_from_file( + @pytest.mark.parametrize( + ("key_file"), + [ + os.path.join("asymmetric", "PKCS8", "unenc-rsa-pkcs8.pub.pem"), os.path.join( "asymmetric", "PEM_Serialization", "rsa_public_key.pem"), + ), + ] + ) + def test_load_pem_rsa_public_key(self, key_file, backend): + key = load_vectors_from_file( + key_file, lambda pemfile: load_pem_public_key( pemfile.read().encode(), backend ) ) assert key assert isinstance(key, interfaces.RSAPublicKey) + if isinstance(key, interfaces.RSAPublicKeyWithNumbers): + numbers = key.public_numbers() + assert numbers.e == 65537 - def test_load_pem_dsa_public_key(self, backend): + @pytest.mark.parametrize( + ("key_file"), + [ + os.path.join("asymmetric", "PKCS8", "unenc-dsa-pkcs8.pub.pem"), + os.path.join( + "asymmetric", "PEM_Serialization", + "dsa_public_key.pem" +), ), + ] + def test_load_pem_dsa_public_key(self, keyfile, backend): key = load_vectors_from_file( - os.path.join( - "asymmetric", "PEM_Serialization", "dsa_public_key.pem"), + keyfile, lambda pemfile: load_pem_public_key( pemfile.read().encode(), backend ) @@ -104,6 +123,14 @@ class TestPEMSerialization(object): assert key assert isinstance(key, interfaces.DSAPublicKey) + def test_load_pem_ec_public_key(self, backend): + key = load_vectors_from_file( + os.path.join("asymmetric", "PEM_Serialization", + "ec_public_key.pem"), + lambda pemfile: load_pem_public_key( + pemfile.read().encode(), backend + ) + ) @pytest.mark.traditional_openssl_serialization class TestTraditionalOpenSSLSerialization(object): -- cgit v1.2.3 From 0a4c401431f2864b03e6e8baf3c0478bfe74b8b2 Mon Sep 17 00:00:00 2001 From: michael-hart Date: Fri, 26 Sep 2014 01:01:50 +0100 Subject: Corrected tests --- tests/hazmat/primitives/test_serialization.py | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'tests/hazmat/primitives/test_serialization.py') diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index 2ee096be..7cbd3f71 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -88,7 +88,6 @@ class TestPEMSerialization(object): os.path.join("asymmetric", "PKCS8", "unenc-rsa-pkcs8.pub.pem"), os.path.join( "asymmetric", "PEM_Serialization", "rsa_public_key.pem"), - ), ] ) def test_load_pem_rsa_public_key(self, key_file, backend): @@ -105,17 +104,17 @@ class TestPEMSerialization(object): assert numbers.e == 65537 @pytest.mark.parametrize( - ("key_file"), - [ - os.path.join("asymmetric", "PKCS8", "unenc-dsa-pkcs8.pub.pem"), - os.path.join( + ("key_file"), + [ + os.path.join("asymmetric", "PKCS8", "unenc-dsa-pkcs8.pub.pem"), + os.path.join( "asymmetric", "PEM_Serialization", - "dsa_public_key.pem" -), ), - ] - def test_load_pem_dsa_public_key(self, keyfile, backend): + "dsa_public_key.pem"), + ] + ) + def test_load_pem_dsa_public_key(self, key_file, backend): key = load_vectors_from_file( - keyfile, + key_file, lambda pemfile: load_pem_public_key( pemfile.read().encode(), backend ) @@ -123,14 +122,6 @@ class TestPEMSerialization(object): assert key assert isinstance(key, interfaces.DSAPublicKey) - def test_load_pem_ec_public_key(self, backend): - key = load_vectors_from_file( - os.path.join("asymmetric", "PEM_Serialization", - "ec_public_key.pem"), - lambda pemfile: load_pem_public_key( - pemfile.read().encode(), backend - ) - ) @pytest.mark.traditional_openssl_serialization class TestTraditionalOpenSSLSerialization(object): -- cgit v1.2.3 From bdceabc6ad5c48038ee767d64d856e15e016ca7a Mon Sep 17 00:00:00 2001 From: michael-hart Date: Fri, 26 Sep 2014 08:51:59 +0100 Subject: Added code and tests of EC public keys --- tests/hazmat/primitives/test_serialization.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tests/hazmat/primitives/test_serialization.py') diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index 7cbd3f71..a97e38f5 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -122,6 +122,18 @@ class TestPEMSerialization(object): assert key assert isinstance(key, interfaces.DSAPublicKey) + @pytest.mark.elliptic + def test_load_ec_public_key(self, backend): + _skip_curve_unsupported(backend, ec.SECP256R1()) + key = load_vectors_from_file( + os.path.join("asymmetric", "PEM_Serialization", "ec_public_key.pem"), + lambda pemfile: load_pem_public_key( + pemfile.read().encode(), backend + ) + ) + assert key + assert isinstance(key, interfaces.EllipticCurvePublicKey) + @pytest.mark.traditional_openssl_serialization class TestTraditionalOpenSSLSerialization(object): -- cgit v1.2.3 From 48060f25c43e4c8d05ef6a8c940321cdb3913d54 Mon Sep 17 00:00:00 2001 From: michael-hart Date: Fri, 26 Sep 2014 09:00:37 +0100 Subject: flake8 --- tests/hazmat/primitives/test_serialization.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/hazmat/primitives/test_serialization.py') diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index a97e38f5..8405f4b2 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -126,7 +126,9 @@ class TestPEMSerialization(object): def test_load_ec_public_key(self, backend): _skip_curve_unsupported(backend, ec.SECP256R1()) key = load_vectors_from_file( - os.path.join("asymmetric", "PEM_Serialization", "ec_public_key.pem"), + os.path.join( + "asymmetric", "PEM_Serialization", + "ec_public_key.pem"), lambda pemfile: load_pem_public_key( pemfile.read().encode(), backend ) -- cgit v1.2.3