Fix awssdk usage and silence libcrypto messages (#20848)

* [0.5.12] Update aws-c-cal version.

* [1.1.1] Update s2n version

* Clarify AWSSDK package usage.

* Fix port versions.

* [aws-c-cal] Fix libcrypto patch.

* [s2n] Fix remove libcrpyto messages patch.

ports/aws-c-cal/portfile.cmake

@@ -1,10 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-cal
-    REF aa89aa4950074babe84762413f39bd364ecaf944 # v0.5.11
-    SHA512 b92ae3cb14d26dfe48cb903df56f7df91a4dc0ab2e5ea4f095c72b0b7e0a2582f1324c73eb42c080bcb0a59a3dfc37cd2912037fc8e5f7df8433899749fca63c
+    REF c4c5b175e05f2affe5e3f0203ca6c8bc5cdd8f51 # v0.5.12
+    SHA512 25dd1d7f207f1324aed418555dda1c3d4ec64baf76431c9efd88fd3c34b163a2e5a6778192d2c0caf937f3efd31b2f21e6a0d0f7230684d176164da0e8bcc92e
     HEAD_REF master
     PATCHES fix-cmake-target-path.patch
+            remove-libcrypto-messages.patch
 )
 
 vcpkg_cmake_configure(

ports/aws-c-cal/remove-libcrypto-messages.patch

@@ -0,0 +1,14 @@
+diff --git a/cmake/modules/FindLibCrypto.cmake b/cmake/modules/FindLibCrypto.cmake
+index 564ba97..f748212 100644
+--- a/cmake/modules/FindLibCrypto.cmake
++++ b/cmake/modules/FindLibCrypto.cmake
+@@ -89,9 +89,6 @@ else()
+         set(LIBCRYPTO_FOUND true)
+         set(LibCrypto_FOUND true)
+ 
+-        message(STATUS "LibCrypto Include Dir: ${LibCrypto_INCLUDE_DIR}")
+-        message(STATUS "LibCrypto Shared Lib:  ${LibCrypto_SHARED_LIBRARY}")
+-        message(STATUS "LibCrypto Static Lib:  ${LibCrypto_STATIC_LIBRARY}")
+         if (NOT TARGET crypto AND
+             (EXISTS "${LibCrypto_LIBRARY}")
+             )

ports/aws-c-cal/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-c-cal",
-  "version": "0.5.11",
+  "version": "0.5.12",
   "description": "C99 wrapper for cryptography primitives.",
   "homepage": "https://github.com/awslabs/aws-c-cal",
   "supports": "!arm & !uwp",

ports/aws-sdk-cpp/usage

@@ -1,5 +1,12 @@
 The package @PORT@:@TARGET_TRIPLET@ provides CMake targets:
 
+    When using AWSSDK, AWSSDK_ROOT_DIR must be defined by the user.
     find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED)
     target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS})
     target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES})
+    
+    OR
+    
+    find_package(aws-cpp-sdk-core REQUIRED)
+    target_include_directories(main PRIVATE aws-cpp-sdk-core)
+    target_link_libraries(main PRIVATE aws-cpp-sdk-core)

ports/aws-sdk-cpp/vcpkg.json

@@ -2,7 +2,7 @@
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
   "version": "1.9.96",
-  "port-version": 2,
+  "port-version": 3,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "supports": "!arm & !uwp",

ports/s2n/portfile.cmake

@@ -1,9 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/s2n-tls
-    REF 4de98dcf20c476519c15241f92122b99fd2a9297 # v1.1.0
-    SHA512 99c973912dc1a4db5ef36c24aa69134bf901101ce2ef749f7492f965f65f62b76c0e3935075881530f0828025ce20caa392afd9ad3bbdba157173dd5bb9f8163
+    REF 4513f8d707a68388990886d353e7cfe46cc6454b # v1.1.1
+    SHA512 6586e330733982ed3b70fd320e63575639d5793d69ffa06b2a46ed487d55d8271b46df611d62cc48410654b394d599de65edd9cdc860dea13255161d843f1f48
     PATCHES fix-cmake-target-path.patch
+            remove-libcrypto-messages.patch
 )
 
 vcpkg_cmake_configure(

ports/s2n/remove-libcrypto-messages.patch

@@ -0,0 +1,14 @@
+diff --git a/cmake/modules/FindLibCrypto.cmake b/cmake/modules/FindLibCrypto.cmake
+index 1ba8473..b486a1a 100644
+--- a/cmake/modules/FindLibCrypto.cmake
++++ b/cmake/modules/FindLibCrypto.cmake
+@@ -88,9 +88,6 @@ else()
+         set(LIBCRYPTO_FOUND true)
+         set(LibCrypto_FOUND true)
+ 
+-        message(STATUS "LibCrypto Include Dir: ${LibCrypto_INCLUDE_DIR}")
+-        message(STATUS "LibCrypto Shared Lib:  ${LibCrypto_SHARED_LIBRARY}")
+-        message(STATUS "LibCrypto Static Lib:  ${LibCrypto_STATIC_LIBRARY}")
+         if (NOT TARGET crypto AND
+             (EXISTS "${LibCrypto_LIBRARY}")
+             )

ports/s2n/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "s2n",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "C99 implementation of the TLS/SSL protocols.",
   "homepage": "https://github.com/aws/s2n-tls",
   "supports": "!uwp & !windows",

versions/a-/aws-c-cal.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f3ed6a5199c30560f46d1be38cee72e3a77d62a",
+      "version": "0.5.12",
+      "port-version": 0
+    },
     {
       "git-tree": "7495a338fdd1313d3cdfb67e69406eb4ecea02e9",
       "version": "0.5.11",

versions/a-/aws-sdk-cpp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "74ac36ae24b2c852423a57305005fd86d23d51d9",
+      "version": "1.9.96",
+      "port-version": 3
+    },
     {
       "git-tree": "1c6b4335305034bea75f07f368e51142abddb789",
       "version": "1.9.96",

versions/baseline.json

@@ -257,7 +257,7 @@
       "port-version": 0
     },
     "aws-c-cal": {
-      "baseline": "0.5.11",
+      "baseline": "0.5.12",
       "port-version": 0
     },
     "aws-c-common": {
@@ -302,7 +302,7 @@
     },
     "aws-sdk-cpp": {
       "baseline": "1.9.96",
-      "port-version": 2
+      "port-version": 3
     },
     "azmq": {
       "baseline": "2020-03-03",
@@ -5997,7 +5997,7 @@
       "port-version": 5
     },
     "s2n": {
-      "baseline": "1.1.0",
+      "baseline": "1.1.1",
       "port-version": 0
     },
     "safeint": {

versions/s-/s2n.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b1f3fbca47339363713845a0e8e06c52c1198a2a",
+      "version": "1.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "13b9d04cbee992cf866560de89551ceaf7dfc277",
       "version": "1.1.0",