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

send key-confirmation message upon receipt of PAKE

Browse Source 
This will allow the first peer to detect a wrong password even though
the second peer bails before sending something encrypted.
This commit is contained in:
Brian Warner 2015-11-16 16:56:19 -08:00
parent 4ad7342459
commit 3220014605
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,6 +314,8 @@ class Wormhole:
pake_msg = self._channel.get(u"pake") pake_msg = self._channel.get(u"pake")
self.key = self.sp.finish(pake_msg) self.key = self.sp.finish(pake_msg)
self.verifier = self.derive_key(u"wormhole:verifier") self.verifier = self.derive_key(u"wormhole:verifier")
conf = self.derive_key(u"wormhole:confirmation")
self._channel.send(u"_confirm", conf)
@close_on_error @close_on_error
def get_verifier(self): def get_verifier(self):

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

@ -332,7 +332,10 @@ class Wormhole:
key = self.sp.finish(pake_msg) key = self.sp.finish(pake_msg)
self.key = key self.key = key
self.verifier = self.derive_key(u"wormhole:verifier") self.verifier = self.derive_key(u"wormhole:verifier")
return key conf = self.derive_key(u"wormhole:confirmation")
d1 = self._channel.send(u"_confirm", conf)
d1.addCallback(lambda _: key)
return d1
d.addCallback(_got_pake) d.addCallback(_got_pake)
return d return d