Fix to saved integrity algorithm

Author: SalusaSecondus

src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/providers/store/MetaStore.java

@@ -191,7 +191,7 @@ private Map<String, AttributeValue> encryptKeys(final String name, final long ve
         plaintext.put(ENCRYPTION_ALGORITHM_FIELD, new AttributeValue().withS(encryptionKey.getAlgorithm()));
         plaintext
         .put(INTEGRITY_KEY_FIELD, new AttributeValue().withB(ByteBuffer.wrap(integrityKey.getEncoded())));
-        plaintext.put(INTEGRITY_ALGORITHM_FIELD, new AttributeValue().withS(encryptionKey.getAlgorithm()));
+        plaintext.put(INTEGRITY_ALGORITHM_FIELD, new AttributeValue().withS(integrityKey.getAlgorithm()));
 
         try {
             return encryptor.encryptAllFieldsExcept(plaintext, ddbCtx, DEFAULT_HASH_KEY,

src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/providers/MostRecentProviderTests.java

@@ -99,6 +99,9 @@ public void singleMaterial() throws InterruptedException {
 
         assertEquals(eMat1.getSigningKey(), eMat2.getSigningKey());
         assertEquals(eMat1.getSigningKey(), eMat3.getSigningKey());
+        // Check algorithms. Right now we only support AES and HmacSHA256
+        assertEquals("AES", eMat1.getEncryptionKey().getAlgorithm());
+        assertEquals("HmacSHA256", eMat1.getSigningKey().getAlgorithm());
 
         // Ensure we can decrypt all of them without hitting ddb more than the minimum
         final MostRecentProvider prov2 = new MostRecentProvider(store, MATERIAL_NAME, 500);