Modify SymmetricCipher overlaps buffer checks #295
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
jasonkatonica
requested review from
taoliult,
KostasTsiounis,
johnpeck-us-ibm and
JinhangZhang
KostasTsiounis
requested changes
Oct 28, 2024
The `doFinal` and `update` methods in the SymmetricCipher class have logic to detect if a input buffer and output buffer are overlapping in any sort of way. If they are then a copy of the input is made to a separate location to ensure a safe operation can then take place on the data. There is a logic problem where the calculation of overlap was incorrect and used a `=` instead of a `+` to calculate if the input and output overlapped. The comment above this code block was correct and remains unmodified. The test `BaseTestAESGCMCopySafe` was modified to test this condition which it was attempting to do in the past however it was not operating upon input and output buffers that had the same memory address. The test was modified to exercise various overlapping conditions for AES GCM and also AES CBC accordingly. The test was then renamed to `BaseTestAESCopySafe` since we are now testing both GCM and CBC modes. Fixes IBM#292 Signed-off-by: Jason Katonica <katonica@us.ibm.com>
jasonkatonica
force-pushed
the
katonica/issue292/fixoverlaplogic
branch
from
46a71f1
to
dee50b3
Compare
johnpeck-us-ibm
approved these changes
Oct 29, 2024
|
x86_64_linux,ppc64le_linux,s390x_linux,x86_64_windows |
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.
The
doFinalandupdatemethods in the SymmetricCipher class have logic to detect if a input buffer and output buffer are overlapping in any sort of way. If they are then a copy of the input is made to a separate location to ensure a safe operation can then take place on the data.There is a logic problem where the calculation of overlap was incorrect and used a
=instead of a+to calculate if the input and output overlapped. The comment above this code block was correct and remains unmodified.The test
BaseTestAESGCMCopySafewas modified to test this condition which it was attempting to do in the past however it was not operating upon input and output buffers that had the same memory address. The test was modified to exercise various overlapping conditions for AES GCM and also AES CBC accordingly. The test was then renamed toBaseTestAESCopySafesince we are now testing both GCM and CBC modes.Fixes #292
Signed-off-by: Jason Katonica katonica@us.ibm.com