Commit 49a891fe authored by jselbie's avatar jselbie

Another CommonCrypto update

parent 2bdc528f
#BOOST_INCLUDE := -I/Users/jselbie/boost_1_52_0 BOOST_INCLUDE := -I/Users/jselbie/boost_1_52_0
#OPENSSL_INCLUDE := -I/Users/jselbie/openssl/include #OPENSSL_INCLUDE := -I/Users/jselbie/openssl/include
DEFINES := -DNDEBUG DEFINES := -DNDEBUG
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "commonincludes.hpp" #include "commonincludes.hpp"
//#include <openssl/hmac.h>
#include "stuncore.h" #include "stuncore.h"
#include "stunsocket.h" #include "stunsocket.h"
#include "stunsocketthread.h" #include "stunsocketthread.h"
......
...@@ -156,6 +156,7 @@ HRESULT CStunMessageReader::ValidateMessageIntegrity(uint8_t* key, size_t keylen ...@@ -156,6 +156,7 @@ HRESULT CStunMessageReader::ValidateMessageIntegrity(uint8_t* key, size_t keylen
HMAC_CTX ctx = {}; HMAC_CTX ctx = {};
#else #else
CCHmacContext ctx = {}; CCHmacContext ctx = {};
UNREFERENCED_VARIABLE(hmaclength);
#endif #endif
uint32_t chunk32; uint32_t chunk32;
uint16_t chunk16; uint16_t chunk16;
...@@ -329,12 +330,7 @@ HRESULT CStunMessageReader::ValidateMessageIntegrityLong(const char* pszUser, co ...@@ -329,12 +330,7 @@ HRESULT CStunMessageReader::ValidateMessageIntegrityLong(const char* pszUser, co
#ifndef __APPLE__ #ifndef __APPLE__
ChkIfA(NULL == MD5(key, totallength, hash), E_FAIL); ChkIfA(NULL == MD5(key, totallength, hash), E_FAIL);
#else #else
{ CC_MD5(key, totallength, hash);
CC_MD5_CTX context = {};
CC_MD5_Init(&context);
CC_MD5_Update(&context, key, totallength);
CC_MD5_Final(hash, &context);
}
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment