mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-05 13:37:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix hash function comparator

Browse source
This commit is contained in:
Tatsuhiro Tsujikawa 2014-09-11 23:54:17 +09:00
parent 528cf5395b
commit c0b8b471ab
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/MessageDigest.cc
View file

@ -135,9 +135,12 @@ bool MessageDigest::isStronger(const std::string& lhs, const std::string& rhs)
FindHashTypeEntry(lhs)); FindHashTypeEntry(lhs));
auto rEntry = std::find_if(std::begin(hashTypes), std::end(hashTypes), auto rEntry = std::find_if(std::begin(hashTypes), std::end(hashTypes),
FindHashTypeEntry(rhs)); FindHashTypeEntry(rhs));
if(lEntry == std::end(hashTypes) || rEntry == std::end(hashTypes)) { if(lEntry == std::end(hashTypes)) {
return false; return false;
} }
if(rEntry == std::end(hashTypes)) {
return true;
}
return lEntry->strength > rEntry->strength; return lEntry->strength > rEntry->strength;
} }

2
test/MessageDigestTest.cc
View file

@ -76,7 +76,7 @@ void MessageDigestTest::testIsStronger()
CPPUNIT_ASSERT(MessageDigest::isStronger("sha-1", "md5")); CPPUNIT_ASSERT(MessageDigest::isStronger("sha-1", "md5"));
CPPUNIT_ASSERT(!MessageDigest::isStronger("md5", "sha-1")); CPPUNIT_ASSERT(!MessageDigest::isStronger("md5", "sha-1"));
CPPUNIT_ASSERT(!MessageDigest::isStronger("unknown", "sha-1")); CPPUNIT_ASSERT(!MessageDigest::isStronger("unknown", "sha-1"));
CPPUNIT_ASSERT(!MessageDigest::isStronger("sha-1", "unknown")); CPPUNIT_ASSERT(MessageDigest::isStronger("sha-1", "unknown"));
} }
void MessageDigestTest::testIsValidHash() void MessageDigestTest::testIsValidHash()