Use new RSA key type

This commit is contained in:
Alex Stokes 2019-08-13 18:18:12 -07:00
parent 61f78c8feb
commit c40314a043
No known key found for this signature in database
GPG Key ID: 51CE1721B245C086

View File

@ -1,8 +1,7 @@
import asyncio import asyncio
from typing import Mapping, Sequence from typing import Mapping, Sequence
from Crypto.PublicKey import RSA from libp2p.crypto.rsa import create_new_key_pair
from libp2p.host.basic_host import BasicHost from libp2p.host.basic_host import BasicHost
from libp2p.kademlia.network import KademliaServer from libp2p.kademlia.network import KademliaServer
from libp2p.kademlia.storage import IStorage from libp2p.kademlia.storage import IStorage
@ -34,9 +33,9 @@ async def cleanup_done_tasks() -> None:
await asyncio.sleep(3) await asyncio.sleep(3)
def generate_id() -> ID: def generate_peer_id_from_rsa_identity() -> ID:
new_key = RSA.generate(2048, e=65537).publickey().export_key("DER") _, new_public_key = create_new_key_pair()
new_id = ID.from_pubkey(new_key) new_id = ID.from_pubkey(new_public_key)
return new_id return new_id
@ -53,7 +52,7 @@ def initialize_default_kademlia_router(
:return: return a default kademlia instance :return: return a default kademlia instance
""" """
if not id_opt: if not id_opt:
id_opt = generate_id() id_opt = generate_peer_id_from_rsa_identity()
node_id = id_opt.to_bytes() node_id = id_opt.to_bytes()
# ignore type for Kademlia module # ignore type for Kademlia module
@ -83,7 +82,7 @@ def initialize_default_swarm(
""" """
if not id_opt: if not id_opt:
id_opt = generate_id() id_opt = generate_peer_id_from_rsa_identity()
# TODO parse transport_opt to determine transport # TODO parse transport_opt to determine transport
transport_opt = transport_opt or ["/ip4/127.0.0.1/tcp/8001"] transport_opt = transport_opt or ["/ip4/127.0.0.1/tcp/8001"]
@ -124,7 +123,7 @@ async def new_node(
""" """
if not id_opt: if not id_opt:
id_opt = generate_id() id_opt = generate_peer_id_from_rsa_identity()
if not swarm_opt: if not swarm_opt:
swarm_opt = initialize_default_swarm( swarm_opt = initialize_default_swarm(