diff options
author | Eike Rathke <erack@redhat.com> | 2018-02-26 19:58:12 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2018-02-26 20:06:56 +0100 |
commit | 5a1fabb9969772242f2c2aef34b10bed17adebb6 (patch) | |
tree | addf179371965ac9ac449235f1c7b008779b959b /comphelper/qa | |
parent | 7c30bf05ec891b0d8cba117838ff20e9d0b6d63e (diff) |
Introduce enum comphelper::Hash::IterCount instead of bool
Clarifies intention, and with IterCount::NONE prepared to handle
something like old PBKDF1, if anything actually used that. See
https://tools.ietf.org/html/rfc8018#section-5.1 where iteration
count is not part of the re-hash.
Change-Id: I5f97ca7a91f611eced8ced0a0c64961c04535d36
Diffstat (limited to 'comphelper/qa')
-rw-r--r-- | comphelper/qa/unit/test_hash.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/comphelper/qa/unit/test_hash.cxx b/comphelper/qa/unit/test_hash.cxx index 5d2ece34dc83..29ef2b884f28 100644 --- a/comphelper/qa/unit/test_hash.cxx +++ b/comphelper/qa/unit/test_hash.cxx @@ -99,7 +99,7 @@ void TestHash::testSHA512_NoSaltNoSpin() const char* const pInput = ""; std::vector<unsigned char> calculate_hash = comphelper::Hash::calculateHash( reinterpret_cast<const unsigned char*>(pInput), 0, - nullptr, 0, 0, false, comphelper::HashType::SHA512); + nullptr, 0, 0, comphelper::Hash::IterCount::NONE, comphelper::HashType::SHA512); CPPUNIT_ASSERT_EQUAL(size_t(64), calculate_hash.size()); std::string aStr("cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"); CPPUNIT_ASSERT_EQUAL(aStr, tostring(calculate_hash)); @@ -112,7 +112,8 @@ void TestHash::testSHA512_saltspin() const OUString aPass("pwd"); const OUString aAlgo("SHA-512"); const OUString aSalt("876MLoKTq42+/DLp415iZQ=="); - const OUString aHash = comphelper::DocPasswordHelper::GetOoxHashAsBase64( aPass, aSalt, 100000, false, aAlgo); + const OUString aHash = comphelper::DocPasswordHelper::GetOoxHashAsBase64( aPass, aSalt, 100000, + comphelper::Hash::IterCount::APPEND, aAlgo); const OUString aStr("5l3mgNHXpWiFaBPv5Yso1Xd/UifWvQWmlDnl/hsCYbFT2sJCzorjRmBCQ/3qeDu6Q/4+GIE8a1DsdaTwYh1q2g=="); CPPUNIT_ASSERT_EQUAL(aStr, aHash); } |