Mbed-TLS/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-10-05 00:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy ChaCha20 counter limit handling

Browse Source 
Signed-off-by: Ben Taylor <[email protected]>
This commit is contained in:
Ben Taylor
2026-05-29 13:17:36 +01:00
parent 7bf0215f8d
commit dcf3b11749
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mbedtls/chacha20.h
+2 -1
View File
@@ -38,7 +38,8 @@ extern "C" {
typedef struct mbedtls_chacha20_context { typedef struct mbedtls_chacha20_context {
uint32_t MBEDTLS_PRIVATE(state)[16]; /*! The state (before round operations). */ uint32_t MBEDTLS_PRIVATE(state)[16]; /*! The state (before round operations). */
uint8_t MBEDTLS_PRIVATE(keystream8)[64]; /*! Leftover keystream bytes. */ uint8_t MBEDTLS_PRIVATE(keystream8)[64]; /*! Leftover keystream bytes. */
size_t MBEDTLS_PRIVATE(keystream_bytes_used); /*! Number of keystream bytes already used. */ size_t MBEDTLS_PRIVATE(keystream_bytes_used); /*! Number of keystream bytes already used,
* or an internal sentinel value. */
} }
mbedtls_chacha20_context; mbedtls_chacha20_context;
library/chacha20.c
+1 -1
View File
@@ -31,7 +31,7 @@
#define CHACHA20_BLOCK_SIZE_BYTES (4U * 16U) #define CHACHA20_BLOCK_SIZE_BYTES (4U * 16U)
#define CHACHA20_MAX_BLOCKS 0xFFFFFFFF #define CHACHA20_MAX_BLOCKS UINT32_MAX
#define CHACHA20_COUNTER_EXHAUSTED (CHACHA20_BLOCK_SIZE_BYTES + 1U) #define CHACHA20_COUNTER_EXHAUSTED (CHACHA20_BLOCK_SIZE_BYTES + 1U)
tests/suites/test_suite_chacha20.function
+1
View File
@@ -96,6 +96,7 @@ void chacha20_input_len_too_long(void)
/* Consume the rest of the final counter block, then reject more input. */ /* Consume the rest of the final counter block, then reject more input. */
TEST_EQUAL(mbedtls_chacha20_update(&ctx, 63, input, output), 0); TEST_EQUAL(mbedtls_chacha20_update(&ctx, 63, input, output), 0);
TEST_EQUAL(mbedtls_chacha20_update(&ctx, 0, NULL, NULL), 0);
TEST_EQUAL(mbedtls_chacha20_update(&ctx, 1, input, output), TEST_EQUAL(mbedtls_chacha20_update(&ctx, 1, input, output),
MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA); MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA);