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

mbedtls/aes.c: Fix whitespace errors introduced during code import #5616

Merged
merged 1 commit into from
Dec 18, 2024
Merged

mbedtls/aes.c: Fix whitespace errors introduced during code import #5616

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
5 changes: 5 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ tab_width = 8
indent_style = space
indent_size = 2

# Neither does mbedtls
[src/mbedtls/*.[ch]]
indent_style = space
indent_size = 4

[7z2john.pl]
indent_style = space
indent_size = 2
Expand Down
14 changes: 7 additions & 7 deletions src/mbedtls/aes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,13 +1102,13 @@ int mbedtls_aes_crypt_cbc(mbedtls_aes_context *ctx,
}

if (length % 16) {
ret = MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH;
/*
* For bug compatibility, chug along and return the error afterwards.
* Our old code (and eg. OpenSSL) would read and write past buffers
* just like we do here. - magnum
*/
length = (length + 15) / 16 * 16;
ret = MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH;
/*
* For bug compatibility, chug along and return the error afterwards.
* Our old code (and eg. OpenSSL) would read and write past buffers
* just like we do here. - magnum
*/
length = (length + 15) / 16 * 16;
}

#if defined(MBEDTLS_VIA_PADLOCK_HAVE_CODE)
Expand Down
Loading