Fromdos-ify

Author: eliben

2010/aes-encrypt-pycrypto/pycrypto_aes.py

@@ -1,17 +1,17 @@
-from Crypto.Cipher import AES
-import hashlib
-
-password = b'qwerty12345'
-key = hashlib.sha256(password).digest()
-key = b'0123456789abcdef'
-
-IV = 16 * '\x00'
-mode = AES.MODE_CBC
-encryptor = AES.new(key, mode, IV=IV)
-
-text = b'j' * 32 + b'i' * 64
-ciphertext = encryptor.encrypt(text)
-
-decryptor = AES.new(key, mode, IV=IV)
-plain = decryptor.decrypt(ciphertext)
-print(plain)
+from Crypto.Cipher import AES
+import hashlib
+
+password = b'qwerty12345'
+key = hashlib.sha256(password).digest()
+key = b'0123456789abcdef'
+
+IV = 16 * '\x00'
+mode = AES.MODE_CBC
+encryptor = AES.new(key, mode, IV=IV)
+
+text = b'j' * 32 + b'i' * 64
+ciphertext = encryptor.encrypt(text)
+
+decryptor = AES.new(key, mode, IV=IV)
+plain = decryptor.decrypt(ciphertext)
+print(plain)

2010/aes-encrypt-pycrypto/pycrypto_file.py

@@ -1,87 +1,87 @@
-import os
-import struct
-import random
-from eblib.utils import Timer
-from Crypto.Cipher import AES
-
-
-def encrypt_file(key, in_filename, out_filename=None, chunksize=64*1024):
-    """ Encrypts a file using AES (CBC mode) with the
-        given key.
-
-        key:
-            The encryption key - a bytes object that must be
-            either 16, 24 or 32 bytes long. Longer keys
-            are more secure.
-
-        in_filename:
-            Name of the input file
-
-        out_filename:
-            If None, '<in_filename>.enc' will be used.
-
-        chunksize:
-            Sets the size of the chunk which the function
-            uses to read and encrypt the file. Larger chunk
-            sizes can be faster for some files and machines.
-            chunksize must be divisible by 16.
-    """
-    if not out_filename:
-        out_filename = in_filename + '.enc'
-
-    iv = os.urandom(16)
-    encryptor = AES.new(key, AES.MODE_CBC, iv)
-    filesize = os.path.getsize(in_filename)
-
-    with open(in_filename, 'rb') as infile:
-        with open(out_filename, 'wb') as outfile:
-            outfile.write(struct.pack('<Q', filesize))
-            outfile.write(iv)
-
-            while True:
-                chunk = infile.read(chunksize)
-                if len(chunk) == 0:
-                    break
-                elif len(chunk) % 16 != 0:
-                    chunk += b' ' * (16 - len(chunk) % 16)
-
-                outfile.write(encryptor.encrypt(chunk))
-    return out_filename
-
-
-def decrypt_file(key, in_filename, out_filename=None, chunksize=24*1024):
-    """ Decrypts a file using AES (CBC mode) with the
-        given key. Parameters are similar to encrypt_file,
-        with one difference: out_filename, if not supplied
-        will be in_filename without its last extension
-        (i.e. if in_filename is 'aaa.zip.enc' then
-        out_filename will be 'aaa.zip')
-    """
-    if not out_filename:
-        out_filename = os.path.splitext(in_filename)[0]
-
-    with open(in_filename, 'rb') as infile:
-        origsize = struct.unpack('<Q', infile.read(struct.calcsize('Q')))[0]
-        iv = infile.read(16)
-        decryptor = AES.new(key, AES.MODE_CBC, iv)
-
-        with open(out_filename, 'wb') as outfile:
-            while True:
-                chunk = infile.read(chunksize)
-                if len(chunk) == 0:
-                    break
-                outfile.write(decryptor.decrypt(chunk))
-
-            outfile.truncate(origsize)
-    return out_filename
-
-
-if __name__ == "__main__":
-    pwd = b'1' * 32
-    filename = 'pycrypto_file.py'
-
-    with Timer('encrypt'):
-        enc_filename = encrypt_file(pwd, filename)
-
-    with Timer('decrypt'):
-        decrypt_file(pwd, enc_filename, out_filename=filename+'.dec')
+import os
+import struct
+import random
+from eblib.utils import Timer
+from Crypto.Cipher import AES
+
+
+def encrypt_file(key, in_filename, out_filename=None, chunksize=64*1024):
+    """ Encrypts a file using AES (CBC mode) with the
+        given key.
+
+        key:
+            The encryption key - a bytes object that must be
+            either 16, 24 or 32 bytes long. Longer keys
+            are more secure.
+
+        in_filename:
+            Name of the input file
+
+        out_filename:
+            If None, '<in_filename>.enc' will be used.
+
+        chunksize:
+            Sets the size of the chunk which the function
+            uses to read and encrypt the file. Larger chunk
+            sizes can be faster for some files and machines.
+            chunksize must be divisible by 16.
+    """
+    if not out_filename:
+        out_filename = in_filename + '.enc'
+
+    iv = os.urandom(16)
+    encryptor = AES.new(key, AES.MODE_CBC, iv)
+    filesize = os.path.getsize(in_filename)
+
+    with open(in_filename, 'rb') as infile:
+        with open(out_filename, 'wb') as outfile:
+            outfile.write(struct.pack('<Q', filesize))
+            outfile.write(iv)
+
+            while True:
+                chunk = infile.read(chunksize)
+                if len(chunk) == 0:
+                    break
+                elif len(chunk) % 16 != 0:
+                    chunk += b' ' * (16 - len(chunk) % 16)
+
+                outfile.write(encryptor.encrypt(chunk))
+    return out_filename
+
+
+def decrypt_file(key, in_filename, out_filename=None, chunksize=24*1024):
+    """ Decrypts a file using AES (CBC mode) with the
+        given key. Parameters are similar to encrypt_file,
+        with one difference: out_filename, if not supplied
+        will be in_filename without its last extension
+        (i.e. if in_filename is 'aaa.zip.enc' then
+        out_filename will be 'aaa.zip')
+    """
+    if not out_filename:
+        out_filename = os.path.splitext(in_filename)[0]
+
+    with open(in_filename, 'rb') as infile:
+        origsize = struct.unpack('<Q', infile.read(struct.calcsize('Q')))[0]
+        iv = infile.read(16)
+        decryptor = AES.new(key, AES.MODE_CBC, iv)
+
+        with open(out_filename, 'wb') as outfile:
+            while True:
+                chunk = infile.read(chunksize)
+                if len(chunk) == 0:
+                    break
+                outfile.write(decryptor.decrypt(chunk))
+
+            outfile.truncate(origsize)
+    return out_filename
+
+
+if __name__ == "__main__":
+    pwd = b'1' * 32
+    filename = '/tmp/file.my.enc'
+
+    #with Timer('encrypt'):
+        #enc_filename = encrypt_file(pwd, filename)
+
+    with Timer('decrypt'):
+        decrypt_file(pwd, filename, out_filename=filename+'.dec')