Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-07-17 18:51:33 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-07-17 18:51:33 (GMT) |
| commit | 2a690f23a71f5f24550df112e0544b32826655db (patch) | |
| tree | 129cba4d1adce423f50ce444d91cf096bef1ad36 | |
| parent | a9614f60e0eff29b450bc33c0e8e342b59bc7a04 (diff) | |
| download | swift-2a690f23a71f5f24550df112e0544b32826655db.zip swift-2a690f23a71f5f24550df112e0544b32826655db.tar.bz2 | |
Only acquire crypt context once on Windows.
| -rw-r--r-- | Swiften/StringCodecs/SHA1_Windows.cpp | 49 | ||||
| -rw-r--r-- | Swiften/StringCodecs/SHA1_Windows.h | 3 |
2 files changed, 29 insertions, 23 deletions
diff --git a/Swiften/StringCodecs/SHA1_Windows.cpp b/Swiften/StringCodecs/SHA1_Windows.cpp index 8bd3dd2..fef415a 100644 --- a/Swiften/StringCodecs/SHA1_Windows.cpp +++ b/Swiften/StringCodecs/SHA1_Windows.cpp @@ -9,32 +9,42 @@ #include <Swiften/StringCodecs/SHA1_Windows.h> +namespace { + HCRYPTPROV context = 0; + + struct ContextDeleter { + ~ContextDeleter() { + if (context) { + CryptReleaseContext(context, 0); + context = 0; + } + } + } contextDeleter; +} + namespace Swift { -SHA1::SHA1() : hCryptProv(NULL), hHash(NULL) { - bool hasContext = CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - if (!hasContext) { +SHA1::SHA1() : hash(NULL) { + if (!context) { + if (!CryptAcquireContext(&context, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) { // DWORD error = GetLastError(); // switch (error) { // std::cerr << (long)error << std::endl; // } // assert(false); - hCryptProv = NULL; + context = 0; + } } - if (!CryptCreateHash(hCryptProv, CALG_SHA1, 0, 0, &hHash)) { - hHash = NULL; + if (!CryptCreateHash(context, CALG_SHA1, 0, 0, &hash)) { + hash = NULL; } } SHA1::~SHA1() { - if(hHash) { - CryptDestroyHash(hHash); - } - if(hCryptProv) { - CryptReleaseContext(hCryptProv,0); + if (hash) { + CryptDestroyHash(hash); } - } SHA1& SHA1::update(const std::vector<unsigned char>& data) { @@ -43,33 +53,30 @@ SHA1& SHA1::update(const std::vector<unsigned char>& data) { SHA1& SHA1::update(const unsigned char* data, size_t dataSize) { - if (!hHash || !hCryptProv) { + if (!hash || !context) { return *this; } - BYTE* byteData = (BYTE *)data; - DWORD dataLength = dataSize; - bool hasHashed = CryptHashData(hHash, byteData, dataLength, 0); -// if (!hasHashed) { + if (!CryptHashData(hash, const_cast<BYTE*>(data), dataSize, 0)) { // DWORD error = GetLastError(); // switch (error) { // std::cerr << (long)error << std::endl; // } // assert(false); // } + } return *this; } std::vector<unsigned char> SHA1::getHash() const { - if (!hHash || !hCryptProv) { + if (!hash || !context) { return std::vector<unsigned char>(); } std::vector<unsigned char> result; DWORD hashLength = sizeof(DWORD); DWORD hashSize; - CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&hashSize, &hashLength, 0); + CryptGetHashParam(hash, HP_HASHSIZE, reinterpret_cast<BYTE*>(&hashSize), &hashLength, 0); result.resize(static_cast<size_t>(hashSize)); - bool hasHashed = CryptGetHashParam(hHash, HP_HASHVAL, (BYTE*)vecptr(result), &hashSize, 0); - if (!hasHashed) { + if (!CryptGetHashParam(hash, HP_HASHVAL, vecptr(result), &hashSize, 0)) { // DWORD error = GetLastError(); // switch (error) { // std::cerr << (long)error << std::endl; diff --git a/Swiften/StringCodecs/SHA1_Windows.h b/Swiften/StringCodecs/SHA1_Windows.h index c485040..51786ca 100644 --- a/Swiften/StringCodecs/SHA1_Windows.h +++ b/Swiften/StringCodecs/SHA1_Windows.h @@ -39,7 +39,6 @@ namespace Swift { SHA1& update(const unsigned char* data, size_t dataSize); private: - HCRYPTPROV hCryptProv; - HCRYPTHASH hHash; + HCRYPTHASH hash; }; } |