From 00d2f9494bbc493a8efad13ea2cbe29a1983339c Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Fri, 4 May 2018 15:07:20 -0700
Subject: [PATCH] Change HMACAuth::calculateHash to just call existing methods

---
 libraries/networking/src/HMACAuth.cpp | 17 ++++-------------
 libraries/networking/src/HMACAuth.h   |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/libraries/networking/src/HMACAuth.cpp b/libraries/networking/src/HMACAuth.cpp
index 8e57978b5a..515af9a070 100644
--- a/libraries/networking/src/HMACAuth.cpp
+++ b/libraries/networking/src/HMACAuth.cpp
@@ -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;
 }
diff --git a/libraries/networking/src/HMACAuth.h b/libraries/networking/src/HMACAuth.h
index ec06bfbda2..59870bb7b6 100644
--- a/libraries/networking/src/HMACAuth.h
+++ b/libraries/networking/src/HMACAuth.h
@@ -35,7 +35,7 @@ public:
     HMACHash result();
 
 private:
-    QMutex _lock;
+    QMutex _lock { QMutex::Recursive };
     struct hmac_ctx_st* _hmacContext;
     AuthMethod _authMethod;
 };