summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2011-07-21 22:16:56 +0200
committerSybren A. Stüvel <sybren@stuvel.eu>2011-07-21 22:16:56 +0200
commit049cc4acc00fd75bcbdce13760b72fcab9c4b009 (patch)
tree1dc2ce204cf312b603d4df0424ebce92ad3e503a /tests
parent6ab5251bd62a3330dd495378eeef22e3020fb32c (diff)
downloadrsa-git-049cc4acc00fd75bcbdce13760b72fcab9c4b009.tar.gz
Moved key load/save to PrivateKey class
Diffstat (limited to 'tests')
-rw-r--r--tests/test_load_save_keys.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test_load_save_keys.py b/tests/test_load_save_keys.py
index c13d059..5026afd 100644
--- a/tests/test_load_save_keys.py
+++ b/tests/test_load_save_keys.py
@@ -33,7 +33,7 @@ class DerTest(unittest.TestCase):
def test_load_private_key(self):
'''Test loading private DER keys.'''
- key = rsa.key.load_private_key_der(PRIVATE_DER)
+ key = rsa.key.PrivateKey.load_pkcs1_der(PRIVATE_DER)
expected = rsa.key.PrivateKey(3727264081, 65537, 3349121513, 65063, 57287)
self.assertEqual(expected, key)
@@ -42,7 +42,7 @@ class DerTest(unittest.TestCase):
'''Test saving private DER keys.'''
key = rsa.key.PrivateKey(3727264081, 65537, 3349121513, 65063, 57287)
- der = rsa.key.save_private_key_der(key)
+ der = key.save_pkcs1_der()
self.assertEqual(PRIVATE_DER, der)
@@ -53,7 +53,7 @@ class PemTest(unittest.TestCase):
def test_load_private_key(self):
'''Test loading private PEM files.'''
- key = rsa.key.load_private_key_pem(PRIVATE_PEM)
+ key = rsa.key.PrivateKey.load_pkcs1_pem(PRIVATE_PEM)
expected = rsa.key.PrivateKey(3727264081, 65537, 3349121513, 65063, 57287)
self.assertEqual(expected, key)
@@ -62,7 +62,7 @@ class PemTest(unittest.TestCase):
'''Test saving private PEM files.'''
key = rsa.key.PrivateKey(3727264081, 65537, 3349121513, 65063, 57287)
- pem = rsa.key.save_private_key_pem(key)
+ pem = key.save_pkcs1_pem()
self.assertEqual(CLEAN_PRIVATE_PEM, pem)