aws-crt 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c3578992e03398bdf9bd93ddf82e7ce0405d4f1dde997cd1a524a9c67df6282
-  data.tar.gz: 0dfd9eecda72388ef0196c7f64b8a669ab747e3d6517aa7aa165d7e4d2b77b71
+  metadata.gz: 1f5c90e78f085bbe59a060f601e5b9fbd850268f5d1bed4d4569373510a4be1f
+  data.tar.gz: 9325c86d1ca82628b874fcb1be8513d35f5a3bde059945302ea9ed8f70fc7c22
 SHA512:
-  metadata.gz: 8a24cb9ef29ec68853c2209c194b2aeedda14d97197da7f3f99d0d81c77ffddf2073f916133c439a961d774a4b1bef265dc7c4f2ea7efd579455d41b8687041d
-  data.tar.gz: 0f364196764d0405e6304d6320362971d927c71e249083e1b3d0bbba783a543eb1f9c860adf207cdba8c40cbbc75d2a539ae51c543bc244e3c2d1f35c9cec9ea
+  metadata.gz: bb264d195e9ce8806e2db616ae5e7d0fb50cfeca3d8b96342ff96619de75d2bef1b6741d5159eac457501ffa0fd23e8071ed13ad9aebecde35c8b812517435e2
+  data.tar.gz: 4ed5d726e744b37a41749ba0cc7a62260d57b79b9933c076bc0268033a76c154cc999ddb50a4b34c1e15820a7d030d73b08d8fc70b01b144b767c4f307780c08

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+0.1.6 (2022-08-12)
+------------------
+
+* Issue - Update to the latest aws-crt-ffi.
+
 0.1.5 (2022-04-05)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/aws-crt-ffi/CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1)
 project(aws-crt-ffi C)
 message(STATUS "CMake ${CMAKE_VERSION}")
 
+option(BUILD_DEPS "Builds aws common runtime dependencies as part of build. Turn off if you want to control your dependency chain." ON)
 option(BUILD_SHARED_LIBS "Build shared library for FFI: default: ON" ON)
 
 if (POLICY CMP0069)
@@ -26,62 +27,69 @@ string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${A
 # Append that generated list to the module search path
 list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/crt/aws-c-common/cmake")
 
-include(AwsFindPackage)
+if (BUILD_DEPS)
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/crt/aws-c-common/cmake")
 
-set(IN_SOURCE_BUILD ON)
-set(SEARCH_LIBCRYPTO OFF CACHE BOOL "Let S2N use libcrypto from AWS-LC.")
+    include(AwsFindPackage)
 
-# Don't compile tests in subdirectories.
-# Turn off using `option` instead of `set`, or CTest will declare
-# it as an option later and override the existing variable.
-set(BUILD_TESTING OFF)
+    set(IN_SOURCE_BUILD ON)
+    set(SEARCH_LIBCRYPTO OFF CACHE BOOL "Let S2N use libcrypto from AWS-LC.")
 
-# Disable BUILD_SHARED_LIBS for all CRT libs
-set(SHARED_FFI_LIB ${BUILD_SHARED_LIBS})
-set(BUILD_SHARED_LIBS OFF)
+    # Don't compile tests in subdirectories.
+    # Turn off using `option` instead of `set`, or CTest will declare
+    # it as an option later and override the existing variable.
+    set(BUILD_TESTING OFF)
 
-# CRT Libraries
-add_subdirectory(crt/aws-c-common)
-if (UNIX AND NOT APPLE)
-    if (NOT USE_OPENSSL)
-        if (NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) AND
-            NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l))
-            set(DISABLE_PERL ON)
-        endif()
-        set(DISABLE_GO ON)
-        set(SEARCH_LIBCRYPTO OFF)
-        set(BUILD_LIBSSL OFF)
-        add_subdirectory(crt/aws-lc)
-    else()
-        set(SEARCH_LIBCRYPTO ON)
-        # Find the system libcrypto and propagate its location to s2n's find script
-        find_package(OpenSSL REQUIRED)
-        set(LibCrypto_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR})
-        set(LibCrypto_LIBRARY ${OPENSSL_CRYPTO_LIBRARY})
-        if (LibCrypto_LIBRARY MATCHES ".so$")
-            set(LibCrypto_SHARED_LIBRARY ${LibCrypto_LIBRARY})
+    # Disable BUILD_SHARED_LIBS for all CRT libs
+    set(SHARED_FFI_LIB ${BUILD_SHARED_LIBS})
+    set(BUILD_SHARED_LIBS OFF)
+
+    # CRT Libraries
+    add_subdirectory(crt/aws-c-common)
+    if (UNIX AND NOT APPLE)
+        if (NOT USE_OPENSSL)
+            if (NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) AND
+                NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l))
+                set(DISABLE_PERL ON)
+            endif()
+            set(DISABLE_GO ON)
+            set(SEARCH_LIBCRYPTO OFF)
+            set(BUILD_LIBSSL OFF)
+            add_subdirectory(crt/aws-lc)
         else()
-            set(LibCrypto_STATIC_LIBRARY ${LibCrypto_LIBRARY})
+            set(SEARCH_LIBCRYPTO ON)
+            # Find the system libcrypto and propagate its location to s2n's find script
+            find_package(OpenSSL REQUIRED)
+            set(LibCrypto_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR})
+            set(LibCrypto_LIBRARY ${OPENSSL_CRYPTO_LIBRARY})
+            if (LibCrypto_LIBRARY MATCHES ".so$")
+                set(LibCrypto_SHARED_LIBRARY ${LibCrypto_LIBRARY})
+            else()
+                set(LibCrypto_STATIC_LIBRARY ${LibCrypto_LIBRARY})
+            endif()
         endif()
+        add_subdirectory(crt/s2n)
     endif()
-    add_subdirectory(crt/s2n)
+    add_subdirectory(crt/aws-c-sdkutils)
+    add_subdirectory(crt/aws-c-io)
+    add_subdirectory(crt/aws-c-cal)
+    add_subdirectory(crt/aws-c-compression)
+    add_subdirectory(crt/aws-c-http)
+    add_subdirectory(crt/aws-c-auth)
+    add_subdirectory(crt/aws-c-event-stream)
+    add_subdirectory(crt/aws-checksums)
+else()
+    include(AwsFindPackage)
+    set(IN_SOURCE_BUILD OFF)
 endif()
-add_subdirectory(crt/aws-c-sdkutils)
-add_subdirectory(crt/aws-c-io)
-add_subdirectory(crt/aws-c-cal)
-add_subdirectory(crt/aws-c-compression)
-add_subdirectory(crt/aws-c-http)
-add_subdirectory(crt/aws-c-auth)
-add_subdirectory(crt/aws-c-event-stream)
-add_subdirectory(crt/aws-checksums)
 
 # Restore BUILD_SHARED_LIBS for this project
 set(BUILD_SHARED_LIBS ${SHARED_FFI_LIB})
 
 include(AwsCFlags)
 include(AwsSharedLibSetup)
+include(AwsSanitizers)
 
 file(GLOB AWS_CRT_SRC "src/*.h" "src/*.c")
 

data/aws-crt-ffi/crt/aws-c-auth/CMakeLists.txt

@@ -45,18 +45,10 @@ file(GLOB AWS_AUTH_PRIVATE_HEADERS
         "include/aws/auth/private/*.h"
         )
 
-file(GLOB AWS_AUTH_EXTERNAL_HEADERS
-        "include/aws/auth/external/*.h"
-        )
-
 file(GLOB AWS_AUTH_ROOT_SRC
         "source/*.c"
         )
 
-file(GLOB AWS_AUTH_EXTERNAL_SRC
-        "source/external/*.c"
-        )
-
 if (WIN32)
     if (MSVC)
         source_group("Header Files\\aws\\auth" FILES ${AWS_AUTH_HEADERS})
@@ -74,12 +66,10 @@ endif()
 file(GLOB AUTH_HEADERS
         ${AWS_AUTH_ROOT_HEADERS}
         ${AWS_AUTH_PRIVATE_HEADERS}
-        ${AWS_AUTH_EXTERNAL_HEADERS}
         )
 
 file(GLOB AUTH_SRC
         ${AWS_AUTH_ROOT_SRC}
-        ${AWS_AUTH_EXTERNAL_SRC}
         )
 
 add_library(${PROJECT_NAME} ${LIBTYPE} ${AUTH_HEADERS} ${AUTH_SRC})

data/aws-crt-ffi/crt/aws-c-auth/include/aws/auth/credentials.h

@@ -790,8 +790,9 @@ struct aws_credentials_provider *aws_credentials_provider_new_delegate(
  *
  * (1) Environment
  * (2) Profile
- * (3) (conditional, off by default) ECS
- * (4) (conditional, on by default) EC2 Instance Metadata
+ * (3) STS web identity
+ * (4) (conditional, off by default) ECS
+ * (5) (conditional, on by default) EC2 Instance Metadata
  *
  * Support for environmental control of the default provider chain is not yet
  * implemented.

data/aws-crt-ffi/crt/aws-c-auth/include/aws/auth/private/credentials_utils.h

@@ -8,7 +8,7 @@
 
 #include <aws/auth/auth.h>
 #include <aws/auth/credentials.h>
-#include <aws/auth/external/cJSON.h>
+#include <aws/common/json.h>
 #include <aws/http/connection_manager.h>
 
 struct aws_http_connection;
@@ -135,13 +135,13 @@ struct aws_parse_credentials_from_json_doc_options {
  * performe a case insensitive search.
  */
 AWS_AUTH_API
-struct aws_credentials *aws_parse_credentials_from_cjson_object(
+struct aws_credentials *aws_parse_credentials_from_aws_json_object(
     struct aws_allocator *allocator,
-    struct cJSON *document_root,
+    struct aws_json_value *document_root,
     const struct aws_parse_credentials_from_json_doc_options *options);
 
 /**
- * This API is similar to aws_parse_credentials_from_cjson_object,
+ * This API is similar to aws_parse_credentials_from_aws_json_object,
  * except it accpets a char buffer json document as it's input.
  */
 AWS_AUTH_API

data/aws-crt-ffi/crt/aws-c-auth/source/auth.c

@@ -4,7 +4,6 @@
  */
 #include <aws/auth/auth.h>
 
-#include <aws/auth/external/cJSON.h>
 #include <aws/auth/private/aws_signing.h>
 
 #include <aws/cal/cal.h>
@@ -14,6 +13,7 @@
 #include <aws/sdkutils/sdkutils.h>
 
 #include <aws/common/error.h>
+#include <aws/common/json.h>
 
 #define AWS_DEFINE_ERROR_INFO_AUTH(CODE, STR) AWS_DEFINE_ERROR_INFO(CODE, STR, "aws-c-auth")
 
@@ -114,14 +114,6 @@ static struct aws_log_subject_info_list s_auth_log_subject_list = {
 static bool s_library_initialized = false;
 static struct aws_allocator *s_library_allocator = NULL;
 
-static void *s_cJSONAlloc(size_t sz) {
-    return aws_mem_acquire(s_library_allocator, sz);
-}
-
-static void s_cJSONFree(void *ptr) {
-    aws_mem_release(s_library_allocator, ptr);
-}
-
 void aws_auth_library_init(struct aws_allocator *allocator) {
     if (s_library_initialized) {
         return;
@@ -141,11 +133,6 @@ void aws_auth_library_init(struct aws_allocator *allocator) {
     aws_register_log_subject_info_list(&s_auth_log_subject_list);
 
     AWS_FATAL_ASSERT(aws_signing_init_signing_tables(allocator) == AWS_OP_SUCCESS);
-
-    struct cJSON_Hooks allocation_hooks = {.malloc_fn = s_cJSONAlloc, .free_fn = s_cJSONFree};
-
-    cJSON_InitHooks(&allocation_hooks);
-
     s_library_initialized = true;
 }