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

replace base asserts with UsageError

Browse Source
This commit is contained in:
Brian Warner 2015-07-24 15:55:42 -07:00
parent 056cf107fc
commit cfe51f73c1
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ class Wormhole:
def __init__(self, appid, relay): def __init__(self, appid, relay):
self.appid = appid self.appid = appid
self.relay = relay self.relay = relay
assert self.relay.endswith("/") if not self.relay.endswith("/"): raise UsageError
self.started = time.time() self.started = time.time()
self.wait = 0.5*SECOND self.wait = 0.5*SECOND
self.timeout = 3*MINUTE self.timeout = 3*MINUTE
@ -123,7 +123,7 @@ class Wormhole:
return channel_id return channel_id
def derive_key(self, purpose, length=SecretBox.KEY_SIZE): def derive_key(self, purpose, length=SecretBox.KEY_SIZE):
assert type(purpose) == type(b"") if type(purpose) is not type(b""): raise UsageError
return HKDF(self.key, length, CTXinfo=purpose) return HKDF(self.key, length, CTXinfo=purpose)
@ -186,8 +186,8 @@ class Wormhole:
return self.verifier return self.verifier
def get_data(self, outbound_data): def get_data(self, outbound_data):
assert self.code is not None if self.code is None: raise UsageError
assert self.channel_id is not None if self.channel_id is None: raise UsageError
self._get_key() self._get_key()
# Without predefined roles, we can't derive predictably unique keys # Without predefined roles, we can't derive predictably unique keys
@ -211,13 +211,13 @@ class Wormhole:
return inbound_data return inbound_data
def _encrypt_data(self, key, data): def _encrypt_data(self, key, data):
assert len(key) == SecretBox.KEY_SIZE if len(key) != SecretBox.KEY_SIZE: raise UsageError
box = SecretBox(key) box = SecretBox(key)
nonce = utils.random(SecretBox.NONCE_SIZE) nonce = utils.random(SecretBox.NONCE_SIZE)
return box.encrypt(data, nonce) return box.encrypt(data, nonce)
def _decrypt_data(self, key, encrypted): def _decrypt_data(self, key, encrypted):
assert len(key) == SecretBox.KEY_SIZE if len(key) != SecretBox.KEY_SIZE: raise UsageError
box = SecretBox(key) box = SecretBox(key)
data = box.decrypt(encrypted) data = box.decrypt(encrypted)
return data return data

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

@ -196,18 +196,20 @@ class SymmetricWormhole:
return d return d
def derive_key(self, purpose, length=SecretBox.KEY_SIZE): def derive_key(self, purpose, length=SecretBox.KEY_SIZE):
assert self.key is not None # call after get_verifier() or get_data() if self.key is None:
assert type(purpose) == type(b"") # call after get_verifier() or get_data()
raise UsageError
if type(purpose) is not type(b""): raise UsageError
return HKDF(self.key, length, CTXinfo=purpose) return HKDF(self.key, length, CTXinfo=purpose)
def _encrypt_data(self, key, data): def _encrypt_data(self, key, data):
assert len(key) == SecretBox.KEY_SIZE if len(key) != SecretBox.KEY_SIZE: raise UsageError
box = SecretBox(key) box = SecretBox(key)
nonce = utils.random(SecretBox.NONCE_SIZE) nonce = utils.random(SecretBox.NONCE_SIZE)
return box.encrypt(data, nonce) return box.encrypt(data, nonce)
def _decrypt_data(self, key, encrypted): def _decrypt_data(self, key, encrypted):
assert len(key) == SecretBox.KEY_SIZE if len(key) != SecretBox.KEY_SIZE: raise UsageError
box = SecretBox(key) box = SecretBox(key)
data = box.decrypt(encrypted) data = box.decrypt(encrypted)
return data return data