[s2n] Update s2n's version to 1.3.5 (#22833)

* Update s2n's version

* Update s2n's version

* Update s2n

* Update s2n's patch

* Update s2n's patch

* Update ports/s2n/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update s2n's version

* Update s2n's version

* Update versions

* Update versions

* Update versions

* Update versions

* Update versions

* Update versions

* Update versions

* Update versions

* Update versions

* Update versions

* Update versions

* Update to 1.3.5

* Update to 1.3.5

* Update to 1.3.5

* Update to 1.3.5

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>

Author: 3 people

ports/s2n/portfile.cmake

@@ -1,20 +1,28 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/s2n-tls
-    REF ab9a3be5a8abcbc5bd7bdba662497a717737c838 # v1.3.0
-    SHA512 0150cba56f7940253ffa5af0c27fdc8db08961d4c8a80377d25f588fa8a56249eb02723304969d0fdebe570388545527ee826a3070c21e50e63c4f021d425728
+    REF 36c3dc72ab1359cf721294e1258dfdc2962f3ffc # v1.3.5
+    SHA512 2c9eed12e90e5fc987758635fec4a7418c20d25c724cfa391090b06bfcc4eb5925b4011d51a99e7c7ab80f535684ee3934ba4734b7966edd323bf88bc5953d7c
     PATCHES
         fix-cmake-target-path.patch
         use-openssl-crypto.patch
+        remove-trycompile.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         tests   BUILD_TESTING
 )
+
+set(EXTRA_ARGS)
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
+    set(EXTRA_ARGS "-DS2N_NO_PQ=TRUE")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${EXTRA_ARGS}
         ${FEATURE_OPTIONS}
         -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF
 )

ports/s2n/remove-trycompile.patch

@@ -0,0 +1,36 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	(revision 86c857094a2d94fafce15a3d32abb4052e664c5c)
++++ b/CMakeLists.txt	(date 1643340236796)
+@@ -409,32 +409,6 @@
+     endif()
+ endif()
+ 
+-# Determine if EVP_md5_sha1 is available in libcrypto
+-try_compile(
+-        LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH
+-        ${CMAKE_BINARY_DIR}
+-        SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md5_sha1.c"
+-        LINK_LIBRARIES crypto ${OS_LIBS}
+-        CMAKE_FLAGS
+-            "-DINCLUDE_DIRECTORIES=$<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>"
+-)
+-if (LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH)
+-    target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH)
+-endif()
+-
+-# Determine if EVP_MD_CTX_set_pkey_ctx is available in libcrypto
+-try_compile(
+-        LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX
+-        ${CMAKE_BINARY_DIR}
+-        SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md_ctx_set_pkey_ctx.c"
+-        LINK_LIBRARIES crypto ${OS_LIBS}
+-        CMAKE_FLAGS
+-            "-DINCLUDE_DIRECTORIES=$<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>"
+-)
+-if (LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX)
+-    target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX)
+-endif()
+-
+ if (S2N_INTERN_LIBCRYPTO)
+     if (NOT LibCrypto_STATIC_LIBRARY)
+         message(FATAL_ERROR "libcrypto interning requires a static build of libcrypto.a to be available")

ports/s2n/vcpkg.json

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

versions/baseline.json

@@ -6201,8 +6201,8 @@
       "port-version": 1
     },
     "s2n": {
-      "baseline": "1.3.0",
-      "port-version": 1
+      "baseline": "1.3.5",
+      "port-version": 0
     },
     "safeint": {
       "baseline": "3.0.26",

versions/s-/s2n.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6eed0d44ebcda6eea8c4a79b37ee119b9125060a",
+      "version": "1.3.5",
+      "port-version": 0
+    },
     {
       "git-tree": "7cb2325defd326de178cf524bd5db039ff1dc112",
       "version": "1.3.0",