Feature merge #47
Merged
Feature merge #47
Conversation
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
bdonlan
suggested changes
Aug 29, 2018
| @@ -371,6 +380,10 @@ private void actualDecryption(Map<String, AttributeValue> itemAttributes, | |||
| } | |||
| } | |||
|
|
|||
| protected int getBlockSize(final String encryptionMode) { | |||
| cipherText.put(iv); | ||
| cipher.init(Cipher.ENCRYPT_MODE, encryptionKey, Utils.getRng()); | ||
| cipherText = ByteBuffer.allocate(blockSize + cipher.getOutputSize(plainText.remaining())); | ||
| cipherText.position(blockSize); |
There was a problem hiding this comment.
Block size may not equal IV size, depending on the mode (e.g. AES-GCM would use a 12 byte IV with a 16 byte block size.
There was a problem hiding this comment.
In this data-format version of the client they must be the same. It's a limitation of the format which we cannot change until we do a more significant version rev.
There was a problem hiding this comment.
Please leave a comment to this effect, and a runtime check to confirm that the returned iv array is the correct size.
src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/DynamoDBEncryptor.java
Show resolved
Hide resolved
src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/LRUCache.java
Show resolved
Hide resolved
bdonlan
approved these changes
Aug 29, 2018
seebees
pushed a commit
that referenced
this pull request
Dec 12, 2023
Fix FrameEncryptionHandlerVeryLongTest so that last frame is final.
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.
This pull-request is a roll-up to synchronize functionality and release several minor features.
Together these changes are sufficiently important that a minor version bump to 1.12.0 is included in this PR.
Changes:
MetaStore.replicateto make it easier to copy data-keys from one MetaStore to anotherBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.