From c86fb880f9f79cb8f9793f00f6dd294a0d9944ea Mon Sep 17 00:00:00 2001
From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Fri, 30 Dec 2016 23:25:26 +0530
Subject: [PATCH] Move crypto globals to class scope.

---
 buku.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/buku.py b/buku.py
index 79f100c..15c5030 100755
--- a/buku.py
+++ b/buku.py
@@ -58,11 +58,6 @@ Firefox/50.0'
 myheaders = None  # Default dictionary of headers
 myproxy = None  # Default proxy
 
-# Crypto globals
-BLOCKSIZE = 0x10000  # 64 KB blocks
-SALT_SIZE = 0x20
-CHUNKSIZE = 0x80000  # Read/write 512 KB chunks
-
 # Set up logging
 logging.basicConfig(format='[%(levelname)s] %(message)s')
 logger = logging.getLogger()
@@ -113,6 +108,11 @@ class BukuCrypt:
     a time, this doesn't seem to be an outrageous approach.
     '''
 
+    # Crypto constants
+    BLOCKSIZE = 0x10000  # 64 KB blocks
+    SALT_SIZE = 0x20
+    CHUNKSIZE = 0x80000  # Read/write 512 KB chunks
+
     @staticmethod
     def get_filehash(filepath):
         '''Get the SHA256 hash of a file
@@ -125,10 +125,10 @@ class BukuCrypt:
 
         with open(filepath, 'rb') as fp:
             hasher = sha256()
-            buf = fp.read(BLOCKSIZE)
+            buf = fp.read(BukuCrypt.BLOCKSIZE)
             while len(buf) > 0:
                 hasher.update(buf)
-                buf = fp.read(BLOCKSIZE)
+                buf = fp.read(BukuCrypt.BLOCKSIZE)
 
             return hasher.digest()
 
@@ -190,7 +190,7 @@ class BukuCrypt:
             sys.exit(1)
 
         # Generate random 256-bit salt and key
-        salt = os.urandom(SALT_SIZE)
+        salt = os.urandom(BukuCrypt.SALT_SIZE)
         key = ('%s%s' % (password,
                salt.decode('utf-8', 'replace'))).encode('utf-8')
         for _ in range(iterations):
@@ -214,7 +214,7 @@ class BukuCrypt:
                 outfp.write(dbhash)
 
                 while True:
-                    chunk = infp.read(CHUNKSIZE)
+                    chunk = infp.read(BukuCrypt.CHUNKSIZE)
                     if len(chunk) == 0:
                         break
                     elif len(chunk) % 16 != 0:
@@ -303,7 +303,7 @@ class BukuCrypt:
 
                 with open(dbfile, 'wb') as outfp:
                     while True:
-                        chunk = infp.read(CHUNKSIZE)
+                        chunk = infp.read(BukuCrypt.CHUNKSIZE)
                         if len(chunk) == 0:
                             break