Skip to content

DTLS 1.3: correct AEAD limits to match RFC 9147 #11975

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
julek-wolfssl wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −7
Open

DTLS 1.3: correct AEAD limits to match RFC 9147 #11975

Show file tree
Hide file tree
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
22 changes: 22 additions & 0 deletions tests/api/test_tls13.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13301,6 +13301,28 @@ int test_tls13_AEAD_limit_macros(void)
limit = DTLS_AEAD_AES_CCM_FAIL_KU_LIMIT;
ExpectIntEQ(w64GetHigh32(limit), 0);
ExpectIntEQ(w64GetLow32(limit), 0x005A8279);

/* RFC 9147 (AES-CCM confidentiality): 2^23 (0x00800000). */
limit = DTLS_AEAD_AES_CCM_LIMIT;
ExpectIntEQ(w64GetHigh32(limit), 0);
ExpectIntEQ(w64GetLow32(limit), 0x00800000);

/* RFC 9147 (AES-GCM, ChaCha20-Poly1305 integrity): 2^36, key update at
* 2^35. */
limit = DTLS_AEAD_AES_GCM_CHACHA_FAIL_LIMIT;
ExpectIntEQ(w64GetHigh32(limit), 0x10);
ExpectIntEQ(w64GetLow32(limit), 0);
limit = DTLS_AEAD_AES_GCM_CHACHA_FAIL_KU_LIMIT;
ExpectIntEQ(w64GetHigh32(limit), 0x08);
ExpectIntEQ(w64GetLow32(limit), 0);

/* RFC 9147 (AES-CCM-8 integrity): 2^7, key update at 2^6. */
limit = DTLS_AEAD_AES_CCM_8_FAIL_LIMIT;
ExpectIntEQ(w64GetHigh32(limit), 0);
ExpectIntEQ(w64GetLow32(limit), 0x80);
limit = DTLS_AEAD_AES_CCM_8_FAIL_KU_LIMIT;
ExpectIntEQ(w64GetHigh32(limit), 0);
ExpectIntEQ(w64GetLow32(limit), 0x40);
#endif
#endif
return EXPECT_RESULT();
Expand Down
14 changes: 7 additions & 7 deletions wolfssl/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1456,17 +1456,17 @@ enum {
* Without the fraction is 23726566 (0x016A09E6) */
#define AEAD_AES_LIMIT w64From32(0, 0x016A09E6)
/* Limit is 2^23
* https://www.rfc-editor.org/rfc/rfc9147.html#name-integrity-limits */
#define DTLS_AEAD_AES_CCM_LIMIT w64From32(0, 1 << 22)
* https://www.rfc-editor.org/rfc/rfc9147.html#name-confidentiality-limits */
#define DTLS_AEAD_AES_CCM_LIMIT w64From32(0, 1 << 23)

/* Limit is 2^36
/* Limit is 2^36 (2^4 in the high 32 bits)
* https://www.rfc-editor.org/rfc/rfc9147.html#name-aead-limits */
#define DTLS_AEAD_AES_GCM_CHACHA_FAIL_LIMIT w64From32(1 << 3, 0)
#define DTLS_AEAD_AES_GCM_CHACHA_FAIL_KU_LIMIT w64From32(1 << 2, 0)
#define DTLS_AEAD_AES_GCM_CHACHA_FAIL_LIMIT w64From32(1 << 4, 0)
#define DTLS_AEAD_AES_GCM_CHACHA_FAIL_KU_LIMIT w64From32(1 << 3, 0)
/* Limit is 2^7
* https://www.rfc-editor.org/rfc/rfc9147.html#name-limits-for-aead_aes_128_ccm */
#define DTLS_AEAD_AES_CCM_8_FAIL_LIMIT w64From32(0, 1 << 6)
#define DTLS_AEAD_AES_CCM_8_FAIL_KU_LIMIT w64From32(0, 1 << 5)
#define DTLS_AEAD_AES_CCM_8_FAIL_LIMIT w64From32(0, 1 << 7)
#define DTLS_AEAD_AES_CCM_8_FAIL_KU_LIMIT w64From32(0, 1 << 6)
/* Limit is 2^23.5.
* https://www.rfc-editor.org/rfc/rfc9147.html#name-integrity-limits
* Without the fraction is 11863283 (0x00B504F3)
Expand Down
Loading