Skip to content

Commit 5135756

Browse files
committed
fix 'tox -e speed' to work with the new parameters/ layout
1 parent 4bc6bc7 commit 5135756

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def abbrev(t):
3838

3939
for params in ["ParamsEd25519",
4040
"Params1024", "Params2048", "Params3072"]:
41-
S1 = "from spake2 import SPAKE2_A, SPAKE2_B, %s" % params
41+
S1 = "from spake2 import SPAKE2_A, SPAKE2_B; from spake2.parameters.all import %s" % params
4242
S2 = "sB = SPAKE2_B(b'password', params=%s)" % params
4343
S3 = "mB = sB.start()"
4444
S4 = "sA = SPAKE2_A(b'password', params=%s)" % params
@@ -48,7 +48,7 @@ def abbrev(t):
4848
full = do([S1, S2, S3], ";".join([S4, S5, S8]))
4949
start = do([S1], ";".join([S4, S5]))
5050
# how large is the generated message?
51-
from spake2 import params as all_params
51+
from spake2.parameters import all as all_params
5252
from spake2 import SPAKE2_A
5353
p = getattr(all_params, params)
5454
s = SPAKE2_A(b"pw", params=p)

src/spake2/parameters/all.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
from .ed25519 import ParamsEd25519
2+
from .i1024 import Params1024
3+
from .i2048 import Params2048
4+
from .i3072 import Params3072

0 commit comments

Comments
 (0)