Skip to content

Commit eb5f55c

Browse files
committed
tests: reduce generate_key usage
1 parent 2ebe3cc commit eb5f55c

3 files changed

Lines changed: 22 additions & 24 deletions

File tree

tests/jwe/test_json.py

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010

1111

1212
class TestJWEJSON(TestCase):
13+
rsa_key = RSAKey.generate_key()
14+
ec_key = ECKey.generate_key()
15+
1316
def test_multiple_recipients_with_key(self):
14-
key1 = RSAKey.generate_key()
15-
key2 = ECKey.generate_key()
1617
obj = GeneralJSONEncryption({"enc": "A128CBC-HS256"}, b"i")
17-
obj.add_recipient({"alg": "RSA-OAEP"}, key1)
18-
obj.add_recipient({"alg": "ECDH-ES+A128KW"}, key2)
18+
obj.add_recipient({"alg": "RSA-OAEP"}, self.rsa_key)
19+
obj.add_recipient({"alg": "ECDH-ES+A128KW"}, self.ec_key)
1920
value = jwe.encrypt_json(obj, None)
2021
self.assertIn("recipients", value)
2122
self.assertEqual(len(value["recipients"]), 2)
@@ -33,7 +34,7 @@ def test_multiple_recipients_without_key(self):
3334
def test_multiple_recipients_with_direct_mode(self):
3435
obj = GeneralJSONEncryption({"enc": "A128CBC-HS256"}, b"i")
3536
obj.add_recipient({"alg": "dir"}, OctKey.generate_key())
36-
obj.add_recipient({"alg": "RSA-OAEP"}, RSAKey.generate_key())
37+
obj.add_recipient({"alg": "RSA-OAEP"}, self.rsa_key)
3738
self.assertRaises(
3839
ConflictAlgorithmError,
3940
jwe.encrypt_json,
@@ -42,26 +43,23 @@ def test_multiple_recipients_with_direct_mode(self):
4243

4344
def test_with_aad(self):
4445
obj = GeneralJSONEncryption({"enc": "A128CBC-HS256"}, b"i", aad=b"foo")
45-
key1 = RSAKey.generate_key()
46-
obj.add_recipient({"alg": "RSA-OAEP"}, key1)
46+
obj.add_recipient({"alg": "RSA-OAEP"}, self.rsa_key)
4747
value = jwe.encrypt_json(obj, None)
48-
obj1 = jwe.decrypt_json(value, key1)
48+
obj1 = jwe.decrypt_json(value, self.rsa_key)
4949
self.assertEqual(obj1.aad, b"foo")
5050

5151
def test_decode_multiple_recipients(self):
52-
key1 = RSAKey.generate_key()
53-
key2 = ECKey.generate_key()
5452
obj = GeneralJSONEncryption({"enc": "A128CBC-HS256"}, b"i")
55-
obj.add_recipient({"alg": "RSA-OAEP"}, key1)
56-
obj.add_recipient({"alg": "ECDH-ES+A128KW"}, key2)
53+
obj.add_recipient({"alg": "RSA-OAEP"}, self.rsa_key)
54+
obj.add_recipient({"alg": "ECDH-ES+A128KW"}, self.ec_key)
5755
value = jwe.encrypt_json(obj, None)
5856
self.assertRaises(
5957
InvalidKeyTypeError,
6058
jwe.decrypt_json,
61-
value, key1,
59+
value, self.rsa_key,
6260
)
6361
registry = jwe.JWERegistry(verify_all_recipients=False)
64-
obj1 = jwe.decrypt_json(value, key1, registry=registry)
62+
obj1 = jwe.decrypt_json(value, self.rsa_key, registry=registry)
6563
self.assertEqual(obj1.plaintext, b"i")
6664

6765
key3 = OctKey.generate_key()

tests/jwk/test_ec_key.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66

77
class TestECKey(TestCase):
8+
default_key = ECKey.generate_key()
9+
810
def test_exchange_derive_key(self):
911
key1 = ECKey.generate_key("P-256")
1012
key2 = ECKey.generate_key("P-384")
@@ -58,9 +60,8 @@ def test_generate_key(self):
5860
self.assertIsNotNone(key.kid)
5961

6062
def test_import_from_der_bytes(self):
61-
origin_key = ECKey.generate_key()
62-
value1 = origin_key.as_der()
63-
value2 = origin_key.as_der(private=False)
63+
value1 = self.default_key.as_der()
64+
value2 = self.default_key.as_der(private=False)
6465

6566
key1 = ECKey.import_key(value1)
6667
key2 = ECKey.import_key(value2)
@@ -80,13 +81,11 @@ def test_output_with_password(self):
8081
self.assertEqual(key.as_dict(), key2.as_dict())
8182

8283
def test_key_eq(self):
83-
key1 = ECKey.generate_key()
84+
key1 = self.default_key
8485
key2 = ECKey.import_key(key1.as_dict())
8586
self.assertEqual(key1, key2)
8687
key3 = ECKey.generate_key()
8788
self.assertNotEqual(key1, key3)
8889

8990
def test_key_eq_with_different_types(self):
90-
key1 = ECKey.generate_key()
91-
key2 = OctKey.generate_key()
92-
self.assertNotEqual(key1, key2)
91+
self.assertNotEqual(self.default_key, OctKey.generate_key())

tests/jwk/test_rsa_key.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55

66
class TestRSAKey(TestCase):
7+
default_key = RSAKey.generate_key()
8+
79
def test_import_key_from_dict(self):
810
# https://www.rfc-editor.org/rfc/rfc7517#appendix-A.1
911
data = {
@@ -128,8 +130,7 @@ def test_generate_key(self):
128130
self.assertIsNotNone(key.kid)
129131

130132
def test_import_from_der_bytes(self):
131-
origin_key = RSAKey.generate_key()
132-
value1 = origin_key.as_der()
133+
value1 = self.default_key.as_der()
133134
key1 = RSAKey.import_key(value1)
134135
self.assertEqual(value1, key1.as_der())
135136

@@ -152,7 +153,7 @@ def test_output_with_password(self):
152153
self.assertEqual(key.as_dict(), key2.as_dict())
153154

154155
def test_key_eq(self):
155-
key1 = RSAKey.generate_key()
156+
key1 = self.default_key
156157
key2 = RSAKey.import_key(key1.as_dict())
157158
self.assertIsNot(key1, key2)
158159
self.assertEqual(key1, key2)

0 commit comments

Comments
 (0)