wiip

Author: DifferentialOrange

tarantool/request.py

@@ -226,15 +226,6 @@ def __init__(self, conn, space_no, values):
         self._body = request_body
 
 
-def _hash(sha, values):
-    for i in values:
-        if i is not None:
-            if isinstance(i, bytes):
-                sha.update(i)
-            else:
-                sha.update(i.encode())
-    return sha.digest()
-
 class RequestAuthenticate(Request):
     """
     Represents AUTHENTICATE request.
@@ -261,12 +252,21 @@ def __init__(self, conn, salt, user, password, auth_type):
 
         super(RequestAuthenticate, self).__init__(conn)
 
-        if auth_type == AUTH_TYPE_CHAP_SHA1:
+        def sha1(values):
             sha = hashlib.sha1()
-            hash1 = _hash(sha, password,)
-            hash2 = _hash(sha, (hash1,))
-            prescramble = _hash(sha, (salt, hash2))
-            scramble = strxor(hash1, prescramble)
+            for i in values:
+                if i is not None:
+                    if isinstance(i, bytes):
+                        sha.update(i)
+                    else:
+                        sha.update(i.encode())
+            return sha.digest()
+
+        if auth_type == AUTH_TYPE_CHAP_SHA1:
+            hash1 = sha1((password,))
+            hash2 = sha1((hash1,))
+            scramble = sha1((salt, hash2))
+            scramble = strxor(hash1, scramble)
         elif auth_type == AUTH_TYPE_PAP_SHA256:
             scramble = password
         else: