Fix double increment of clen in AESGCM case of MBEDTLS 3.0+#3030
Open
robo5ive wants to merge 1 commit intoshadowsocks:masterfrom
Open
Fix double increment of clen in AESGCM case of MBEDTLS 3.0+#3030robo5ive wants to merge 1 commit intoshadowsocks:masterfrom
robo5ive wants to merge 1 commit intoshadowsocks:masterfrom
Conversation
mbedtls_cipher_auth_encrypt_ext will fill clen with tlen. see https://mbed-tls.readthedocs.io/projects/api/en/v2.28.6/api/file/cipher_8h/#cipher_8h_1a64ea7a5500f054d1d60a22369d171eea
There was a problem hiding this comment.
Pull request overview
Fixes AEAD (AES-GCM) ciphertext length handling across mbedTLS versions by avoiding an extra tag-length increment when using mbedTLS 3.0+ APIs (where the API already accounts for the tag length in clen).
Changes:
- Increment
*clenbytlenonly formbedtls_cipher_auth_encrypt()(mbedTLS < 3.0). - Avoid incrementing
*clenformbedtls_cipher_auth_encrypt_ext()(mbedTLS 3.0+), preventing a double-count of the tag length.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| #if MBEDTLS_VERSION_NUMBER < 0x03000000 | ||
| err = mbedtls_cipher_auth_encrypt(cipher_ctx->evp, n, nlen, ad, adlen, | ||
| m, mlen, c, clen, c + mlen, tlen); | ||
| *clen += tlen; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
mbedtls_cipher_auth_encrypt_ext will fill clen with tlen.
See https://mbed-tls.readthedocs.io/projects/api/en/v2.28.6/api/file/cipher_8h/#cipher_8h_1a64ea7a5500f054d1d60a22369d171eea