Skip to content

Commit 920fa96

Browse files
authored
Replace RSA-512 test keys with RSA-2048 (#1281)
RSA-512 was factored in 1999. Since none of these tests are specific to the size of the RSA key, best to test inputs that are representative of real-world inputs, lest the underlying cryptography library start enforcing post-1999 security levels.
1 parent 8219562 commit 920fa96

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tests/test_crypto.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ def x509_data():
770770
"""
771771
# Basic setup stuff to generate a certificate
772772
pkey = PKey()
773-
pkey.generate_key(TYPE_RSA, 512)
773+
pkey.generate_key(TYPE_RSA, 2048)
774774
req = X509Req()
775775
req.set_pubkey(pkey)
776776
# Authority good you have.
@@ -1123,7 +1123,7 @@ def test_rsa_generation(self):
11231123
`PKey.generate_key` generates an RSA key when passed `TYPE_RSA` as a
11241124
type and a reasonable number of bits.
11251125
"""
1126-
bits = 512
1126+
bits = 2048
11271127
key = PKey()
11281128
key.generate_key(TYPE_RSA, bits)
11291129
assert key.type() == TYPE_RSA
@@ -1152,7 +1152,7 @@ def test_regeneration(self):
11521152
generate new keys.
11531153
"""
11541154
key = PKey()
1155-
for type, bits in [(TYPE_RSA, 512), (TYPE_DSA, 576)]:
1155+
for type, bits in [(TYPE_RSA, 2048), (TYPE_DSA, 576)]:
11561156
key.generate_key(type, bits)
11571157
assert key.type() == type
11581158
assert key.bits() == bits
@@ -1173,7 +1173,7 @@ def test_check_public_key(self):
11731173
"""
11741174
# A trick to get a public-only key
11751175
key = PKey()
1176-
key.generate_key(TYPE_RSA, 512)
1176+
key.generate_key(TYPE_RSA, 2048)
11771177
cert = X509()
11781178
cert.set_pubkey(key)
11791179
pub = cert.get_pubkey()
@@ -1487,7 +1487,7 @@ def test_sign_with_public_key(self):
14871487
"""
14881488
request = self.signable()
14891489
key = PKey()
1490-
key.generate_key(TYPE_RSA, 512)
1490+
key.generate_key(TYPE_RSA, 2048)
14911491
request.set_pubkey(key)
14921492
pub = request.get_pubkey()
14931493
with pytest.raises(ValueError):
@@ -1500,7 +1500,7 @@ def test_sign_with_unknown_digest(self):
15001500
"""
15011501
request = self.signable()
15021502
key = PKey()
1503-
key.generate_key(TYPE_RSA, 512)
1503+
key.generate_key(TYPE_RSA, 2048)
15041504
with pytest.raises(ValueError):
15051505
request.sign(key, BAD_DIGEST)
15061506

@@ -1512,7 +1512,7 @@ def test_sign(self):
15121512
"""
15131513
request = self.signable()
15141514
key = PKey()
1515-
key.generate_key(TYPE_RSA, 512)
1515+
key.generate_key(TYPE_RSA, 2048)
15161516
request.set_pubkey(key)
15171517
request.sign(key, GOOD_DIGEST)
15181518
# If the type has a verify method, cover that too.
@@ -1521,7 +1521,7 @@ def test_sign(self):
15211521
assert request.verify(pub)
15221522
# Make another key that won't verify.
15231523
key = PKey()
1524-
key.generate_key(TYPE_RSA, 512)
1524+
key.generate_key(TYPE_RSA, 2048)
15251525
with pytest.raises(Error):
15261526
request.verify(key)
15271527

@@ -2773,7 +2773,7 @@ def test_dump_privatekey_wrong_args(self):
27732773
argument but no `passphrase` argument.
27742774
"""
27752775
key = PKey()
2776-
key.generate_key(TYPE_RSA, 512)
2776+
key.generate_key(TYPE_RSA, 2048)
27772777
with pytest.raises(TypeError):
27782778
dump_privatekey(FILETYPE_PEM, key, cipher=GOOD_CIPHER)
27792779

@@ -2797,7 +2797,7 @@ def test_dump_privatekey_unknown_cipher(self):
27972797
cipher name.
27982798
"""
27992799
key = PKey()
2800-
key.generate_key(TYPE_RSA, 512)
2800+
key.generate_key(TYPE_RSA, 2048)
28012801
with pytest.raises(ValueError):
28022802
dump_privatekey(FILETYPE_PEM, key, BAD_CIPHER, "passphrase")
28032803

@@ -2807,7 +2807,7 @@ def test_dump_privatekey_invalid_passphrase_type(self):
28072807
is neither a `str` nor a callable.
28082808
"""
28092809
key = PKey()
2810-
key.generate_key(TYPE_RSA, 512)
2810+
key.generate_key(TYPE_RSA, 2048)
28112811
with pytest.raises(TypeError):
28122812
dump_privatekey(FILETYPE_PEM, key, GOOD_CIPHER, object())
28132813

@@ -2817,7 +2817,7 @@ def test_dump_privatekey_invalid_filetype(self):
28172817
filetype.
28182818
"""
28192819
key = PKey()
2820-
key.generate_key(TYPE_RSA, 512)
2820+
key.generate_key(TYPE_RSA, 2048)
28212821
with pytest.raises(ValueError):
28222822
dump_privatekey(100, key)
28232823

0 commit comments

Comments
 (0)