Skip to content

properly align the HMAC state buffers on the stack #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

properly align the HMAC state buffers on the stack #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions crypto/hmac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ void hmac_prepare(const struct hmac_control_block* hcb,
void* midstate,
const str* secret)
{
unsigned char state[hcb->state_size];
uint64 statebuf[(hcb->state_size + 7) / sizeof(uint64)];
unsigned char *state = (unsigned char *)statebuf;
unsigned char block[hcb->block_size];
unsigned i;

Expand Down Expand Up @@ -80,8 +81,9 @@ void hmac_finish(const struct hmac_control_block* hcb,
const str* nonce,
void* output)
{
unsigned char state[hcb->state_size];

uint64 statebuf[(hcb->state_size + 7) / sizeof(uint64)];
unsigned char *state = (unsigned char *)statebuf;

/* Generate H1 = H(K XOR ipad, nonce) */
hcb->inject(state, midstate);
hcb->update(state, (const unsigned char*)nonce->s, nonce->len);
Expand All @@ -106,7 +108,8 @@ void hmac(const struct hmac_control_block* hcb,
const str* nonce,
void* output)
{
unsigned char midstate[hcb->state_size*2];
uint64 statebuf[(hcb->state_size * 2 + 7) / sizeof(uint64)];
unsigned char *midstate = (unsigned char *)statebuf;

hmac_prepare(hcb, midstate, secret);
hmac_finish(hcb, midstate, nonce, output);
Expand Down