mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 10:59:00 +08:00
8b4ff54ecd
* Fix Aws Crypto Abstraction Layer and S2N builds * Fix aws-c-cal build * Revert changes * [s2n] update to 1.1.0 * Do not build tests for any of AWS SDK for C++ dependencies Remove unused flags from OpenSSL and AWS SDK for C++ builds * Update versions * Fix indentation * Fix indentation * Remove redundant flags * Remove redundant options * Update ports/aws-c-auth/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-cal/002-no-exe-no-tests.patch Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-cal/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-cal/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-compression/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-crt-cpp/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-checksums/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-event-stream/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-s3/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-http/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-io/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-mqtt/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Simplify patch Restore PREFER_NINJA for OpenSSL build * Update versions * Replace deprecated methods * Update versions * Fix dependencies of OpenSSL * Fix dependencies of OpenSSL * Update ports/aws-c-cal/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-io/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-io/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Fix versions * Revert quotation mark change * Revert quotation mark change * Revert quotation mark change * Patch AWS CRT for C++ for iOS build Do not copy sha256_profile tool when building aws-c-cal * Remove redundant flags * Fix indentation * Update versions * Update versions * Fix aws-c-cal build Update versions * Update versions * Update versions * Update versions * Update versions * Update versions * Fix library paths for Windows shared builds * Revert compiler check * Update versions * Fix indentation Revert OS check * Update versions * Fix indentation * Fix indentation * Fix indentation * Update versions/o-/openssl.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions * Update versions * Update versions Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com> Co-authored-by: Charles-Auguste Marois <cmarois@coveo.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
22 lines
827 B
Diff
22 lines
827 B
Diff
diff --git a/source/io/TlsOptions.cpp b/source/io/TlsOptions.cpp
|
|
--- a/source/io/TlsOptions.cpp (revision 9ef58ff20df19e613c91c5f761e381c763da6810)
|
|
+++ b/source/io/TlsOptions.cpp (date 1635309758483)
|
|
@@ -90,7 +90,7 @@
|
|
return ctxOptions;
|
|
}
|
|
#endif /* !AWS_OS_IOS */
|
|
-#if defined(AWS_OS_APPLE)
|
|
+#if defined(AWS_OS_MACOS)
|
|
TlsContextOptions TlsContextOptions::InitClientWithMtlsPkcs12(
|
|
const char *pkcs12Path,
|
|
const char *pkcs12Pwd,
|
|
@@ -111,7 +111,7 @@
|
|
AWS_ASSERT(m_isInit);
|
|
return aws_tls_ctx_options_set_keychain_path(&m_options, &keychain_path) == 0;
|
|
}
|
|
-#endif /* AWS_OS_APPLE */
|
|
+#endif /* AWS_OS_MACOS */
|
|
|
|
#ifdef _WIN32
|
|
TlsContextOptions TlsContextOptions::InitClientWithMtlsSystemPath(
|