move to move ctor

Author: sbiscigl

src/aws-cpp-sdk-core/include/aws/core/utils/Array.h

@@ -9,6 +9,7 @@
 
 #include <aws/core/utils/memory/AWSMemory.h>
 #include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/crt/Types.h>
 #include <memory>
 #include <cassert>
 #include <cstring>
@@ -114,7 +115,7 @@ namespace Aws
             }
 
             //move c_tor
-            Array(Array&& other) :
+            Array(Array&& other) noexcept :
                 m_size(other.m_size),
                 m_length(other.m_length),
                 m_data(std::move(other.m_data))
@@ -123,6 +124,16 @@ namespace Aws
                 other.m_data = nullptr;
             }
 
+            explicit Array(Crt::ByteBuf&& other) noexcept :
+                m_size(other.len),
+                m_length(other.len),
+                m_data(other.buffer)
+            {
+                other.capacity = 0;
+                other.len = 0;
+                other.buffer = nullptr;
+            }
+
             virtual ~Array() = default;
 
             Array& operator=(const Array& other)
@@ -150,7 +161,7 @@ namespace Aws
                 return *this;
             }
 
-            Array& operator=(Array&& other)
+            Array& operator=(Array&& other) noexcept
             {
                 m_size = other.m_size;
                 m_length = other.m_length;
@@ -159,6 +170,15 @@ namespace Aws
                 return *this;
             }
 
+            Array& operator=(Crt::ByteBuf&& other) noexcept
+            {
+                m_size = other.len;
+                m_length = other.len;
+                m_data.reset(other.buffer);
+
+                return *this;
+            }
+
             bool operator==(const Array& other) const
             {
                 if (this == &other)
@@ -258,6 +278,8 @@ namespace Aws
             CryptoBuffer(CryptoBuffer&& other) : ByteBuffer(std::move(other)) {}
             CryptoBuffer& operator=(const CryptoBuffer&) = default;
             CryptoBuffer& operator=(CryptoBuffer&& other) { ByteBuffer::operator=(std::move(other)); return *this; }
+            CryptoBuffer(Crt::ByteBuf&& other) noexcept : ByteBuffer(std::move(other)) {}
+            CryptoBuffer& operator=(Crt::ByteBuf&& other) noexcept { ByteBuffer::operator=(std::move(other)); return *this; }
             bool operator==(const CryptoBuffer& other) const { return ByteBuffer::operator==(other); }
             bool operator!=(const CryptoBuffer& other) const { return ByteBuffer::operator!=(other); }
 

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

@@ -36,11 +36,8 @@ namespace Aws
 
                 if (m_cipher.Encrypt(toEncrypt, resultBuffer))
                 {
-                    CryptoBuffer result{resultBuffer.buffer, resultBuffer.len};
-                    Crt::ByteBufDelete(resultBuffer);
-                    return result;
+                    return resultBuffer;
                 }
-                Crt::ByteBufDelete(resultBuffer);
                 return {0};
             }
 
@@ -52,11 +49,8 @@ namespace Aws
                 {
                     auto tagCur = m_cipher.GetTag();
                     m_tag = CryptoBuffer(tagCur.ptr, tagCur.len);
-                    CryptoBuffer result{resultBuffer.buffer, resultBuffer.len};
-                    Crt::ByteBufDelete(resultBuffer);
-                    return result;
+                    return resultBuffer;
                 }
-                Crt::ByteBufDelete(resultBuffer);
                 return {0};
             }
 
@@ -69,11 +63,8 @@ namespace Aws
 
                 if (m_cipher.Decrypt(toDecrypt, resultBuffer))
                 {
-                    CryptoBuffer result{resultBuffer.buffer, resultBuffer.len};
-                    Crt::ByteBufDelete(resultBuffer);
-                    return result;
+                    return resultBuffer;
                 }
-                Crt::ByteBufDelete(resultBuffer);
                 return (0);
             }
 
@@ -83,11 +74,8 @@ namespace Aws
 
                 if (m_cipher.FinalizeDecryption(resultBuffer))
                 {
-                    CryptoBuffer result{resultBuffer.buffer, resultBuffer.len};
-                    Crt::ByteBufDelete(resultBuffer);
-                    return result;
+                    return resultBuffer;
                 }
-                Crt::ByteBufDelete(resultBuffer);
                 return {0};
             }