ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-30 09:48:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

keyutil -> ed25519

Browse Source
This commit is contained in:
meejah 2020-05-07 20:57:06 -06:00
parent 02c3401e01
commit 765d9daa8c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
integration/test_grid_manager.py
View File

@ -5,7 +5,7 @@ import shutil
from os import mkdir, unlink, listdir, utime from os import mkdir, unlink, listdir, utime
from os.path import join, exists, getmtime from os.path import join, exists, getmtime
from allmydata.util import keyutil from allmydata.crypto import ed25519
from allmydata.util import base32 from allmydata.util import base32
from allmydata.util import configutil from allmydata.util import configutil
@ -23,8 +23,7 @@ def test_create_certificate(reactor):
reactor, "grid-manager", "--config", "-", "create", reactor, "grid-manager", "--config", "-", "create",
) )
privkey_bytes = json.loads(gm_config)['private_key'].encode('ascii') privkey_bytes = json.loads(gm_config)['private_key'].encode('ascii')
privkey, pubkey_bytes = keyutil.parse_privkey(privkey_bytes) privkey, pubkey = ed25519.signing_keypair_from_string(privkey_bytes)
pubkey = keyutil.parse_pubkey(pubkey_bytes)
# Note that zara + her key here are arbitrary and don't match any # Note that zara + her key here are arbitrary and don't match any
# "actual" clients in the test-grid; we're just checking that the # "actual" clients in the test-grid; we're just checking that the
@ -115,8 +114,7 @@ def test_reject_storage_server(reactor, request, storage_nodes, temp_dir, introd
reactor, "grid-manager", "--config", "-", "create", reactor, "grid-manager", "--config", "-", "create",
) )
privkey_bytes = json.loads(gm_config)['private_key'].encode('ascii') privkey_bytes = json.loads(gm_config)['private_key'].encode('ascii')
privkey, pubkey_bytes = keyutil.parse_privkey(privkey_bytes) privkey, _ = ed25519.signing_keypair_from_string(privkey_bytes)
pubkey = keyutil.parse_pubkey(pubkey_bytes)
# create certificates for first 2 storage-servers # create certificates for first 2 storage-servers
for idx, storage in enumerate(storage_nodes[:2]): for idx, storage in enumerate(storage_nodes[:2]):
@ -170,7 +168,7 @@ def test_reject_storage_server(reactor, request, storage_nodes, temp_dir, introd
config = configutil.get_config(join(carol._node_dir, "tahoe.cfg")) config = configutil.get_config(join(carol._node_dir, "tahoe.cfg"))
print(dir(config)) print(dir(config))
config.add_section("grid_managers") config.add_section("grid_managers")
config.set("grid_managers", "test", pubkey_bytes) config.set("grid_managers", "test", ed25519.string_from_verifying_key(pubkey))
config.write(open(join(carol._node_dir, "tahoe.cfg"), "w")) config.write(open(join(carol._node_dir, "tahoe.cfg"), "w"))
carol.signalProcess('TERM') carol.signalProcess('TERM')
yield carol._protocol.exited yield carol._protocol.exited