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

rename _confirm message to just "confirm"

Browse Source
This commit is contained in:
Brian Warner 2016-05-12 16:18:34 -07:00
parent d0ef53fc4d
commit d87aba40e4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wormhole/twisted/transcribe.py
View File

@ -376,7 +376,7 @@ class Wormhole:
# receiver will see this a round-trip after they send their PAKE # receiver will see this a round-trip after they send their PAKE
# (because the sender is using wait=True inside _get_master_key, # (because the sender is using wait=True inside _get_master_key,
# below: otherwise the sender might go do some blocking call). # below: otherwise the sender might go do some blocking call).
yield self._msg_get(u"_confirm") yield self._msg_get(u"confirm")
returnValue(self._verifier) returnValue(self._verifier)
@inlineCallbacks @inlineCallbacks
@ -397,7 +397,7 @@ class Wormhole:
confkey = self.derive_key(u"wormhole:confirmation") confkey = self.derive_key(u"wormhole:confirmation")
nonce = os.urandom(CONFMSG_NONCE_LENGTH) nonce = os.urandom(CONFMSG_NONCE_LENGTH)
confmsg = make_confmsg(confkey, nonce) confmsg = make_confmsg(confkey, nonce)
yield self._msg_send(u"_confirm", confmsg, wait=True) yield self._msg_send(u"confirm", confmsg, wait=True)
@inlineCallbacks @inlineCallbacks
def _msg_send(self, phase, body, wait=False): def _msg_send(self, phase, body, wait=False):
@ -426,7 +426,7 @@ class Wormhole:
err = ServerError("got duplicate phase %s" % phase, self._ws_url) err = ServerError("got duplicate phase %s" % phase, self._ws_url)
return self._signal_error(err) return self._signal_error(err)
self._received_messages[phase] = body self._received_messages[phase] = body
if phase == u"_confirm": if phase == u"confirm":
# TODO: we might not have a master key yet, if the caller wasn't # TODO: we might not have a master key yet, if the caller wasn't
# waiting in _get_master_key() when a back-to-back pake+_confirm # waiting in _get_master_key() when a back-to-back pake+_confirm
# message pair arrived. # message pair arrived.