Merge pull request #47 from awslabs/FB-CryptoSizet

32 bit build fixes

Author: bretambrose

aws-cpp-sdk-s3-encryption-integration-tests/LiveClientTests.cpp

@@ -148,7 +148,7 @@ TEST_F(LiveClientTest, TestEOMode)
     getObjectResult = StandardClient->GetObject(getUnencryptedObjectRequest);
 
     EXPECT_TRUE(getObjectResult.IsSuccess());
-    ByteBuffer rawData(getObjectResult.GetResult().GetContentLength());
+    ByteBuffer rawData(static_cast< size_t >(getObjectResult.GetResult().GetContentLength()));
     memset(rawData.GetUnderlyingData(), 0, rawData.GetLength());
     getObjectResult.GetResult().GetBody().read((char*)rawData.GetUnderlyingData(), rawData.GetLength());
 
@@ -231,7 +231,7 @@ TEST_F(LiveClientTest, TestAEMode)
     EXPECT_TRUE(getObjectResult.IsSuccess());
     EXPECT_EQ((cryptoMaterial.GetCryptoTagLength() / 8) + sizeof(TEST_STRING) - 1, static_cast<size_t>(getObjectResult.GetResult().GetContentLength()));
 
-    ByteBuffer rawData(getObjectResult.GetResult().GetContentLength() - (cryptoMaterial.GetCryptoTagLength() / 8));
+    ByteBuffer rawData(static_cast< size_t >(getObjectResult.GetResult().GetContentLength()) - (cryptoMaterial.GetCryptoTagLength() / 8));
     memset(rawData.GetUnderlyingData(), 0, rawData.GetLength());
     getObjectResult.GetResult().GetBody().read((char*)rawData.GetUnderlyingData(), rawData.GetLength());
 
@@ -312,7 +312,7 @@ TEST_F(LiveClientTest, TestAEModeRangeGet)
     EXPECT_TRUE(getObjectResult.IsSuccess());
     EXPECT_EQ(sizeof(RANGE_GET_TEST_STRING) - 1, static_cast<size_t>(getObjectResult.GetResult().GetContentLength()));
 
-    ByteBuffer rawData(getObjectResult.GetResult().GetContentLength());
+    ByteBuffer rawData(static_cast< size_t >(getObjectResult.GetResult().GetContentLength()));
     memset(rawData.GetUnderlyingData(), 0, rawData.GetLength());
     getObjectResult.GetResult().GetBody().read((char*)rawData.GetUnderlyingData(), rawData.GetLength());
 

aws-cpp-sdk-s3-encryption-tests/CryptoModulesTest.cpp

@@ -155,7 +155,7 @@ namespace
                 return result;
             }
             m_metadata = request.GetMetadata();
-            m_requestContentLength = request.GetContentLength();
+            m_requestContentLength = static_cast< size_t >(request.GetContentLength());
 
             std::shared_ptr<Aws::IOStream> body = request.GetBody();
             Aws::String tempBodyString((Aws::IStreamBufIterator(*body)), Aws::IStreamBufIterator());
@@ -179,7 +179,7 @@ namespace
                 auto bytes = m_requestContentLength;
                 auto rangeBytes = CryptoModule::ParseGetObjectRequestRange(range, bytes);
                 responseStream.GetUnderlyingStream().write((const char*)bodyString.c_str() + rangeBytes.first, rangeBytes.second - rangeBytes.first + 1);
-                written = rangeBytes.second - rangeBytes.first;
+                written = static_cast< size_t >(rangeBytes.second - rangeBytes.first);
             }
             else
             {