Optimize hash calculation usage

VirgilSecurity · Jan 22, 2019 · b2fa6fb · b2fa6fb
1 parent 2104171
commit b2fa6fb
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/virgil_crypto/crypto.py b/virgil_crypto/crypto.py
@@ -401,12 +401,7 @@ def calculate_fingerprint(self, data):
         Returns:
             Fingerprint of the source data.
         """
-        if self.use_sha256_fingerprints:
-            hash_algorithm = HashAlgorithm.SHA256
-            hash_data = self.compute_hash(data, hash_algorithm)
-        else:
-            hash_algorithm = HashAlgorithm.SHA512
-            hash_data = self.compute_hash(data, hash_algorithm)[0:8]
+        hash_data = self.__calculate_hash(data)
 
         return Fingerprint(hash_data)
 
@@ -438,13 +433,8 @@ def compute_public_key_hash(self, public_key):
             Hash bytes.
         """
         public_key_der = VirgilKeyPair.publicKeyToDER(public_key)
-        if self.use_sha256_fingerprints:
-            hash_algorithm = HashAlgorithm.SHA256
-            computed_hash = self.compute_hash(public_key_der, hash_algorithm)
-        else:
-            hash_algorithm = HashAlgorithm.SHA512
-            computed_hash = self.compute_hash(public_key_der, hash_algorithm)[0:8]
-        return computed_hash
+        hash_data = self.__calculate_hash(public_key_der)
+        return hash_data
 
     @property
     def custom_param_key_signature(self):
@@ -458,3 +448,12 @@ def custom_param_key_signature(self):
             return self._CUSTOM_PARAM_KEY_SIGNATURE
         self._CUSTOM_PARAM_KEY_SIGNATURE = self.strtobytes("VIRGIL-DATA-SIGNATURE")
         return self._CUSTOM_PARAM_KEY_SIGNATURE
+
+    def __calculate_hash(self, data):
+        if self.use_sha256_fingerprints:
+            hash_algorithm = HashAlgorithm.SHA256
+            calculated_hash = self.compute_hash(data, hash_algorithm)
+        else:
+            hash_algorithm = HashAlgorithm.SHA512
+            calculated_hash = self.compute_hash(data, hash_algorithm)[0:8]
+        return calculated_hash