Merge remote-tracking branch 'upstream/master' into hash-always-has-type

2020-07-16 14:58:53 +00:00
parent d090562348 8807ff902e
commit 5ea817dace
108 changed files with 8157 additions and 1845 deletions
@@ -25,6 +25,9 @@ static size_t regularHashSize(HashType type) {
    abort();
 }

+std::set<std::string> hashTypes = { "md5", "sha1", "sha256", "sha512" };
+
+
 void Hash::init()
 {
    hashSize = regularHashSize(type);