aws-crt - npm Package Compare versions

Comparing version 1.0.0 to 1.0.2

aws-common-runtime/aws-c-auth/CMakeLists.txt

@@ -31,4 +31,6 @@
 include(AwsCFlags)
+include(AwsCheckHeaders)
 include(AwsSharedLibSetup)
 include(AwsSanitizers)
+include(AwsFindPackage)
 
@@ -84,34 +86,27 @@ option(BUILD_RELOCATABLE_BINARIES
 
-add_library(${CMAKE_PROJECT_NAME} ${LIBTYPE} ${AUTH_HEADERS} ${AUTH_SRC})
-aws_set_common_properties(${CMAKE_PROJECT_NAME})
-aws_prepare_symbol_visibility_args(${CMAKE_PROJECT_NAME} "AWS_AUTH")
+add_library(${PROJECT_NAME} ${LIBTYPE} ${AUTH_HEADERS} ${AUTH_SRC})
+aws_set_common_properties(${PROJECT_NAME})
+aws_prepare_symbol_visibility_args(${PROJECT_NAME} "AWS_AUTH")
+aws_check_headers(${PROJECT_NAME} ${AUTH_HEADERS})
 
-aws_add_sanitizers(${CMAKE_PROJECT_NAME})
+aws_add_sanitizers(${PROJECT_NAME})
 
 # We are not ABI stable yet
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0)
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0)
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
 
-if (BUILD_JNI_BINDINGS)
-    set(BUILD_RELOCATABLE_BINARIES ON)
-    find_package(JNI)
-    include_directories(${JNI_INCLUDE_DIRS})
-    set(PLATFORM_LIBS ${PLATFORM_LIBS} ${JNI_LIBRARIES})
-    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE "-DBUILD_JNI_BINDINGS")
-endif ()
-
 if (BUILD_RELOCATABLE_BINARIES)
-    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE "-DCOMPAT_MODE")
+    target_compile_definitions(${PROJECT_NAME} PRIVATE "-DCOMPAT_MODE")
 endif()
 
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
+target_include_directories(${PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>)
 
-find_package(aws-c-cal REQUIRED)
-find_package(aws-c-http REQUIRED)
+aws_use_package(aws-c-cal)
+aws_use_package(aws-c-http)
 
-target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC AWS::aws-c-http AWS::aws-c-cal ${PLATFORM_LIBS})
+target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS} ${PLATFORM_LIBS})
 
-aws_prepare_shared_lib_exports(${CMAKE_PROJECT_NAME})
+aws_prepare_shared_lib_exports(${PROJECT_NAME})
 
@@ -126,13 +121,13 @@ install(FILES ${AWS_AUTH_ROOT_HEADERS} DESTINATION "include/aws/auth" COMPONENT Development)
 
-install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
-        DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
+install(EXPORT "${PROJECT_NAME}-targets"
+        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
         NAMESPACE AWS::
         COMPONENT Development)
 
-configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
+configure_file("cmake/${PROJECT_NAME}-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
         @ONLY)
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
-        DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
         COMPONENT Development)
@@ -139,0 +134,0 @@

aws-common-runtime/aws-c-cal/CMakeLists.txt

@@ -47,2 +47,3 @@ # Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 include(AwsSanitizers)
+include(AwsFindPackage)
 
@@ -103,21 +104,21 @@ file(GLOB AWS_CAL_HEADERS
 
-add_library(${CMAKE_PROJECT_NAME} ${CAL_SRC})
-aws_set_common_properties(${CMAKE_PROJECT_NAME} NO_WEXTRA)
-aws_prepare_symbol_visibility_args(${CMAKE_PROJECT_NAME} "AWS_CAL")
-aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
+add_library(${PROJECT_NAME} ${CAL_SRC})
+aws_set_common_properties(${PROJECT_NAME} NO_WEXTRA)
+aws_prepare_symbol_visibility_args(${PROJECT_NAME} "AWS_CAL")
+aws_add_sanitizers(${PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
 
-find_package(aws-c-common REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC AWS::aws-c-common ${PLATFORM_LIBS})
+aws_use_package(aws-c-common)
+target_link_libraries(${PROJECT_NAME} PUBLIC AWS::aws-c-common ${PLATFORM_LIBS} ${DEP_AWS_LIBS})
 
 if (BYO_CRYPTO)
-    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -DAWS_BYO_CRYPTO)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE -DAWS_BYO_CRYPTO)
 elseif (NOT WIN32 AND NOT APPLE)
-    target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE $<TARGET_PROPERTY:LibCrypto::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
+    target_include_directories(${PROJECT_NAME} PRIVATE $<TARGET_PROPERTY:LibCrypto::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
 endif()
 
 # Our ABI is not yet stable
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0)
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0)
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
 
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
+target_include_directories(${PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -127,9 +128,9 @@ $<INSTALL_INTERFACE:include>)
 # but at build time we need to explicitly include this here
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
+target_include_directories(${PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>)
 
-aws_prepare_shared_lib_exports(${CMAKE_PROJECT_NAME})
+aws_prepare_shared_lib_exports(${PROJECT_NAME})
 
-configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
-  "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
+configure_file("cmake/${PROJECT_NAME}-config.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
   @ONLY)
@@ -145,9 +146,9 @@
 
-install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
-    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
+install(EXPORT "${PROJECT_NAME}-targets"
+    DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
     NAMESPACE AWS::
     COMPONENT Development)
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
-    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake"
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+    DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake"
     COMPONENT Development)
@@ -154,0 +155,0 @@

aws-common-runtime/aws-c-common/CMakeLists.txt

@@ -25,2 +25,3 @@ # Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 include(AwsCFlags)
+include(AwsCheckHeaders)
 include(AwsSharedLibSetup)
@@ -30,2 +31,3 @@ include(AwsFeatureTests)
 include(AwsSIMD)
+include(CTest)
 
@@ -55,3 +57,2 @@ set(GENERATED_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
 
-option(PERFORM_HEADER_CHECK "Performs compile-time checks that each header can be included independently. Requires a C++ compiler.")
 option(AWS_NUM_CPU_CORES "Number of CPU cores of the target machine. Useful when cross-compiling." 0)
@@ -117,12 +118,10 @@
 
-if (PERFORM_HEADER_CHECK)
-    set(HEADERS_TO_CHECK ${AWS_COMMON_HEADERS} ${AWS_TEST_HEADERS} ${AWS_COMMON_OS_HEADERS})
-    add_subdirectory(cmake/header-tester)
-endif()
 
-add_library(${CMAKE_PROJECT_NAME} ${COMMON_SRC})
-aws_set_common_properties(${CMAKE_PROJECT_NAME} NO_WEXTRA)
-aws_prepare_symbol_visibility_args(${CMAKE_PROJECT_NAME} "AWS_COMMON")
-target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_CFLAGS})
+add_library(${PROJECT_NAME} ${COMMON_SRC})
+aws_set_common_properties(${PROJECT_NAME} NO_WEXTRA)
+aws_prepare_symbol_visibility_args(${PROJECT_NAME} "AWS_COMMON")
+target_compile_options(${PROJECT_NAME} PUBLIC ${PLATFORM_CFLAGS})
 
+aws_check_headers(${PROJECT_NAME} ${AWS_COMMON_HEADERS} ${AWS_TEST_HEADERS} ${AWS_COMMON_OS_HEADERS})
+
 #apple source already includes the definitions we want, and setting this posix source
@@ -132,18 +131,18 @@ #version causes it to revert to an older version. So don't turn it on there, we don't need it.
     #this only gets applied to aws-c-common (not its consumers).
-    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
 endif()
 
-aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
-target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
-target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE ${PLATFORM_DEFINES})
+aws_add_sanitizers(${PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
+target_link_libraries(${PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
+target_compile_definitions(${PROJECT_NAME} PRIVATE ${PLATFORM_DEFINES})
 
 if (AWS_NUM_CPU_CORES)
-    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -DAWS_NUM_CPU_CORES=${AWS_NUM_CPU_CORES})
+    target_compile_definitions(${PROJECT_NAME} PRIVATE -DAWS_NUM_CPU_CORES=${AWS_NUM_CPU_CORES})
 endif()
 
 # Our ABI is not yet stable
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0)
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0)
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
 
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
+target_include_directories(${PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -153,7 +152,7 @@ $<INSTALL_INTERFACE:include>)
 # but at build time we need to explicitly include this here
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
+target_include_directories(${PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>)
 
 # Enable SIMD encoder if the compiler supports the right features
-simd_add_definitions(${CMAKE_PROJECT_NAME})
+simd_add_definitions(${PROJECT_NAME})
 
@@ -165,5 +164,5 @@ if (HAVE_MAY_I_USE OR HAVE_BUILTIN_CPU_SUPPORTS OR HAVE_MSVC_CPUIDEX)
 if (HAVE_AVX2_INTRINSICS AND HAVE_SIMD_CPUID)
-    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -DUSE_SIMD_ENCODING)
-    target_sources(${CMAKE_PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/source/arch/cpuid.c")
-    simd_add_source_avx2(${CMAKE_PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/source/arch/encoding_avx2.c")
+    target_compile_definitions(${PROJECT_NAME} PRIVATE -DUSE_SIMD_ENCODING)
+    target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/source/arch/cpuid.c")
+    simd_add_source_avx2(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/source/arch/encoding_avx2.c")
     message(STATUS "Building SIMD base64 decoder")
@@ -202,6 +201,6 @@ endif()
 
-aws_prepare_shared_lib_exports(${CMAKE_PROJECT_NAME})
+aws_prepare_shared_lib_exports(${PROJECT_NAME})
 
-configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
-  "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
+configure_file("cmake/${PROJECT_NAME}-config.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
   @ONLY)
@@ -215,9 +214,9 @@
 
-install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
-    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}"
+install(EXPORT "${PROJECT_NAME}-targets"
+    DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
     NAMESPACE AWS::
     COMPONENT Development)
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
-    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake"
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+    DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake"
     COMPONENT Development)
@@ -227,2 +226,3 @@
     "cmake/AwsCFlags.cmake"
+    "cmake/AwsCheckHeaders.cmake"
     "cmake/AwsSharedLibSetup.cmake"
@@ -233,2 +233,3 @@ "cmake/AwsTestHarness.cmake"
     "cmake/AwsSIMD.cmake"
+    "cmake/AwsFindPackage.cmake"
     )
@@ -246,3 +247,2 @@
 if (NOT CMAKE_CROSSCOMPILING)
-    include(CTest)
     if (BUILD_TESTING)
@@ -249,0 +249,0 @@ add_subdirectory(tests)

aws-common-runtime/aws-c-http/CMakeLists.txt

@@ -34,2 +34,3 @@ cmake_minimum_required(VERSION 3.1)
 include(CheckCCompilerFlag)
+include(AwsFindPackage)
 
@@ -57,20 +58,20 @@ file(GLOB AWS_HTTP_HEADERS
 
-add_library(${CMAKE_PROJECT_NAME} ${HTTP_HEADERS} ${HTTP_SRC})
-aws_set_common_properties(${CMAKE_PROJECT_NAME})
-aws_prepare_symbol_visibility_args(${CMAKE_PROJECT_NAME} "AWS_HTTP")
-aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
+add_library(${PROJECT_NAME} ${HTTP_HEADERS} ${HTTP_SRC})
+aws_set_common_properties(${PROJECT_NAME})
+aws_prepare_symbol_visibility_args(${PROJECT_NAME} "AWS_HTTP")
+aws_add_sanitizers(${PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
 
 # We are not ABI stable yet
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0)
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0)
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
 
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
+target_include_directories(${PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>)
 
-find_package(aws-c-io REQUIRED)
-find_package(aws-c-compression REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC AWS::aws-c-io AWS::aws-c-compression)
+aws_use_package(aws-c-io)
+aws_use_package(aws-c-compression)
+target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
 
-aws_prepare_shared_lib_exports(${CMAKE_PROJECT_NAME})
+aws_prepare_shared_lib_exports(${PROJECT_NAME})
 
@@ -85,18 +86,20 @@ install(FILES ${AWS_HTTP_HEADERS} DESTINATION "include/aws/http")
 
-install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
-        DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
+install(EXPORT "${PROJECT_NAME}-targets"
+        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
         NAMESPACE AWS::
         COMPONENT Development)
 
-configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
+configure_file("cmake/${PROJECT_NAME}-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
         @ONLY)
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
-        DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
         COMPONENT Development)
 
 include(CTest)
-add_subdirectory(tests)
+if (BUILD_TESTING)
+    add_subdirectory(tests)
+endif()
 
 add_subdirectory(bin/elasticurl)

aws-common-runtime/aws-c-io/CMakeLists.txt

@@ -31,4 +31,7 @@
 include(AwsCFlags)
+include(AwsCheckHeaders)
 include(AwsSharedLibSetup)
 include(AwsSanitizers)
+include(AwsFindPackage)
+include(CTest)
 
@@ -156,4 +159,4 @@ option(BUILD_RELOCATABLE_BINARIES
                 )
-        find_package(s2n REQUIRED)
-        set(PLATFORM_LIBS ${PlATFORM_LIBS} AWS::s2n)
+
+    	aws_use_package(s2n)
     endif ()
@@ -174,34 +177,27 @@ endif ()
 
-add_library(${CMAKE_PROJECT_NAME} ${LIBTYPE} ${IO_HEADERS} ${IO_SRC})
-aws_set_common_properties(${CMAKE_PROJECT_NAME})
-aws_prepare_symbol_visibility_args(${CMAKE_PROJECT_NAME} "AWS_IO")
+add_library(${PROJECT_NAME} ${LIBTYPE} ${IO_HEADERS} ${IO_SRC})
+aws_set_common_properties(${PROJECT_NAME})
+aws_prepare_symbol_visibility_args(${PROJECT_NAME} "AWS_IO")
+aws_check_headers(${PROJECT_NAME} ${IO_HEADERS})
 
-aws_add_sanitizers(${CMAKE_PROJECT_NAME})
+aws_add_sanitizers(${PROJECT_NAME})
 
 # We are not ABI stable yet
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0)
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0)
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
 
-target_compile_definitions(${CMAKE_PROJECT_NAME} PUBLIC "-DAWS_USE_${EVENT_LOOP_DEFINE}")
+target_compile_definitions(${PROJECT_NAME} PUBLIC "-DAWS_USE_${EVENT_LOOP_DEFINE}")
 
-if (BUILD_JNI_BINDINGS)
-    set(BUILD_RELOCATABLE_BINARIES ON)
-    find_package(JNI)
-    include_directories(${JNI_INCLUDE_DIRS})
-    set(PLATFORM_LIBS ${PLATFORM_LIBS} ${JNI_LIBRARIES})
-    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE "-DBUILD_JNI_BINDINGS")
-endif ()
-
 if (BUILD_RELOCATABLE_BINARIES)
-    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE "-DCOMPAT_MODE")
+    target_compile_definitions(${PROJECT_NAME} PRIVATE "-DCOMPAT_MODE")
 endif()
 
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
+target_include_directories(${PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>)
 
-find_package(aws-c-common REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC AWS::aws-c-common ${PLATFORM_LIBS})
+aws_use_package(aws-c-common)
+target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS} ${PLATFORM_LIBS})
 
-aws_prepare_shared_lib_exports(${CMAKE_PROJECT_NAME})
+aws_prepare_shared_lib_exports(${PROJECT_NAME})
 
@@ -217,18 +213,21 @@ install(FILES ${AWS_IO_HEADERS} DESTINATION "include/aws/io" COMPONENT Development)
 
-install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
-        DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}"
+install(EXPORT "${PROJECT_NAME}-targets"
+        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
         NAMESPACE AWS::
         COMPONENT Development)
 
-configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
+configure_file("cmake/${PROJECT_NAME}-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
         @ONLY)
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
-        DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
         COMPONENT Development)
 
-include(CTest)
-if (BUILD_TESTING)
-    add_subdirectory(tests)
-endif ()
+if (NOT CMAKE_CROSSCOMPILING)
+    if (BUILD_TESTING)
+       add_subdirectory(tests)
+    endif()
+endif()
+
+

aws-common-runtime/aws-c-mqtt/CMakeLists.txt

@@ -31,5 +31,7 @@ cmake_minimum_required(VERSION 3.1)
 include(AwsCFlags)
+include(AwsCheckHeaders)
 include(AwsSharedLibSetup)
 include(AwsSanitizers)
 include(CheckCCompilerFlag)
+include(AwsFindPackage)
 
@@ -57,26 +59,26 @@ file(GLOB AWS_MQTT_HEADERS
 
-add_library(${CMAKE_PROJECT_NAME} ${MQTT_HEADERS} ${MQTT_SRC})
-aws_set_common_properties(${CMAKE_PROJECT_NAME})
-aws_prepare_symbol_visibility_args(${CMAKE_PROJECT_NAME} "AWS_MQTT")
+add_library(${PROJECT_NAME} ${MQTT_HEADERS} ${MQTT_SRC})
+aws_set_common_properties(${PROJECT_NAME})
+aws_prepare_symbol_visibility_args(${PROJECT_NAME} "AWS_MQTT")
+aws_check_headers(${PROJECT_NAME} ${MQTT_HEADERS})
 
-aws_add_sanitizers(${CMAKE_PROJECT_NAME})
+aws_add_sanitizers(${PROJECT_NAME})
 
 # We are not ABI stable yet
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0)
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0)
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
 
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
+target_include_directories(${PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>)
 
-find_package(aws-c-io REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC AWS::aws-c-io)
+aws_use_package(aws-c-io)
 
 if (MQTT_WITH_WEBSOCKETS)
-    target_compile_definitions(${CMAKE_PROJECT_NAME} PUBLIC "-DAWS_MQTT_WITH_WEBSOCKETS")
-    find_package(aws-c-http REQUIRED)
-    target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC AWS::aws-c-http)
+    target_compile_definitions(${PROJECT_NAME} PUBLIC "-DAWS_MQTT_WITH_WEBSOCKETS")
+    aws_use_package(aws-c-http)
 endif ()
 
-aws_prepare_shared_lib_exports(${CMAKE_PROJECT_NAME})
+target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
+aws_prepare_shared_lib_exports(${PROJECT_NAME})
 
@@ -92,13 +94,13 @@ install(FILES ${AWS_MQTT_HEADERS} DESTINATION "include/aws/mqtt" COMPONENT Development)
 
-install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
-        DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}"
+install(EXPORT "${PROJECT_NAME}-targets"
+        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
         NAMESPACE AWS::
         COMPONENT Development)
 
-configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
+configure_file("cmake/${PROJECT_NAME}-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
         @ONLY)
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
-        DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
         COMPONENT Development)
@@ -105,0 +107,0 @@

aws-common-runtime/s2n/CMakeLists.txt

@@ -27,3 +27,3 @@ cmake_minimum_required (VERSION 3.0)
     "pq-crypto/bike/*.h"
-    "pq-crypto/sike/*.h"
+    "pq-crypto/sike_r1/*.h"
 )
@@ -52,10 +52,12 @@
 
-# The SIKE code #includes .c files directly, including all sike/*.c breaks the build due to duplicates
+# The SIKE code #includes .c files directly, including all sike_r*/*.c breaks the build due to duplicates
 file(GLOB PQ_SRC
     "pq-crypto/*.c"
     "pq-crypto/bike/*.c"
-    "pq-crypto/sike/fp_generic.c"
-    "pq-crypto/sike/P503.c"
-    "pq-crypto/sike/sike_p503_kem.c"
-    "pq-crypto/sike/fips202.c"
+    "pq-crypto/sike_r1/fp_generic_r1.c"
+    "pq-crypto/sike_r1/P503_r1.c"
+    "pq-crypto/sike_r1/sike_p503_r1_kem.c"
+    "pq-crypto/sike_r1/fips202_r1.c"
+    "pq-crypto/sike_r2/fips202.c"
+    "pq-crypto/sike_r2/P434.c"
 )
@@ -125,23 +127,23 @@
 
-add_library(${CMAKE_PROJECT_NAME} ${S2N_HEADERS} ${S2N_SRC})
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES LINKER_LANGUAGE C)
+add_library(${PROJECT_NAME} ${S2N_HEADERS} ${S2N_SRC})
+set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE C)
 
 set(CMAKE_C_FLAGS_DEBUGOPT "")
 
-target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -pedantic -std=c99 -Wall -Werror -Wimplicit -Wunused -Wcomment -Wchar-subscripts
+target_compile_options(${PROJECT_NAME} PRIVATE -pedantic -std=c99 -Wall -Werror -Wimplicit -Wunused -Wcomment -Wchar-subscripts
         -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -Wno-deprecated-declarations -Wno-unknown-pragmas -Wformat-security
         -Wno-missing-braces)
-target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC -fPIC)
+target_compile_options(${PROJECT_NAME} PUBLIC -fPIC)
 
-target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L)
+target_compile_definitions(${PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L)
 if(CMAKE_BUILD_TYPE MATCHES Release)
-    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_FORTIFY_SOURCE=2)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE -D_FORTIFY_SOURCE=2)
 endif()
 
 if(NO_STACK_PROTECTOR)
-    target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wstack-protector -fstack-protector-all)
+    target_compile_options(${PROJECT_NAME} PRIVATE -Wstack-protector -fstack-protector-all)
 endif()
 
 if(S2N_UNSAFE_FUZZING_MODE)
-    target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -fsanitize-coverage=trace-pc-guard -fsanitize=address,undefined,leak)
+    target_compile_options(${PROJECT_NAME} PRIVATE -fsanitize-coverage=trace-pc-guard -fsanitize=address,undefined,leak)
 endif()
@@ -152,7 +154,7 @@
 find_package(LibCrypto REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC LibCrypto::Crypto ${OS_LIBS} m)
+target_link_libraries(${PROJECT_NAME} PUBLIC LibCrypto::Crypto ${OS_LIBS} m)
 
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/api> $<INSTALL_INTERFACE:include>)
-target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC $<TARGET_PROPERTY:LibCrypto::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
+target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/api> $<INSTALL_INTERFACE:include>)
+target_include_directories(${PROJECT_NAME} PUBLIC $<TARGET_PROPERTY:LibCrypto::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
 
@@ -169,3 +171,3 @@ include(CTest)
     target_compile_options(testss2n PRIVATE -std=c99)
-    target_link_libraries(testss2n PUBLIC ${CMAKE_PROJECT_NAME})
+    target_link_libraries(testss2n PUBLIC ${PROJECT_NAME})
 
@@ -196,3 +198,3 @@ #run unit tests
     add_executable(s2nc "bin/s2nc.c" "bin/echo.c")
-    target_link_libraries(s2nc ${CMAKE_PROJECT_NAME})
+    target_link_libraries(s2nc ${PROJECT_NAME})
     target_include_directories(s2nc PRIVATE api)
@@ -202,3 +204,3 @@ target_compile_options(s2nc PRIVATE -std=c99 -D_POSIX_C_SOURCE=200112L)
     add_executable(s2nd "bin/s2nd.c" "bin/echo.c")
-    target_link_libraries(s2nd ${CMAKE_PROJECT_NAME})
+    target_link_libraries(s2nd ${PROJECT_NAME})
     target_include_directories(s2nd PRIVATE api)
@@ -218,4 +220,4 @@ target_compile_options(s2nd PRIVATE -std=c99 -D_POSIX_C_SOURCE=200112L)
 install(
-        TARGETS ${CMAKE_PROJECT_NAME}
-        EXPORT ${CMAKE_PROJECT_NAME}-targets
+        TARGETS ${PROJECT_NAME}
+        EXPORT ${PROJECT_NAME}-targets
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
@@ -226,4 +228,4 @@ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
 
-configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
+configure_file("cmake/${PROJECT_NAME}-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
         @ONLY)
@@ -237,9 +239,9 @@
 
-install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}"
+install(EXPORT "${PROJECT_NAME}-targets"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
         NAMESPACE AWS::
         COMPONENT Development)
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}/cmake/"
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
         COMPONENT Development)
@@ -246,0 +248,0 @@

aws-common-runtime/s2n/pq-crypto/README.md

@@ -26,7 +26,12 @@ # Post-quantum cryptography for s2n
 ## SIKE (Supersingular Isogeny Key Encapsulation)
-The code in the pq-crypto/sike directory was taken from the [round 1 nist submission](https://csrc.nist.gov/CSRC/media/Projects/Post-Quantum-Cryptography/documents/round-1/submissions/SIKE.zip).
-s2n uses the reference implementation to ensure maximum comparability and ease of review. The known answer tests are
-[here](https://github.com/awslabs/s2n/blob/master/tests/unit/s2n_sike_p503_kat_test.c) and use the known answer file
+The code in the pq-crypto/sike_r1 directory was taken from the [round 1 NIST submission](https://csrc.nist.gov/CSRC/media/Projects/Post-Quantum-Cryptography/documents/round-1/submissions/SIKE.zip).
+s2n uses the optimized portable implementation to ensure maximum comparability and ease of review. The known answer tests
+are [here](https://github.com/awslabs/s2n/blob/master/tests/unit/s2n_sike_p503_kat_test.c) and use the known answer file
 from the SIKEp503 round 1 submission.
 
+The code in the pq-crypto/sike_r2 directory was imported from [liboqs](https://github.com/open-quantum-safe/liboqs/tree/386372ba7dbef781f0b939f1cf73d33019958d6a/src/kem/sike), and
+implements the [round 2 NIST submission](https://csrc.nist.gov/projects/post-quantum-cryptography/round-2-submissions). s2n is configured to use the optimized
+assembly implementation on x86_64 processors, and the optimized portable implementation elsewhere. The known answer tests
+are [here](https://github.com/awslabs/s2n/blob/master/tests/unit/kats/sike_p434.kat) and use the known answer file from the SIKEP434 round 2 submission.
+
 ## BIKE (Bit Flipping Key Encapsulation)
@@ -37,5 +42,6 @@ The code in the pq-crypto/bike directory was taken from the [additional implementation](https://bikesuite.org/files/round2/add-impl/Additional_Implementation.2019.03.30.zip).
 review. The known answer tests are [here](https://github.com/awslabs/s2n/blob/master/tests/unit/s2n_bike1_l1_kat_test.c)
-and use the BIKE1_L1.const.kat from the above Additional_Implementation.2019.03.30.zip. This implementation uses constant time primitives on x86 and aarch64 platforms.
+and use the BIKE1_L1.const.kat from the above Additional_Implementation.2019.03.30.zip. This implementation uses constant
+time primitives on x86 and aarch64 platforms.
 
-## How to add another PQ KEM
+## How to add a new PQ KEM family
 1. Add the code to `pq-crypto/KEM_NAME/`
@@ -46,4 +52,5 @@ 1. Update `pq-crypto/Makefile` to build that directory
     1. Create a `pq-crypto/KEM_NAME/KEM_NAME.h` with the size of objects and method definitions
-1. Define the new cipher suite and KEM extension value in `tls/s2n_tls_parameters.h`
+1. Define the new cipher suite value and KEM extension value in `tls/s2n_tls_parameters.h`
 1. Create the `KEM_NAME` `s2n_kem` struct in `tls/s2n_kem.c`
+    1. Create the `supported_KEM_NAME_params` array in `tls/s2n_kem.c`
     1. Add the new kem to the `kem_mapping` with the correct cipher suite value
@@ -55,2 +62,17 @@ 1. Add known answer tests using `s2n_test_kem_with_kat()` in `tests/unit/s2n_KEM_NAME_kat_test.c`
 1. Create a new `s2n_cipher_preferences` in `tls/s2n_cipher_prefrences.c` that uses the new cipher suite
+    1. Once this change is made, the KEM will be available for use in TLS handshakes; ensure that all testing/verification has been completed
+    
+## How to add a new variant to an existing PQ KEM family
+1. Add the code to `pq-crypto/KEM_NAME/`
+    1. Update `pq-crypto/Makefile` to build that directory
+    1. Update `lib/Makefile` to also include that directory
+    1. Update the KEM code to include `pq-crypto/pq_random.h` and use the function `get_random_bytes` for any random data the KEM needs
+    1. Create a `pq-crypto/KEM_NAME/KEM_NAME.h` with the size of objects and method definitions
+1. Define the KEM extension value in `tls/s2n_tls_parameters.h`
+1. Create the `KEM_NAME` `s2n_kem` struct in `tls/s2n_kem.c`
+1. Add known answer tests using `s2n_test_kem_with_kat()` in `tests/unit/s2n_KEM_NAME_kat_test.c`
+1. Add fuzz testing in `tests/fuzz/s2n_KEM_NAME_fuzz_test.c`
+1. Add formal verification in `tests/saw/KEM_NAME/verify.saw`
+1. Update the appropriate `supported_KEM_NAME_params` array in `tls/s2n_kem.c`
+    1. Once this change is made, the KEM extension will be available for use in TLS handshakes; ensure that all testing/verification has been completed 
 
@@ -57,0 +79,0 @@ ## How to use PQ cipher suites

package.json

 {
   "name": "aws-crt",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "NodeJS bindings to the aws-c-* libraries",
@@ -35,3 +35,2 @@ "homepage": "https://github.com/awslabs/aws-crt-nodejs",
     "async-mqtt": "^2.4.2",
-    "awssdk": "^1.0.1",
     "axios": "^0.19.0",
@@ -38,0 +37,0 @@ "cmake-js": "^6.0.0",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

11861924

increased by6.12%

Dependency count

6

decreased by-14.29%

Number of package files

787

increased by9.76%

Number of low license alerts

11

decreased by-8.33%

Dependency changes

• - Removedawssdk@^1.0.1

• - Removedawssdk@1.0.1(transitive)