fixed issue where materials description wasn't being passed to Encryption Materials in putObject by first creating a helper method in the RawKeyring class that both AES + RSA keyrings will call in the override modifyMaterials method to return materials description instead of empty encryption materials

Author: Anirav Kareddy

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

@@ -88,6 +88,11 @@ public boolean isLegacy() {
             return false;
         }
 
+        @Override
+        public EncryptionMaterials modifyMaterials(EncryptionMaterials materials) {
+            return modifyMaterialHelper(materials);
+        }
+
         @Override
         public String keyProviderInfo() {
             return KEY_PROVIDER_INFO;

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

@@ -20,8 +20,14 @@ public MaterialsDescription getMaterialsDescription() {
   public boolean getReEncryptInstructionFile() {
     return _reEncryptInstructionFile;
   }
-  public EncryptionMaterials modifyMaterials(EncryptionMaterials materials) {
+  public EncryptionMaterials modifyMaterialHelper(EncryptionMaterials materials) {
     warnIfEncryptionContextIsPresent(materials);
+    if (_materialsDescription != null && !_materialsDescription.isEmpty()) {
+      materials = materials.toBuilder()
+        .materialsDescription(_materialsDescription)
+        .build();
+      return materials;
+    }
 
     return materials;
   }

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

@@ -93,6 +93,11 @@ public boolean isLegacy() {
             return false;
         }
 
+        @Override
+        public EncryptionMaterials modifyMaterials(EncryptionMaterials materials) {
+            return modifyMaterialHelper(materials);
+        }
+
         @Override
         public String keyProviderInfo() {
             return KEY_PROVIDER_INFO;