diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2014-06-22 10:08:01 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2014-06-22 10:08:01 +0200 |
| commit | 7ec2782ca7f56377011c2620287639f70655c8c3 (patch) | |
| tree | 387fba16b0402e5224d920e2699749ad56d44e6d | |
| parent | 7b33bd13b459b55023406dc8d33eb9b3e5e0a018 (diff) | |
Fixing Linux build.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | includes/BHashes.h | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -9,7 +9,7 @@ LDFLAGS += -g3 -gdwarf-2 endif INCLUDES = includes libcoro libev LuaJIT/src lcrypt libtommath libtomcrypt/src/headers src/jsoncpp/include -LIBS = z +LIBS = z curl DEFINES = _LARGEFILE64_SOURCE LITTLE_ENDIAN LTM_DESC LTC_SOURCE USE_LTM ifeq ($(SYSTEM),Darwin) @@ -62,6 +62,8 @@ TaskMan.cc \ \ HelperTasks.cc \ \ +CurlTask.cc \ +\ Http.cc \ HttpServer.cc \ HttpActionStatic.cc \ diff --git a/includes/BHashes.h b/includes/BHashes.h index 9fcf0fd..c08b48d 100644 --- a/includes/BHashes.h +++ b/includes/BHashes.h @@ -50,7 +50,7 @@ class HMAC { int r = hmac_process(&m_state, data, len); IAssert(r == CRYPT_OK, "hmac_process for %s returned %i", Hash::name(), r); } - unsigned final(void * digest, unsigned outlen) { + unsigned long final(void * digest, unsigned long outlen) { int r = hmac_done(&m_state, (uint8_t *) digest, &outlen); IAssert(r == CRYPT_OK, "hmac_done for %s returned %i", Hash::name(), r); return outlen; |