Skip to content
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

Jump to bottom

Fix ChaCha20 on 32-bit platforms #99

Merged
merged 2 commits into from
May 29, 2020
Merged

Fix ChaCha20 on 32-bit platforms #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c1a6bc
Fix ChaCha20 on 32-bit platforms
themiron May 28, 2020
38d45db
Fix Chacha20-Poly1305 and AES-GCM debug messages
themiron May 28, 2020
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
8 changes: 4 additions & 4 deletions chachapoly.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static int dropbear_chachapoly_crypt(unsigned int seq,
return CRYPT_ERROR;
}

STORE64H(seq, seqbuf);
STORE64H((uint64_t)seq, seqbuf);
chacha_ivctr64(&state->chacha, seqbuf, sizeof(seqbuf), 0);
if ((err = chacha_keystream(&state->chacha, key, sizeof(key))) != CRYPT_OK) {
return err;
Expand Down Expand Up @@ -122,21 +122,21 @@ static int dropbear_chachapoly_getlength(unsigned int seq,
unsigned char seqbuf[8], buf[4];
int err;

TRACE2(("enter dropbear_chachapoly_parse"))
TRACE2(("enter dropbear_chachapoly_getlength"))

if (len < sizeof(buf)) {
return CRYPT_ERROR;
}

STORE64H(seq, seqbuf);
STORE64H((uint64_t)seq, seqbuf);
chacha_ivctr64(&state->header, seqbuf, sizeof(seqbuf), 0);
if ((err = chacha_crypt(&state->header, in, sizeof(buf), buf)) != CRYPT_OK) {
return err;
}

LOAD32H(*outlen, buf);

TRACE2(("leave dropbear_chachapoly_parse"))
TRACE2(("leave dropbear_chachapoly_getlength"))
return CRYPT_OK;
}

Expand Down
4 changes: 2 additions & 2 deletions gcm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ static int dropbear_gcm_crypt(unsigned int UNUSED(seq),
static int dropbear_gcm_getlength(unsigned int UNUSED(seq),
const unsigned char *in, unsigned int *outlen,
unsigned long len, dropbear_gcm_state* UNUSED(state)) {
TRACE2(("enter dropbear_gcm_parse"))
TRACE2(("enter dropbear_gcm_getlength"))

if (len < 4) {
return CRYPT_ERROR;
}

LOAD32H(*outlen, in);

TRACE2(("leave dropbear_gcm_parse"))
TRACE2(("leave dropbear_gcm_getlength"))
return CRYPT_OK;
}

Expand Down