Merge pull request #51 from awslabs/NoDepUUID

Removed UUID dependencies and just implemented it manually.

Author: JonathanHenson

CMakeLists.txt

@@ -89,7 +89,7 @@ cmake_policy(SET CMP0056 NEW)
 
 project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX)
 
-# http client, encryption, zlib, uuid
+# http client, encryption, zlib
 include(external_dependencies)
 
 if(COMMAND apply_post_project_platform_settings)

aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp

@@ -46,7 +46,6 @@ TEST(ProfileConfigFileAWSCredentialsProviderTest, TestDefaultConfig)
 
     Aws::String configFileName = ProfileConfigFileAWSCredentialsProvider::GetCredentialsProfileFilename();
     Aws::String tempFileName = configFileName + "_tempMv";
-    std::cout << tempFileName << std::endl;
     Aws::FileSystem::RelocateFileOrDirectory(configFileName.c_str(), tempFileName.c_str());
 
     Aws::OFStream configFile(configFileName.c_str(), Aws::OFStream::out | Aws::OFStream::trunc);

aws-cpp-sdk-core-tests/utils/UUIDTest.cpp

@@ -26,10 +26,12 @@ TEST(UUIDTest, TestPlatformGeneratesUUID)
     for(size_t i = 0u; i < 1000u; ++i)
     {
         UUID uuid = UUID::RandomUUID();
-        Aws::String uuidStr = uuid;
+        Aws::String uuidStr = uuid;        
         ASSERT_EQ(36u, uuidStr.length());
         ByteBuffer rawUUID = uuid;
         ASSERT_EQ(16u, rawUUID.GetLength());
+        ASSERT_EQ(0x40u, 0x40u & rawUUID[6]);
+        ASSERT_EQ(0x80u, 0x80u & rawUUID[8]);
 
         ASSERT_EQ(generatedUUids.end(), generatedUUids.find(uuidStr));
         generatedUUids.insert(uuidStr);

aws-cpp-sdk-core/include/aws/core/VersionConfig.h

@@ -1,16 +1,16 @@
-/*
-  * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License").
-  * You may not use this file except in compliance with the License.
-  * A copy of the License is located at
-  *
-  *  http://aws.amazon.com/apache2.0
-  *
-  * or in the "license" file accompanying this file. This file is distributed
-  * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-  * express or implied. See the License for the specific language governing
-  * permissions and limitations under the License.
-  */
-
-#define AWS_SDK_VERSION_STRING "1.0.35"
+/*
+  * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License").
+  * You may not use this file except in compliance with the License.
+  * A copy of the License is located at
+  *
+  *  http://aws.amazon.com/apache2.0
+  *
+  * or in the "license" file accompanying this file. This file is distributed
+  * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+  * express or implied. See the License for the specific language governing
+  * permissions and limitations under the License.
+  */
+
+#define AWS_SDK_VERSION_STRING "1.0.35"

aws-cpp-sdk-core/nuget/aws-cpp-sdk-core.autopkg

@@ -152,7 +152,6 @@ nuget {
         Libraries += wininet.lib;
         Libraries += bcrypt.lib;
         Libraries += userenv.lib;
-        Libraries += Rpcrt4.lib;
         Libraries += Version.lib;
     }
 }    

aws-cpp-sdk-core/source/platform/android/UUID_Impl.cpp

@@ -16,12 +16,21 @@
 #include <aws/core/utils/UUID.h>
 #include <aws/core/utils/HashingUtils.h>
 #include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/crypto/Factories.h>
+#include <aws/core/utils/crypto/SecureRandom.h>
 #include <iomanip>
 
 namespace Aws
 {
     namespace Utils
     {
+        static const size_t VERSION_LOCATION = 0x06u;
+        static const size_t VARIANT_LOCATION = 0x08u;
+        static const unsigned char VERSION = 0x40u;
+        static const unsigned char VERSION_MASK = 0x0Fu;
+        static const unsigned char VARIANT = 0x80u;
+        static const unsigned char VARIANT_MASK = 0x3Fu;
+
         void WriteRangeOutToStream(Aws::StringStream& ss, unsigned char* toWrite, size_t min, size_t max)
         {
             for (size_t i = min; i < max; ++i)
@@ -66,6 +75,24 @@ namespace Aws
             WriteRangeOutToStream(ss, m_uuid, 10, 16);
 
             return ss.str();
-        }        
+        } 
+        
+        UUID UUID::RandomUUID()
+        {
+            auto secureRandom = Crypto::CreateSecureRandomBytesImplementation();
+            assert(secureRandom);
+
+            unsigned char randomBytes[UUID_BINARY_SIZE];
+            memset(randomBytes, 0, UUID_BINARY_SIZE);
+            secureRandom->GetBytes(randomBytes, UUID_BINARY_SIZE);
+            //Set version bits to 0100
+            //https://tools.ietf.org/html/rfc4122#section-4.1.3
+            randomBytes[VERSION_LOCATION] = (randomBytes[VERSION_LOCATION] & VERSION_MASK) | VERSION;
+            //set variant bits to 10
+            //https://tools.ietf.org/html/rfc4122#section-4.1.1
+            randomBytes[VARIANT_LOCATION] = (randomBytes[VARIANT_LOCATION] & VARIANT_MASK) | VARIANT;
+
+            return UUID(randomBytes);
+        }
     }
 }

aws-cpp-sdk-core/source/platform/linux-shared/UUID_Impl.cpp

@@ -17,6 +17,7 @@
 #include <aws/core/utils/crypto/Factories.h>
 #include <aws/core/utils/crypto/Hash.h>
 #include <aws/core/utils/crypto/HMAC.h>
+#include <atomic>
 
 #if ENABLE_BCRYPT_ENCRYPTION
     #include <aws/core/utils/crypto/bcrypt/CryptoImpl.h>
@@ -49,6 +50,7 @@ static std::shared_ptr<SymmetricCipherFactory> s_AES_GCMFactory(nullptr);
 static std::shared_ptr<SymmetricCipherFactory> s_AES_KeyWrapFactory(nullptr);
 
 static std::shared_ptr<SecureRandomFactory> s_SecureRandomFactory(nullptr);
+static std::shared_ptr<SecureRandomBytes> s_SecureRandom(nullptr);
 
 static bool s_InitCleanupOpenSSLFlag(false);
 
@@ -691,6 +693,7 @@ void Aws::Utils::Crypto::CleanupCrypto()
 
     if(s_SecureRandomFactory)
     {
+        s_SecureRandom = nullptr;
         s_SecureRandomFactory->CleanupStaticState();
         s_SecureRandomFactory = nullptr;
     }   
@@ -842,5 +845,10 @@ std::shared_ptr<SymmetricCipher> Aws::Utils::Crypto::CreateAES_KeyWrapImplementa
 
 std::shared_ptr<SecureRandomBytes> Aws::Utils::Crypto::CreateSecureRandomBytesImplementation()
 {
-    return s_SecureRandomFactory->CreateImplementation();
+    if (!std::atomic_load(&s_SecureRandom))
+    {        
+        std::atomic_store(&s_SecureRandom, s_SecureRandomFactory->CreateImplementation());    
+    }
+
+    return s_SecureRandom;
 }

aws-cpp-sdk-core/source/platform/windows/UUID_Impl.cpp

@@ -113,23 +113,3 @@ if(NOT NO_HTTP_CLIENT)
 else()
     message(STATUS "You will need to inject an http client implementation before making any http requests!")
 endif()
-
-# UUID headers
-if(NOT PLATFORM_WINDOWS AND NOT PLATFORM_ANDROID AND NOT PLATFORM_CUSTOM)
-    message(STATUS "Finding uuid")
-
-    find_path(UUID_INCLUDE_DIR uuid/uuid.h)
-    if(NOT PLATFORM_APPLE)
-        find_library(UUID_LIBRARIES uuid)
-    endif()
-
-    if("${UUID_INCLUDE_DIR}" STREQUAL "UUID_INCLUDE_DIR-NOTFOUND" OR "${UUID_LIBRARIES}" STREQUAL "UUID_LIBRARIES-NOTFOUND")
-        message(FATAL_ERROR "Could not find uuid components")
-    else()
-        message(STATUS "  Uuid include directory: ${UUID_INCLUDE_DIR}")
-        message(STATUS "  Uuid library: ${UUID_LIBRARIES}")
-    endif()
-
-    include_directories(${UUID_INCLUDE_DIR})
-endif()
-