diff options
| -rw-r--r-- | chachapoly.c | 8 | ||||
| -rw-r--r-- | gcm.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chachapoly.c b/chachapoly.c index 8fb06c5..c065fac 100644 --- a/chachapoly.c +++ b/chachapoly.c @@ -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; @@ -122,13 +122,13 @@ 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; @@ -136,7 +136,7 @@ static int dropbear_chachapoly_getlength(unsigned int seq, LOAD32H(*outlen, buf); - TRACE2(("leave dropbear_chachapoly_parse")) + TRACE2(("leave dropbear_chachapoly_getlength")) return CRYPT_OK; } @@ -100,7 +100,7 @@ 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; @@ -108,7 +108,7 @@ static int dropbear_gcm_getlength(unsigned int UNUSED(seq), LOAD32H(*outlen, in); - TRACE2(("leave dropbear_gcm_parse")) + TRACE2(("leave dropbear_gcm_getlength")) return CRYPT_OK; } |