BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Continue move to CMake

Browse Source
This commit is contained in:
Scott E. Graves
2017-03-15 12:23:59 -05:00
parent 28674d716a
commit 19f3b0c625
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/siadrive_api/siacommon.cpp
View File

@@ -14,17 +14,17 @@ SString GenerateSha256(const SString& str)
SString ret; SString ret;
HCRYPTPROV hCryptProv = 0; HCRYPTPROV hCryptProv = 0;
HCRYPTHASH hHash = 0; HCRYPTHASH hHash = 0;
BOOL ok = CryptAcquireContext(&hCryptProv, nullptr, nullptr, PROV_RSA_AES, 0); BOOL ok = ::CryptAcquireContext(&hCryptProv, nullptr, nullptr, PROV_RSA_AES, 0);
ok = ok && CryptCreateHash(hCryptProv, CALG_SHA_256, 0, 0, &hHash); ok = ok && ::CryptCreateHash(hCryptProv, CALG_SHA_256, 0, 0, &hHash);
ok = ok && CryptHashData(hHash, reinterpret_cast<const BYTE*>(&str[0]), str.ByteLength(), 0); ok = ok && ::CryptHashData(hHash, reinterpret_cast<const BYTE*>(&str[0]), str.ByteLength(), 0);
if (ok) if (ok)
{ {
DWORD dwHashLen; DWORD dwHashLen;
DWORD dwCount = sizeof(DWORD); DWORD dwCount = sizeof(DWORD);
if (CryptGetHashParam(hHash, HP_HASHSIZE, reinterpret_cast<BYTE *>(&dwHashLen), &dwCount, 0)) if (::CryptGetHashParam(hHash, HP_HASHSIZE, reinterpret_cast<BYTE *>(&dwHashLen), &dwCount, 0))
{ {
std::vector<unsigned char> hash(dwHashLen); std::vector<unsigned char> hash(dwHashLen);
if (CryptGetHashParam(hHash, HP_HASHVAL, reinterpret_cast<BYTE *>(&hash[0]), &dwHashLen, 0)) if (::CryptGetHashParam(hHash, HP_HASHVAL, reinterpret_cast<BYTE *>(&hash[0]), &dwHashLen, 0))
{ {
std::ostringstream ss; std::ostringstream ss;
ss << std::hex << std::uppercase << std::setfill('0'); ss << std::hex << std::uppercase << std::setfill('0');
@@ -37,8 +37,8 @@ SString GenerateSha256(const SString& str)
} }
} }
if (hHash) CryptDestroyHash(hHash); if (hHash) ::CryptDestroyHash(hHash);
if (hCryptProv) CryptReleaseContext(hCryptProv, 0); if (hCryptProv) ::CryptReleaseContext(hCryptProv, 0);
return ret; return ret;
#else #else