Fix unnecessary ord

Author: auxten

pycovenantsql/e2ee.py

@@ -3,7 +3,6 @@
 import hashlib
 from binascii import hexlify, unhexlify
 
-
 BLOCK_SIZE = AES.block_size  # Bytes
 
 salt = unhexlify("3fb8877d37fdc04e4a4765EFb8ab7d36")
@@ -19,25 +18,31 @@ class PaddingError(Exception):
     def __init__(self, message):
         self.message = message
 
+
 pad = lambda s: s + ((BLOCK_SIZE - len(s) % BLOCK_SIZE) *
-                     chr(BLOCK_SIZE - len(s) % BLOCK_SIZE)).encode('utf-8')
+                     chr(BLOCK_SIZE - len(s) % BLOCK_SIZE)).encode('ascii')
+
 
 def unpad(s):
     in_len = len(s)
     if in_len == 0:
         raise PaddingError("empty input")
     pad_char = s[-1]
-    pad_len = ord(s[in_len-1:])
-    if pad_len > BLOCK_SIZE:
+    if pad_char > BLOCK_SIZE:
         raise PaddingError("padding length > 16")
-    for i in s[in_len-pad_len:]:
+    for i in s[in_len - pad_char:]:
         if i != pad_char:
             raise PaddingError("unexpected padding char")
-    return s[:-pad_len]
+    return s[:-pad_char]
 
 
 # kdf does 2 times sha256 and takes the first 16 bytes
 def kdf(raw_key):
+    """
+    kdf does 2 times sha256 and takes the first 16 bytes
+    :param raw_key:
+    :return:
+    """
     return hashlib.sha256(hashlib.sha256(raw_key + salt).digest()).digest()[:16]