D4
/
d4-core
mirror of https://github.com/D4-project/d4-core
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: [client] fix sha256 hmac

pull/23/head
Terrtia 2019-01-03 11:37:43 +01:00
parent c3492bc5a4
commit 3937486e7c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/d4.c
View File

@ -184,9 +184,11 @@ void d4_transfert(d4_t* d4)
ssize_t n; ssize_t n;
char* buf; char* buf;
unsigned char* hmac; unsigned char* hmac;
unsigned char* hmaczero;
buf = calloc(1, d4->snaplen); buf = calloc(1, d4->snaplen);
hmac = calloc(1,SZHMAC); hmac = calloc(1,SZHMAC);
hmaczero = calloc(1,SZHMAC);
//TODO error handling -> insert error message //TODO error handling -> insert error message
if ((buf == NULL) && (hmac == NULL)) if ((buf == NULL) && (hmac == NULL))
return; return;
@ -200,12 +202,15 @@ void d4_transfert(d4_t* d4)
d4_update_header(d4, nread); d4_update_header(d4, nread);
//Do HMAC on header and payload. HMAC field is 0 during computation //Do HMAC on header and payload. HMAC field is 0 during computation
if (d4->ctx) { if (d4->ctx) {
bzero(d4->ctx,sizeof(hmac_sha256_ctx)); hmac_sha256_reinit(d4->ctx);
hmac_sha256_init(d4->ctx, (uint8_t*)d4->conf[KEY], strlen(d4->conf[KEY])); hmac_sha256_update(d4->ctx, (const unsigned char*)&d4->header.version, sizeof(uint8_t));
hmac_sha256_update(d4->ctx, (const unsigned char*)&d4->header, hmac_sha256_update(d4->ctx, (const unsigned char*)&d4->header.type, sizeof(uint8_t));
sizeof(d4_header_t)); hmac_sha256_update(d4->ctx, (const unsigned char*)&d4->header.uuid, SZUUID);
hmac_sha256_update(d4->ctx, (const unsigned char*)buf, nread); hmac_sha256_update(d4->ctx, (const unsigned char*)&d4->header.timestamp, sizeof(uint64_t));
hmac_sha256_final(d4->ctx, hmac, SZHMAC); hmac_sha256_update(d4->ctx, (const unsigned char*) hmaczero, SZHMAC);
hmac_sha256_update(d4->ctx, (const unsigned char*)&d4->header.size, sizeof(uint32_t));
hmac_sha256_update(d4->ctx, (const unsigned char*)buf, nread);
hmac_sha256_final(d4->ctx, hmac, SZHMAC);
//Add it to the header //Add it to the header
memcpy(d4->header.hmac, hmac, SZHMAC); memcpy(d4->header.hmac, hmac, SZHMAC);
} }