Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change HMACAuth::calculateHash to just call existing methods

Browse source
This commit is contained in:
Simon Walton 2018-05-04 15:07:20 -07:00
parent 9ef56c44a3
commit 00d2f9494b
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libraries/networking/src/HMACAuth.cpp
View file

@ -106,21 +106,12 @@ HMACAuth::HMACHash HMACAuth::result() {
bool HMACAuth::calculateHash(HMACHash& hashResult, const char* data, int dataLen) {
QMutexLocker lock(&_lock);
if (!HMAC_Update(_hmacContext, reinterpret_cast<const unsigned char*>(data), dataLen)) {
qCWarning(networking) << "Error occured calling HMAC_Update";
if (!addData(data, dataLen)) {
qCWarning(networking) << "Error occured calling HMACAuth::addData()";
assert(false);
return false;
}
hashResult.resize(EVP_MAX_MD_SIZE);
unsigned int hashLen;
if (HMAC_Final(_hmacContext, &hashResult[0], &hashLen)) {
hashResult.resize((size_t)hashLen);
// Clear state for possible reuse.
HMAC_Init_ex(_hmacContext, nullptr, 0, nullptr, nullptr);
return true;
}
qCWarning(networking) << "Error occured calling HMAC_Final";
assert(false);
return false;
hashResult = result();
return true;
}

2
libraries/networking/src/HMACAuth.h
View file

@ -35,7 +35,7 @@ public:
HMACHash result();
private:
QMutex _lock;
QMutex _lock { QMutex::Recursive };
struct hmac_ctx_st* _hmacContext;
AuthMethod _authMethod;
};