kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sha2-alignment' into release

This commit is contained in:
Brad King 2013-07-02 08:35:39 -04:00
parent d9ece45a36 75994d953e
commit 04897c02cc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmCryptoHash.cxx
View File

@ -54,8 +54,8 @@ std::string cmCryptoHash::HashFile(const char* file)
this->Initialize(); this->Initialize();
// Should be efficient enough on most system: // Should be efficient enough on most system:
const int bufferSize = 4096; cm_sha2_uint64_t buffer[512];
char buffer[bufferSize]; char* buffer_c = reinterpret_cast<char*>(buffer);
unsigned char const* buffer_uc = unsigned char const* buffer_uc =
reinterpret_cast<unsigned char const*>(buffer); reinterpret_cast<unsigned char const*>(buffer);
// This copy loop is very sensitive on certain platforms with // This copy loop is very sensitive on certain platforms with
@ -65,7 +65,7 @@ std::string cmCryptoHash::HashFile(const char* file)
// error occurred. Therefore, the loop should be safe everywhere. // error occurred. Therefore, the loop should be safe everywhere.
while(fin) while(fin)
{ {
fin.read(buffer, bufferSize); fin.read(buffer_c, sizeof(buffer));
if(int gcount = static_cast<int>(fin.gcount())) if(int gcount = static_cast<int>(fin.gcount()))
{ {
this->Append(buffer_uc, gcount); this->Append(buffer_uc, gcount);