Replace the hard-coded 522-bit RSA key size used for tests with a TEST_RSA_KEY_SIZE...

diff --git a/src/allmydata/test/common.py b/src/allmydata/test/common.py
index d728bcb068266107ca4741ead6e698150c6a8594..0be410be87e1138a4d42931c348efc20c1971519 100644 (file)
--- a/src/allmydata/test/common.py
+++ b/src/allmydata/test/common.py
@@ -26,6 +26,7 @@ from allmydata.key_generator import KeyGeneratorService
 import allmydata.test.common_util as testutil
 from allmydata import immutable
 
+TEST_RSA_KEY_SIZE = 2048
 
 def flush_but_dont_ignore(res):
     d = flushEventualQueue()

diff --git a/src/allmydata/test/no_network.py b/src/allmydata/test/no_network.py
index 4730a952601dd306a6aa0251c2e67aab6598202f..f510544ba12f3756c0c0d2218a58ea41c5ae6196 100644 (file)
--- a/src/allmydata/test/no_network.py
+++ b/src/allmydata/test/no_network.py
@@ -27,6 +27,8 @@ from allmydata.util import fileutil, idlib, hashutil
 from allmydata.util.hashutil import sha1
 from allmydata.test.common_web import HTTPClientGETFactory
 from allmydata.interfaces import IStorageBroker
+from allmydata.test.common import TEST_RSA_KEY_SIZE
+
 
 class IntentionalError(Exception):
     pass

diff --git a/src/allmydata/test/test_keygen.py b/src/allmydata/test/test_keygen.py
index c282a888291937dfe01156055b1ff201a49fa676..fe459cfbd3e04fdd142d7a92dc4f366f2daf9c41 100644 (file)
--- a/src/allmydata/test/test_keygen.py
+++ b/src/allmydata/test/test_keygen.py
@@ -7,6 +7,7 @@ from foolscap.api import Tub, fireEventually, flushEventualQueue
 
 from allmydata import key_generator
 from allmydata.util import pollmixin
+from allmydata.test.common import TEST_RSA_KEY_SIZE
 from pycryptopp.publickey import rsa
 
 def flush_but_dont_ignore(res):

diff --git a/src/allmydata/test/test_mutable.py b/src/allmydata/test/test_mutable.py
index 1ef424da95674a82a2ee2d17262433ee498f9f07..1b7fc9fb2f3caa0ebcba998996c8882c1bfa7f02 100644 (file)
--- a/src/allmydata/test/test_mutable.py
+++ b/src/allmydata/test/test_mutable.py
@@ -35,6 +35,8 @@ from allmydata.mutable.layout import unpack_header, MDMFSlotReadProxy
 from allmydata.mutable.repairer import MustForceRepairError
 
 import allmydata.test.common_util as testutil
+from allmydata.test.common import TEST_RSA_KEY_SIZE
+
 
 # this "FakeStorage" exists to put the share data in RAM and avoid using real
 # network connections, both to speed up the tests and to reduce the amount of