jab2870/PappyProxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Minor changes, decrypt project within PappySession

Browse source 
Changed to decrypting project to within the PappySession object,
instead of in main. More maintainable, and makes more sense.
This commit is contained in:
Nich 2016-03-28 21:51:56 +00:00
parent e7d1f75435
commit ff8595e8f4
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pappyproxy/crypto.py
View file

@ -82,6 +82,8 @@ class Crypto(object):
archive = fern.decrypt(archive_crypt)
except InvalidToken:
raise PappyException("Problem decrypting the file, restart pappy to try again")
reactor.stop()
defer.returnValue(None)
archive_file.write(archive)
archive_file.close()
@ -162,7 +164,7 @@ class Crypto(object):
try:
if not self.key:
self.key = b64encode(scrypt.hash(self.password, self.salt, buflen=32))
except TypeError, e:
except TypeError as e:
raise PappyException("Scrypt failed with type error: ", e)
except scrypt.error, e:
raise PappyException("Scrypt failed with internal error: ", e)