fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 08:38:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Queries the password three times before exiting

Browse source
This commit is contained in:
Manuel Ebert 2012-04-16 21:31:43 +02:00
parent 88112512ab
commit d19d858dba
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
jrnl.py
View file

@ -92,7 +92,10 @@ class Journal:
"""Decrypts a cipher string using self.key as the key and the first 16 byte of the cipher as the IV""" """Decrypts a cipher string using self.key as the key and the first 16 byte of the cipher as the IV"""
crypto = AES.new(self.key, AES.MODE_CBC, cipher[:16]) crypto = AES.new(self.key, AES.MODE_CBC, cipher[:16])
plain = crypto.decrypt(cipher[16:]) plain = crypto.decrypt(cipher[16:])
return plain if plain[-1] != " ": # Journals are always padded
return None
else:
return plain
def _encrypt(self, plain): def _encrypt(self, plain):
"""Encrypt a plaintext string using self.key as the key""" """Encrypt a plaintext string using self.key as the key"""
@ -113,10 +116,21 @@ class Journal:
with open(filename) as f: with open(filename) as f:
journal = f.read() journal = f.read()
if self.config['encrypt']: if self.config['encrypt']:
password = self.config['password'] or getpass.getpass() decrypted = None
self.key = hashlib.sha256(password).digest() attempts = 0
journal = self._decrypt(journal) while not decrypted:
print journal password = self.config['password'] or getpass.getpass()
self.key = hashlib.sha256(password).digest()
decrypted = self._decrypt(journal)
if not decrypted:
attempts += 1
self.config['password'] = None # This doesn't work.
if attempts < 3:
print("Wrong password, try again.")
else:
print("Extremely wrong password.")
sys.exit(-1)
journal = decrypted
return journal return journal
def parse(self, journal): def parse(self, journal):