diff options
author | Jose <jose@zeroc.com> | 2014-08-12 20:46:07 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2014-08-12 20:46:07 +0200 |
commit | a31393f368bc78281179e0e2c0ac2a37f7b849c1 (patch) | |
tree | a9b8ba6e228142bb522c976a766f41349b502bff /cpp/src/IceUtil/SHA1.cpp | |
parent | Added eclipse project settings for java. (diff) | |
download | ice-a31393f368bc78281179e0e2c0ac2a37f7b849c1.tar.bz2 ice-a31393f368bc78281179e0e2c0ac2a37f7b849c1.tar.xz ice-a31393f368bc78281179e0e2c0ac2a37f7b849c1.zip |
Fixed (ICE-5586) - Integrate IceWS to the Ice core library
Diffstat (limited to 'cpp/src/IceUtil/SHA1.cpp')
-rw-r--r-- | cpp/src/IceUtil/SHA1.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/IceUtil/SHA1.cpp b/cpp/src/IceUtil/SHA1.cpp index eda08e35e38..31a5e459fad 100644 --- a/cpp/src/IceUtil/SHA1.cpp +++ b/cpp/src/IceUtil/SHA1.cpp @@ -102,18 +102,15 @@ void IceUtil::sha1(const unsigned char* data, size_t length, vector<unsigned char>& md) { #if defined(ICE_OS_WINRT) - auto dataA = ref new Platform::Array<unsigned char>(const_cast<unsigned char*>(&data[0]), - static_cast<unsigned int>(data.size())); + auto dataA = ref new Platform::Array<unsigned char>(const_cast<unsigned char*>(data), length); auto hasher = Windows::Security::Cryptography::Core::HashAlgorithmProvider::OpenAlgorithm("SHA1"); auto hashed = hasher->HashData(Windows::Security::Cryptography::CryptographicBuffer::CreateFromByteArray(dataA)); auto reader = ::Windows::Storage::Streams::DataReader::FromBuffer(hashed); md.resize(reader->UnconsumedBufferLength); if(!md.empty()) { - reader->ReadBytes(::Platform::ArrayReference<unsigned char>(&result[0], - static_cast<unsigned int>(result.size()))); + reader->ReadBytes(::Platform::ArrayReference<unsigned char>(&md[0], static_cast<unsigned int>(md.size()))); } - return md; #elif defined(_WIN32) SHA1 hasher; hasher.update(data, length); |