update call pattern for CRT AES

Author: sbiscigl

src/aws-cpp-sdk-core/source/utils/crypto/crt/CRTSymmetricCipher.cpp

@@ -85,7 +85,9 @@ namespace Aws
 
             void CRTSymmetricCipher::Reset()
             {
+                m_lastFetchedTag = GetTag();
                 m_cipher.Reset();
+                m_cipher.SetTag(Crt::ByteCursorFromArray(m_lastFetchedTag.GetUnderlyingData(), m_lastFetchedTag.GetLength()));
             }
 
             bool CRTSymmetricCipher::Good() const

src/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp

@@ -376,7 +376,11 @@ class DefaultAES_GCMFactory : public SymmetricCipherFactory
         if (aad)
         {
             auto aadCur = Aws::Crt::ByteCursorFromArray(aad->GetUnderlyingData(), aad->GetLength());
-            return Aws::MakeShared<CRTSymmetricCipher>(s_allocationTag, Aws::Crt::Crypto::SymmetricCipher::CreateAES_256_GCM_Cipher(keyCur, Aws::Crt::Optional<Aws::Crt::ByteCursor>(), Aws::Crt::Optional<Aws::Crt::ByteCursor>(), aadCur));
+            const auto cipher = Aws::MakeShared<CRTSymmetricCipher>(s_allocationTag,
+                Aws::Crt::Crypto::SymmetricCipher::CreateAES_256_GCM_Cipher(keyCur,
+                    Aws::Crt::Optional<Aws::Crt::ByteCursor>(),
+                    aadCur));
+            return cipher;
         }
 
         return Aws::MakeShared<CRTSymmetricCipher>(s_allocationTag, Aws::Crt::Crypto::SymmetricCipher::CreateAES_256_GCM_Cipher(keyCur));
@@ -398,7 +402,12 @@ class DefaultAES_GCMFactory : public SymmetricCipherFactory
         Aws::Crt::Optional<Aws::Crt::ByteCursor> tagCur = tag.GetLength() > 0 ? Aws::Crt::ByteCursorFromArray(tag.GetUnderlyingData(), tag.GetLength()) : Aws::Crt::Optional<Aws::Crt::ByteCursor>();
         Aws::Crt::Optional<Aws::Crt::ByteCursor> aadCur = aad.GetLength() > 0 ? Aws::Crt::ByteCursorFromArray(aad.GetUnderlyingData(), aad.GetLength()) : Aws::Crt::Optional<Aws::Crt::ByteCursor>();
 
-        return Aws::MakeShared<CRTSymmetricCipher>(s_allocationTag, Aws::Crt::Crypto::SymmetricCipher::CreateAES_256_GCM_Cipher(keyCur, ivCur, tagCur, aadCur));
+        auto cipher = Aws::Crt::Crypto::SymmetricCipher::CreateAES_256_GCM_Cipher(keyCur, ivCur, aadCur);
+        if (cipher && tagCur.has_value())
+        {
+            cipher.SetTag(tagCur.value());
+        }
+        return Aws::MakeShared<CRTSymmetricCipher>(s_allocationTag, std::move(cipher));
 #else
         AWS_UNREFERENCED_PARAM(key);
         AWS_UNREFERENCED_PARAM(iv);

tests/aws-cpp-sdk-core-tests/utils/crypto/SymmetricCiphersTest.cpp

@@ -270,10 +270,10 @@ TEST_F(AES_GCM_TEST, TestBadTagCausesFailure)
     ASSERT_TRUE(*cipher);
 
     const_cast<CryptoBuffer&>(cipher->GetTag())[8] = 0;
-
     cipher->Reset();
     auto decryptResult = cipher->DecryptBuffer(encryptedResult);
     auto finalDecryptBuffer = cipher->FinalizeDecryption();
+    ASSERT_FALSE(*cipher);
     ASSERT_EQ(0u, finalDecryptBuffer.GetLength());
 }