Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync FindCrypto. Add option to force crypto linkage #2829

Merged
merged 2 commits into from
Feb 15, 2024
Merged

Sync FindCrypto. Add option to force crypto linkage #2829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cccad84
Sync FindCrypto. Add option to force crypto linkage
sbiscigl Jan 26, 2024
c4e053c
Update CRT to v0.26.2
sbiscigl Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ if (LEGACY_BUILD)
option(BUILD_OPTEL_OTLP_BENCHMARKS "Enables building the benchmark tests with open telemetry OTLP clients" OFF)
option(USE_TLS_V1_2 "Set http client to enforce TLS 1.2" ON)
option(USE_TLS_V1_3 "Set http client to enforce TLS 1.3" OFF)
option(AWS_USE_CRYPTO_SHARED_LIBS "Forces FindCrypto to use a shared crypto library if found. regardless of the value of BUILD_SHARED_LIBS" OFF)

set(AWS_USER_AGENT_CUSTOMIZATION "" CACHE STRING "User agent extension")
set(AWS_TEST_REGION "US_EAST_1" CACHE STRING "Region to target integration tests against")
Expand Down
8 changes: 6 additions & 2 deletions cmake/Findcrypto.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,12 @@ else()
)

if (NOT crypto_LIBRARY)
if (BUILD_SHARED_LIBS)
set(crypto_LIBRARY ${crypto_SHARED_LIBRARY})
if (BUILD_SHARED_LIBS OR AWS_USE_CRYPTO_SHARED_LIBS)
if (crypto_SHARED_LIBRARY)
set(crypto_LIBRARY ${crypto_SHARED_LIBRARY})
else()
set(crypto_LIBRARY ${crypto_STATIC_LIBRARY})
endif()
else()
if (crypto_STATIC_LIBRARY)
set(crypto_LIBRARY ${crypto_STATIC_LIBRARY})
Expand Down
2 changes: 1 addition & 1 deletion crt/aws-crt-cpp
Open in desktop
Submodule aws-crt-cpp updated 37 files
+1 −1 .github/workflows/ci.yml
+1 −1 README.md
+1 −1 VERSION
+1 −1 bin/elasticurl_cpp/main.cpp
+1 −1 bin/mqtt5_app/main.cpp
+1 −1 bin/mqtt5_canary/main.cpp
+1 −1 crt/aws-c-auth
+1 −1 crt/aws-c-cal
+1 −1 crt/aws-c-common
+1 −1 crt/aws-c-event-stream
+1 −1 crt/aws-c-http
+1 −1 crt/aws-c-io
+1 −1 crt/aws-c-mqtt
+1 −1 crt/aws-c-s3
+1 −1 crt/aws-lc
+1 −1 crt/s2n
+2 −2 include/aws/crt/http/HttpConnection.h
+4 −1 include/aws/crt/io/Uri.h
+2 −2 include/aws/crt/mqtt/Mqtt5Client.h
+2 −2 include/aws/crt/mqtt/MqttClient.h
+1 −1 include/aws/crt/mqtt/MqttTypes.h
+1 −1 include/aws/crt/mqtt/private/MqttConnectionCore.h
+3 −4 include/aws/iot/Mqtt5Client.h
+7 −8 include/aws/iot/MqttClient.h
+15 −1 source/io/Uri.cpp
+14 −3 source/iot/Mqtt5Client.cpp
+27 −17 source/iot/MqttClient.cpp
+1 −1 source/mqtt/Mqtt5Client.cpp
+3 −3 source/mqtt/Mqtt5ClientCore.cpp
+2 −2 source/mqtt/MqttClient.cpp
+5 −0 tests/CMakeLists.txt
+1 −1 tests/CredentialsTest.cpp
+152 −0 tests/Mqtt5ClientCredentialsTest.cpp
+243 −29 tests/Mqtt5ClientTest.cpp
+194 −0 tests/MqttClientCredentialsTest.cpp
+10 −10 tests/MqttClientTest.cpp
+1 −1 tests/ProxyTest.cpp
3 changes: 3 additions & 0 deletions docs/CMake_Parameters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,3 +180,6 @@ An override path for where the build system should find the Android NDK. By def

### ANDROID_BUILD_ZLIB
(Defaults to ON) When building for Android, should Zlib be built as well

### AWS_USE_CRYPTO_SHARED_LIBS
Forces FindCrypto to use a shared crypto library if found. regardless of the value of BUILD_SHARED_LIBS
22 changes: 11 additions & 11 deletions prefetch_crt_dependency.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
# SPDX-License-Identifier: Apache-2.0.

CRT_URI_PREFIX=https://codeload.github.com/awslabs
CRT_URI=${CRT_URI_PREFIX}/aws-crt-cpp/zip/dd818f608b5b3b219d525554046a1776117e3996 # v0.24.11
CRT_URI=${CRT_URI_PREFIX}/aws-crt-cpp/zip/e4514b7fb8b1fe67429aa7b0e00f628999722174 # v0.26.2

AWS_C_AUTH_URI=${CRT_URI_PREFIX}/aws-c-auth/zip/baeffa791d9d1cf61460662a6d9ac2186aaf05df # v0.7.8
AWS_C_CAL_URI=${CRT_URI_PREFIX}/aws-c-cal/zip/b52d9e8ee7af8155e6928c977ec5fde25a507ba0 # v0.6.9
AWS_C_COMMON_URI=${CRT_URI_PREFIX}/aws-c-common/zip/80f21b3cac5ac51c6b8a62c7d2a5ef58a75195ee # v0.9.10
AWS_C_AUTH_URI=${CRT_URI_PREFIX}/aws-c-auth/zip/6ba7a0f8688c713dfe137716dbd5be324c2315b0 # v0.7.10
AWS_C_CAL_URI=${CRT_URI_PREFIX}/aws-c-cal/zip/56f0a79ceb10f2efcf92f525ace717f84d8c8a11 # v0.6.10
AWS_C_COMMON_URI=${CRT_URI_PREFIX}/aws-c-common/zip/8eaa0986ad3cfd46c87432a2e4c8ab81a786085f # v0.9.12
AWS_C_COMPRESSION_URI=${CRT_URI_PREFIX}/aws-c-compression/zip/99ec79ee2970f1a045d4ced1501b97ee521f2f85 # v0.2.17
AWS_C_EVENT_STREAM_URI=${CRT_URI_PREFIX}/aws-c-event-stream/zip/08f24e384e5be20bcffa42b49213d24dad7881ae # v0.3.2
AWS_C_HTTP_URI=${CRT_URI_PREFIX}/aws-c-http/zip/a082f8a2067e4a31db73f1d4ffd702a8dc0f7089 # v0.7.14
AWS_C_IO_URI=${CRT_URI_PREFIX}/aws-c-io/zip/df64f57feb63ab1a489ded86a87b756a48c46f35 # v0.13.36
AWS_C_MQTT_URI=${CRT_URI_PREFIX}/aws-c-mqtt/zip/6d36cd3726233cb757468d0ea26f6cd8dad151ec # v0.9.10
AWS_C_S3_URI=${CRT_URI_PREFIX}/aws-c-s3/zip/de36fee8fe7ab02f10987877ae94a805bf440c1f # v0.4.3
AWS_C_EVENT_STREAM_URI=${CRT_URI_PREFIX}/aws-c-event-stream/zip/63d1e1021b04ce3c3b1fc1895078ac85e0430b24 # v0.4.0
AWS_C_HTTP_URI=${CRT_URI_PREFIX}/aws-c-http/zip/6a1c157c20640a607102738909e89561a41e91e9 # v0.8.0
AWS_C_IO_URI=${CRT_URI_PREFIX}/aws-c-io/zip/6225ebb9da28f1023ad5e21694de9d165cd65f3b # v0.14.1
AWS_C_MQTT_URI=${CRT_URI_PREFIX}/aws-c-mqtt/zip/17ee24a2177fc64cf9773d430a24e6fa06a89dd0 # v0.10.1
AWS_C_S3_URI=${CRT_URI_PREFIX}/aws-c-s3/zip/1dd55be83b19a55cd9c155e2da977cdc76112a91 # v0.4.9
AWS_C_SDKUTILS_URI=${CRT_URI_PREFIX}/aws-c-sdkutils/zip/fd8c0ba2e233997eaaefe82fb818b8b444b956d3 # v0.1.13
AWS_CHECKSUMS_URI=${CRT_URI_PREFIX}/aws-checksums/zip/321b805559c8e911be5bddba13fcbd222a3e2d3a # v0.1.17
AWS_LC_URI=${CRT_URI_PREFIX}/aws-lc/zip/80f3f3324e75737d43af3052b270fd2ffa169d29 # v1.17.4
S2N_URI=${CRT_URI_PREFIX}/s2n/zip/95753f0c528b59025343e8799cb25d3e9df89e21 # v1.3.56
AWS_LC_URI=${CRT_URI_PREFIX}/aws-lc/zip/dc4e28145ceb6d46b5475e833f2da8def6d583fe # v1.19.0
S2N_URI=${CRT_URI_PREFIX}/s2n/zip/0998358a6ef7c4f22295deba088796fe354c5f4c # v1.4.4


echo "Removing CRT"
Expand Down
Loading