don't output arbitrary binary

keybase · Nov 30, 2018 · 125b493 · 125b493
1 parent 04426fe
commit 125b493
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/triplesec/__init__.py b/triplesec/__init__.py
@@ -371,7 +371,10 @@ def main():
             elif args.hex:
                 print(binascii.hexlify(plaintext).decode())
             else:
-                print(plaintext.decode('utf-8', 'replace'))
+                try:
+                    print(plaintext.decode('ascii', 'strict'))
+                except UnicodeDecodeError:
+                    sys.stderr.write("Aborting: unable to decode plaintext as ASCII. Use -b to output binary.\n")
 
         elif args._command == 'enc':
             plaintext = data

diff --git a/triplesec/crypto.py b/triplesec/crypto.py
@@ -137,7 +137,7 @@ def decrypt(cls, data, key):
         return strxor(data[cls.block_size:],
                       cls._gen_keystream(len(data[cls.block_size:]), tfish, ctr))
 
-class XSalsa20:
+class XSalsa20(object):
     key_size = 32
     iv_size = 24