added fix to retrieve the actual contents from the materials description object, not the object itself. Also reworded one of the exception messages to be clearer for when instruction file suffix request is specified for AES keyring (which should not happen)

Author: Anirav Kareddy

src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java

@@ -253,7 +253,9 @@ public ReEncryptInstructionFileResponse reEncryptInstructionFile(ReEncryptInstru
         RawKeyring newKeyring = reEncryptInstructionFileRequest.newKeyring();
         EncryptionMaterials encryptedMaterials = newKeyring.onEncrypt(encryptionMaterials);
 
-        if (encryptedMaterials.materialsDescription().equals(currentKeyringMaterialsDescription)) {
+         Map<String, String> newMaterialsDescription = encryptedMaterials.materialsDescription().getMaterialsDescription();
+
+        if (newMaterialsDescription.equals(currentKeyringMaterialsDescription)) {
             throw new S3EncryptionClientException("New keyring must have new materials description!");
         }
 

src/main/java/software/amazon/encryption/s3/internal/ReEncryptInstructionFileRequest.java

@@ -139,7 +139,7 @@ public ReEncryptInstructionFileRequest build() {
       }
       if (newKeyring instanceof AesKeyring) {
         if (!instructionFileSuffix.equals(DEFAULT_INSTRUCTION_FILE_SUFFIX)) {
-          throw new S3EncryptionClientException("Instruction file suffix is not applicable for AES keyring!");
+          throw new S3EncryptionClientException("Custom Instruction file suffix is not applicable for AES keyring!");
         }
       } else if (newKeyring instanceof RsaKeyring) {
         if (instructionFileSuffix.equals(DEFAULT_INSTRUCTION_FILE_SUFFIX)) {