catalyst: more blake2 testing

This commit is contained in:
Rick Farina (Zero_Chaos) 2020-02-11 11:29:55 -05:00
parent 172b198a3c
commit b7057fc072
No known key found for this signature in database
GPG key ID: A29433C0AA431DDC

View file

@ -1,12 +1,12 @@
diff --git a/catalyst/hash_utils.py b/catalyst/hash_utils.py
index 1134f50..51fbde8 100644
index 1134f50..dc3a8d6 100644
--- a/catalyst/hash_utils.py
+++ b/catalyst/hash_utils.py
@@ -11,6 +11,7 @@ from catalyst.support import CatalystError
# fields = ["func", "cmd", "args", "id"]
HASH_DEFINITIONS = {
"adler32" :["calc_hash2", "shash", ["-a", "ADLER32"], "ADLER32"],
+ "blake2" :["calc_hash2", "b2sum", [ ], "BLAKE2"],
+ "blake2" :["calc_hash", "b2sum", [ ], "BLAKE2"],
"crc32" :["calc_hash2", "shash", ["-a", "CRC32"], "CRC32"],
"crc32b" :["calc_hash2", "shash", ["-a", "CRC32B"], "CRC32B"],
"gost" :["calc_hash2", "shash", ["-a", "GOST"], "GOST"],
@ -19,7 +19,7 @@ index 1134f50..51fbde8 100644
- mylines = source.communicate()[0]
- mylines=mylines[0].split()
+ output = source.communicate()
+ mylines = output[0].decode('ascii').split('\n')
+ mylines = output[0].decode('ascii')
+ log.debug('output = %s', mylines)
result=mylines[0]
log.info('%s (%s) = %s', _hash.id, file_, result)