more PR revisions

Author: sbiscigl

src/aws-cpp-sdk-core/include/aws/core/utils/crypto/crt/CRTHash.h

@@ -23,6 +23,7 @@ namespace Aws
                 CRTHash &operator=(const CRTHash &) = delete;
                 CRTHash(CRTHash &&) = default;
                 CRTHash &operator=(CRTHash &&) = default;
+                explicit CRTHash(Crt::Crypto::Hash &&);
 
                 HashResult Calculate(const String &str) override;
 
@@ -31,12 +32,8 @@ namespace Aws
                 void Update(unsigned char *string, size_t bufferSize) override;
 
                 HashResult GetHash() override;
-
-                // @private but made public for the sake of make_shared.
-                CRTHash(Crt::Crypto::Hash &&);
             private:
                 Crt::Crypto::Hash m_hash;
-
             };
         }
     }

src/aws-cpp-sdk-core/source/utils/HashingUtils.cpp

@@ -22,19 +22,20 @@ using namespace Aws::Utils;
 using namespace Aws::Utils::Base64;
 using namespace Aws::Utils::Crypto;
 
+// internal buffers are fixed-size arrays, so this is harmless memory-management wise
+static Aws::Utils::Base64::Base64 s_base64;
+
 // Aws Glacier Tree Hash calculates hash value for each 1MB data
 const static size_t TREE_HASH_ONE_MB = 1024 * 1024;
 
 Aws::String HashingUtils::Base64Encode(const ByteBuffer& message)
 {
-    Base64::Base64 base64Encoder;
-    return base64Encoder.Encode(message);
+    return s_base64.Encode(message);
 }
 
 ByteBuffer HashingUtils::Base64Decode(const Aws::String& encodedMessage)
 {
-    Base64::Base64 base64Decoder;
-    return base64Decoder.Decode(encodedMessage);
+    return s_base64.Decode(encodedMessage);
 }
 
 ByteBuffer HashingUtils::CalculateSHA256HMAC(const ByteBuffer& toSign, const ByteBuffer& secret)

src/aws-cpp-sdk-core/source/utils/crypto/CryptoBuf.cpp

@@ -295,7 +295,7 @@ namespace Aws
                         //the assumption here is that tellp() will always be 0 or >= 16 bytes. The block offset should only
                         //be the offset of the first block read.
                         size_t len = cryptoBuf.GetLength();
-                        size_t blockOffset = m_stream.tellp() > m_blockOffset ? 0 : m_blockOffset;
+                        size_t blockOffset = m_stream.good() && m_stream.tellp() > m_blockOffset ? 0 : m_blockOffset;
                         if (len > blockOffset)
                         {
                             m_stream.write(reinterpret_cast<char*>(cryptoBuf.GetUnderlyingData() + blockOffset), len - blockOffset);

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

@@ -10,6 +10,8 @@ namespace Aws
     {
         namespace Crypto
         {
+            static const char CRT_HASH_LOG_TAG[] = "CRTHash";
+
             CRTHash::CRTHash(Crt::Crypto::Hash &&toSeat) : m_hash(std::move(toSeat)) {}
 
             HashResult Crypto::CRTHash::Calculate(const String &str)
@@ -28,7 +30,17 @@ namespace Aws
             }
 
             Crypto::HashResult Crypto::CRTHash::Calculate(IStream &stream) {
+                if (stream.bad())
+                {
+                    AWS_LOGSTREAM_ERROR(CRT_HASH_LOG_TAG, "CRT Hash Update Failed stream in valid state")
+                    return false;
+                }
                 stream.seekg(0, stream.beg);
+                if (stream.bad())
+                {
+                    AWS_LOGSTREAM_ERROR(CRT_HASH_LOG_TAG, "CRT Hash Update Failed stream in valid state")
+                    return false;
+                }
                 const auto result = [this, &stream]() -> HashResult {
                     uint8_t streamBuffer[Aws::Utils::Crypto::Hash::INTERNAL_HASH_STREAM_BUFFER_SIZE];
                     while (stream.good())
@@ -40,7 +52,7 @@ namespace Aws
                             auto curToHash = Crt::ByteCursorFromArray(streamBuffer, static_cast<size_t>(bytesRead));
                             if (!m_hash.Update(curToHash))
                             {
-                                // log here.
+                                AWS_LOGSTREAM_ERROR(CRT_HASH_LOG_TAG, "CRT Hash Update Failed with error code: " << m_hash.LastError())
                                 return false;
                             }
                         }
@@ -55,7 +67,7 @@ namespace Aws
                     auto outBuffer = Crt::ByteBufFromEmptyArray(resultBuffer.GetUnderlyingData(), resultBuffer.GetSize());
                     if (!m_hash.Digest(outBuffer))
                     {
-                        //log
+                        AWS_LOGSTREAM_ERROR(CRT_HASH_LOG_TAG, "CRT Hash Digest Failed with error code: " << m_hash.LastError())
                         return false;
                     }
                     resultBuffer.SetLength(m_hash.DigestSize());
@@ -77,7 +89,7 @@ namespace Aws
                 auto outBuffer = Crt::ByteBufFromEmptyArray(resultBuffer.GetUnderlyingData(), resultBuffer.GetSize());
                 if (!m_hash.Digest(outBuffer))
                 {
-                    //log
+                    AWS_LOGSTREAM_ERROR(CRT_HASH_LOG_TAG, "CRT Hash Digest Failed with error code: " << m_hash.LastError())
                     return false;
                 }
 

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

@@ -11,11 +11,14 @@ namespace Aws
     {
         namespace Crypto
         {
+            static const char SECURE_RANDOM_BYTES_LOG_TAG[] = "CRTSecureRandomBytes";
+
             void CRTSecureRandomBytes::GetBytes(unsigned char *buffer, std::size_t bufferSize)
             {
                 auto outputBuf = Crt::ByteBufFromEmptyArray(buffer, bufferSize);
                 if (!Crt::Crypto::GenerateRandomBytes(outputBuf, bufferSize))
                 {
+                    AWS_LOGSTREAM_ERROR(SECURE_RANDOM_BYTES_LOG_TAG, "CRT Generate Randomg Bytes Failed")
                     AWS_UNREACHABLE();
                 }
             }