20241221-wolfCrypt-more-AES_BLOCK_SIZE #8310
Merged
Conversation
This file contains 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
… for GHASH_ONE_BLOCK().
…SIZE with WC_AES_BLOCKSIZE for compatibility with OPENSSL_COEXIST. Automated replacement with ``` git ls-files -z wolfcrypt/src/port/ IDE/ | xargs -0 pcre2grep -l '[^_]AES_BLOCK_SIZE' | xargs sed --regexp-extended --in-place 's/([^_])AES_BLOCK_SIZE/\1WC_AES_BLOCK_SIZE/g' ``` Checked for mis-transformations with ``` git ls-files -z | xargs -0 pcre2grep '[^-[()+*/[:space:]]WC_AES_BLOCK_SIZE' | less ``` Checked for residual hits with ``` git ls-files -z | xargs -0 pcre2grep '[^_]AES_BLOCK_SIZE' | less ``` Deliberately excluded: * ChangeLog.md -- do not alter history. * doc/ -- do not confuse documentation with newly prefixed macro, because AES_BLOCK_SIZE is available unless -DOPENSSL_COEXIST. * tests/api.c -- the unit tests deliberately use compatibility names, and are not compatible with -DOPENSSL_COEXIST. * wrapper/CSharp/wolfSSL_CSharp/wolfCrypt.cs -- false positive hits on C# names. * wrapper/CSharp/wolfCrypt-Test/wolfCrypt-Test.cs -- false positive hits on C# names. * reference in wolfssl/wolfcrypt/aes.h that defines AES_BLOCK_SIZE when -UOPENSSL_COEXIST. * reference in wolfssl/wolfcrypt/settings.h that defines WC_AES_BLOCK_SIZE for old FIPS when -UWC_AES_BLOCK_SIZE.
JacobBarthelmeh
approved these changes
Dec 23, 2024
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.
wolfssl/wolfcrypt/aes.h: fix stray reference to
AES_BLOCK_SIZEin def forGHASH_ONE_BLOCK().In
wolfcrypt/src/port/andIDE/, replace remaining uses ofAES_BLOCK_SIZEwithWC_AES_BLOCKSIZEfor compatibility withOPENSSL_COEXIST.Automated replacement with
Checked for mis-transformations with
Checked for residual hits with
Deliberately excluded:
ChangeLog.md-- do not alter history.doc/-- do not confuse documentation with newly prefixed macro, becauseAES_BLOCK_SIZEis available unless-DOPENSSL_COEXIST.tests/api.c-- the unit tests deliberately use compatibility names, and are not compatible with-DOPENSSL_COEXIST(tests/unit.hexpressly undefines it).wrapper/CSharp/wolfSSL_CSharp/wolfCrypt.cs-- false positive hits on C# names.wrapper/CSharp/wolfCrypt-Test/wolfCrypt-Test.cs-- false positive hits on C# names.wolfssl/wolfcrypt/aes.hthat definesAES_BLOCK_SIZEwhen-UOPENSSL_COEXIST.wolfssl/wolfcrypt/settings.hthat definesWC_AES_BLOCK_SIZEfor old FIPS when-UWC_AES_BLOCK_SIZE.Tested with
wolfssl-multi-test.sh ... check-source-text quantum-safe-wolfssl-all-g++-latest-debug quantum-safe-wolfssl-all-cppcheck clang-tidy-all-sp-all sanitizer-all-intelasm-c-fallback-fuzzerNote, this PR extends the work merged in #8265.