open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

require caller to provide relay, no more default

Browse Source 
Applications should feel free to pass wormhole.const.RENDEZVOUS_RELAY
here, but I figure it should be clear that you're using a public service
that's hosted *somewhere* external.
This commit is contained in:
Brian Warner 2015-03-22 11:53:48 -07:00
parent fd3e4f3508
commit 7c5cb058a2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wormhole/blocking/transcribe.py
View File

@ -5,7 +5,7 @@ from spake2 import SPAKE2_A, SPAKE2_B
from nacl.secret import SecretBox
from nacl.exceptions import CryptoError
from nacl import utils
from .. import codes, const
from .. import codes
from ..util.hkdf import HKDF
SECOND = 1
@ -167,10 +167,10 @@ class Common:
return HKDF(self.key, length, CTXinfo=purpose)
class Initiator(Common):
def __init__(self, appid, data, relay=None):
def __init__(self, appid, data, relay):
self.appid = appid
self.data = data
self.relay = relay or const.RENDEZVOUS_RELAY
self.relay = relay
assert self.relay.endswith("/")
self.started = time.time()
self.wait = 0.5*SECOND
@ -207,10 +207,10 @@ class Initiator(Common):
class Receiver(Common):
def __init__(self, appid, data, relay=None):
def __init__(self, appid, data, relay):
self.appid = appid
self.data = data
self.relay = relay or const.RENDEZVOUS_RELAY
self.relay = relay
assert self.relay.endswith("/")
self.started = time.time()
self.wait = 0.5*SECOND