Skip to content

Commit 20a8364

Browse files
author
Anirav Kareddy
committed
removed the modifyMaterials method from AES + RSA Keyrings since it will already be inherited from RawKeyring class
1 parent 0bd11ab commit 20a8364

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

src/main/java/software/amazon/encryption/s3/materials/AesKeyring.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,6 @@ public EncryptionMaterials generateDataKey(EncryptionMaterials materials) {
9898
return defaultGenerateDataKey(materials);
9999
}
100100

101-
@Override
102-
public EncryptionMaterials modifyMaterials(EncryptionMaterials materials) {
103-
warnIfEncryptionContextIsPresent(materials);
104-
105-
return materials;
106-
}
107-
108101
@Override
109102
public byte[] encryptDataKey(SecureRandom secureRandom,
110103
EncryptionMaterials materials)

src/main/java/software/amazon/encryption/s3/materials/RsaKeyring.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,6 @@ public EncryptionMaterials generateDataKey(EncryptionMaterials materials) {
103103
return defaultGenerateDataKey(materials);
104104
}
105105

106-
@Override
107-
public EncryptionMaterials modifyMaterials(EncryptionMaterials materials) {
108-
warnIfEncryptionContextIsPresent(materials);
109-
110-
return materials;
111-
}
112-
113106
@Override
114107
public byte[] encryptDataKey(SecureRandom secureRandom,
115108
EncryptionMaterials materials) throws GeneralSecurityException {

0 commit comments

Comments
 (0)