From c441863af7b714919c0dfd761e5a094bf01535eb Mon Sep 17 00:00:00 2001
From: Balakrishnan Balasubramanian <git.user@balki.me>
Date: Tue, 16 May 2023 19:41:50 -0400
Subject: [PATCH] format pwhash

---
 mail4one/pwhash.py | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/mail4one/pwhash.py b/mail4one/pwhash.py
index 88bee54..5d3ccdc 100644
--- a/mail4one/pwhash.py
+++ b/mail4one/pwhash.py
@@ -17,24 +17,38 @@ PACK_FMT = f"<c{SALT_LEN}s64slhh"
 
 def gen_pwhash(password: str) -> str:
     salt = os.urandom(SALT_LEN)
-    sh = scrypt(password.encode(), salt=salt, n=SCRYPT_N, r=SCRYPT_R, p=SCRYPT_P)
-    pack_bytes = pack(PACK_FMT, VERSION, salt, sh, SCRYPT_N, SCRYPT_R, SCRYPT_P)
+    sh = scrypt(password.encode(),
+                salt=salt,
+                n=SCRYPT_N,
+                r=SCRYPT_R,
+                p=SCRYPT_P)
+    pack_bytes = pack(PACK_FMT, VERSION, salt, sh, SCRYPT_N, SCRYPT_R,
+                      SCRYPT_P)
     return b32encode(pack_bytes).decode()
 
 
 class PWInfo:
+
     def __init__(self, salt, sh):
         self.salt = salt
         self.scrypt_hash = sh
 
+
 def parse_hash(pwhash: str) -> PWInfo:
     decoded = b32decode(pwhash.encode())
     ver, salt, sh, n, r, p = unpack(PACK_FMT, decoded)
-    if not (ver, n, r, p, len(salt)) == (VERSION, SCRYPT_N, SCRYPT_R, SCRYPT_P, SALT_LEN):
-        raise Exception(f"Invalid hash: {ver=}, {n=}, {r=}, {p=}, f{len(salt)=} != {VERSION=}, {SCRYPT_N=}, {SCRYPT_R=}, {SCRYPT_P=}, {SALT_LEN=}")
+    if not (ver, n, r, p, len(salt)) == (VERSION, SCRYPT_N, SCRYPT_R, SCRYPT_P,
+                                         SALT_LEN):
+        raise Exception(
+            f"Invalid hash: {ver=}, {n=}, {r=}, {p=}, f{len(salt)=} != {VERSION=}, {SCRYPT_N=}, {SCRYPT_R=}, {SCRYPT_P=}, {SALT_LEN=}"
+        )
     return PWInfo(salt, sh)
 
+
 def check_pass(password: str, pwinfo: PWInfo) -> bool:
     # No need for constant time compare for hashes. See https://security.stackexchange.com/a/46215
-    return pwinfo.scrypt_hash == scrypt(password.encode(), salt=pwinfo.salt, n=SCRYPT_N, r=SCRYPT_R, p=SCRYPT_P)
-
+    return pwinfo.scrypt_hash == scrypt(password.encode(),
+                                        salt=pwinfo.salt,
+                                        n=SCRYPT_N,
+                                        r=SCRYPT_R,
+                                        p=SCRYPT_P)