Skip to content

Commit c308022

Browse files
authored
Updates CRT for library init changes (aws#56)
1 parent 6262664 commit c308022

File tree

3 files changed

+5
-17
lines changed

3 files changed

+5
-17
lines changed

aws-common-runtime/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(AWS_DEPS_DOWNLOAD_DIR "${AWS_DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependen
1717

1818
message("install dir ${AWS_DEPS_INSTALL_DIR}")
1919
set(AWS_C_COMMON_URL "https://github.com/awslabs/aws-c-common.git")
20-
set(AWS_C_COMMON_SHA "v0.4.3")
20+
set(AWS_C_COMMON_SHA "v0.4.5")
2121
include(BuildAwsCCommon)
2222

2323
if (UNIX AND NOT APPLE)
@@ -27,27 +27,27 @@ if (UNIX AND NOT APPLE)
2727
endif()
2828

2929
set(AWS_C_IO_URL "https://github.com/awslabs/aws-c-io.git")
30-
set(AWS_C_IO_SHA "v0.4.4")
30+
set(AWS_C_IO_SHA "v0.4.5")
3131
include(BuildAwsCIO)
3232

3333
set(AWS_C_COMPRESSION_URL "https://github.com/awslabs/aws-c-compression.git")
3434
set(AWS_C_COMPRESSION_SHA "v0.2.2")
3535
include(BuildAwsCCompression)
3636

3737
set(AWS_C_HTTP_URL "https://github.com/awslabs/aws-c-http.git")
38-
set(AWS_C_HTTP_SHA "v0.4.0")
38+
set(AWS_C_HTTP_SHA "v0.4.2")
3939
include(BuildAwsCHttp)
4040

4141
set(AWS_C_MQTT_URL "https://github.com/awslabs/aws-c-mqtt.git")
42-
set(AWS_C_MQTT_SHA "v0.4.1")
42+
set(AWS_C_MQTT_SHA "v0.4.3")
4343
include(BuildAwsCMqtt)
4444

4545
set(AWS_C_CAL_URL "https://github.com/awslabs/aws-c-cal.git")
4646
set(AWS_C_CAL_SHA "v0.1.5")
4747
include(BuildAwsCCal)
4848

4949
set(AWS_C_AUTH_URL "https://github.com/awslabs/aws-c-auth.git")
50-
set(AWS_C_AUTH_SHA "v0.2.0")
50+
set(AWS_C_AUTH_SHA "v0.2.1")
5151
include(BuildAwsCAuth)
5252

5353
add_dependencies(AwsCCompression AwsCCommon)

source/Api.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,10 @@ namespace Aws
3434
{
3535
// sets up the StlAllocator for use.
3636
g_allocator = allocator;
37-
Io::InitTlsStaticState(allocator);
3837
aws_http_library_init(allocator);
3938
aws_mqtt_library_init(allocator);
4039
aws_auth_library_init(allocator);
4140

42-
aws_load_error_strings();
43-
aws_io_load_error_strings();
44-
45-
aws_common_load_log_subject_strings();
46-
aws_io_load_log_subject_strings();
47-
4841
cJSON_Hooks hooks;
4942
hooks.malloc_fn = s_cJSONAlloc;
5043
hooks.free_fn = s_cJSONFree;
@@ -57,7 +50,6 @@ namespace Aws
5750
aws_auth_library_clean_up();
5851
aws_mqtt_library_clean_up();
5952
aws_http_library_clean_up();
60-
Io::CleanUpTlsStaticState();
6153
}
6254

6355
ApiHandle::ApiHandle(Allocator *allocator) noexcept : logger() { s_initApi(allocator); }

source/io/TlsOptions.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,6 @@ namespace Aws
141141
return aws_tls_ctx_options_override_default_trust_store(&m_options, const_cast<ByteCursor *>(&ca)) == 0;
142142
}
143143

144-
void InitTlsStaticState(Aws::Crt::Allocator *alloc) noexcept { aws_tls_init_static_state(alloc); }
145-
146-
void CleanUpTlsStaticState() noexcept { aws_tls_clean_up_static_state(); }
147-
148144
TlsConnectionOptions::TlsConnectionOptions() noexcept : m_lastError(AWS_ERROR_SUCCESS), m_isInit(false) {}
149145

150146
TlsConnectionOptions::TlsConnectionOptions(aws_tls_ctx *ctx, Allocator *allocator) noexcept

0 commit comments

Comments
 (0)