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/source | |
parent | vcl, solve iOS compile failure. (diff) | |
download | core-5a1fabb9969772242f2c2aef34b10bed17adebb6.tar.gz core-5a1fabb9969772242f2c2aef34b10bed17adebb6.zip |
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/source')
-rw-r--r-- | comphelper/source/misc/docpasswordhelper.cxx | 8 | ||||
-rw-r--r-- | comphelper/source/misc/hash.cxx | 28 |
2 files changed, 20 insertions, 16 deletions
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 5dfd25575d91..8a35c33ca92d 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -263,7 +263,7 @@ css::uno::Sequence<sal_Int8> DocPasswordHelper::GetOoxHashAsSequence( const rtl::OUString& rPassword, const rtl::OUString& rSaltValue, sal_uInt32 nSpinCount, - bool bPrependNotAppend, + comphelper::Hash::IterCount eIterCount, const rtl::OUString& rAlgorithmName) { comphelper::HashType eType; @@ -287,7 +287,7 @@ css::uno::Sequence<sal_Int8> DocPasswordHelper::GetOoxHashAsSequence( } std::vector<unsigned char> hash( comphelper::Hash::calculateHash( rPassword, aSaltVec, nSpinCount, - bPrependNotAppend, eType)); + eIterCount, eType)); return comphelper::containerToSequence<sal_Int8>( hash); } @@ -296,11 +296,11 @@ OUString DocPasswordHelper::GetOoxHashAsBase64( const rtl::OUString& rPassword, const rtl::OUString& rSaltValue, sal_uInt32 nSpinCount, - bool bPrependNotAppend, + comphelper::Hash::IterCount eIterCount, const rtl::OUString& rAlgorithmName) { css::uno::Sequence<sal_Int8> aSeq( GetOoxHashAsSequence( rPassword, rSaltValue, nSpinCount, - bPrependNotAppend, rAlgorithmName)); + eIterCount, rAlgorithmName)); OUStringBuffer aBuf; comphelper::Base64::encode( aBuf, aSeq); diff --git a/comphelper/source/misc/hash.cxx b/comphelper/source/misc/hash.cxx index 8d709daa75f7..b07fd66c0628 100644 --- a/comphelper/source/misc/hash.cxx +++ b/comphelper/source/misc/hash.cxx @@ -157,7 +157,7 @@ std::vector<unsigned char> Hash::calculateHash( const unsigned char* pInput, size_t nLength, const unsigned char* pSalt, size_t nSaltLen, sal_uInt32 nSpinCount, - bool bPrependNotAppend, + IterCount eIterCount, HashType eType) { if (!pSalt) @@ -188,21 +188,25 @@ std::vector<unsigned char> Hash::calculateHash( // https://msdn.microsoft.com/en-us/library/dd924776 and // https://msdn.microsoft.com/en-us/library/dd925430 // say the iteration is prepended to the hash. - const size_t nIterPos = (bPrependNotAppend ? 0 : hash.size()); - const size_t nHashPos = (bPrependNotAppend ? 4 : 0); - std::vector<unsigned char> data( hash.size() + 4, 0); + const size_t nAddIter = (eIterCount == IterCount::NONE ? 0 : 4); + const size_t nIterPos = (eIterCount == IterCount::APPEND ? hash.size() : 0); + const size_t nHashPos = (eIterCount == IterCount::PREPEND ? nAddIter : 0); + std::vector<unsigned char> data( hash.size() + nAddIter, 0); for (sal_uInt32 i = 0; i < nSpinCount; ++i) { std::copy( hash.begin(), hash.end(), data.begin() + nHashPos); + if (nAddIter) + { #ifdef OSL_BIGENDIAN - sal_uInt32 be = i; - sal_uInt8* p = reinterpret_cast<sal_uInt8*>(&be); - std::swap( p[0], p[3] ); - std::swap( p[1], p[2] ); - memcpy( data.data() + nIterPos, &be, 4); + sal_uInt32 be = i; + sal_uInt8* p = reinterpret_cast<sal_uInt8*>(&be); + std::swap( p[0], p[3] ); + std::swap( p[1], p[2] ); + memcpy( data.data() + nIterPos, &be, nAddIter); #else - memcpy( data.data() + nIterPos, &i, 4); + memcpy( data.data() + nIterPos, &i, nAddIter); #endif + } /* TODO: isn't there something better than * creating/finalizing/destroying on each iteration? */ Hash aReHash(eType); @@ -218,7 +222,7 @@ std::vector<unsigned char> Hash::calculateHash( const OUString& rPassword, const std::vector<unsigned char>& rSaltValue, sal_uInt32 nSpinCount, - bool bPrependNotAppend, + IterCount eIterCount, HashType eType) { const unsigned char* pPassBytes = reinterpret_cast<const unsigned char*>(rPassword.getStr()); @@ -240,7 +244,7 @@ std::vector<unsigned char> Hash::calculateHash( } #endif return calculateHash( pPassBytes, nPassBytesLen, rSaltValue.data(), rSaltValue.size(), nSpinCount, - bPrependNotAppend, eType); + eIterCount, eType); } } |