update openssl to 3.1.0 (#30263)

microsoft · Mar 20, 2023 · e84a58f · e84a58f
1 parent 9b9c275
commit e84a58f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 46 deletions.
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
@@ -19,14 +19,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openssl/openssl
     REF "openssl-${VERSION}"
-    SHA512 5a821aaaaa89027ce08a347e5fc216757c2971e29f7d24792609378c54f657839b3775bf639e7330b28b4f96ef0d32869f0a96afcb25c8a2e1c2fe51a6eb4aa3
+    SHA512 877b4bc4b59126bdaf626b01322c8ac5325945234acd14907e4a23019f1fd38ec17b5fae9ff60aa9b6b0089c29b0e4255a19cd2a1743c3db82a616286c60d3b9
     PATCHES
         disable-apps.patch
         disable-install-docs.patch
         script-prefix.patch
         windows/install-layout.patch
         windows/install-pdbs.patch
-        windows/umul128-arm64.patch # Fixed upstream in https://github.com/openssl/openssl/pull/20244, but not released as of 3.0.8
         unix/android-cc.patch
         unix/move-openssldir.patch
         unix/no-empty-dirs.patch

diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "openssl",
-  "version": "3.0.8",
-  "port-version": 2,
+  "version": "3.1.0",
   "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
   "homepage": "https://www.openssl.org",
   "license": "Apache-2.0",

diff --git a/ports/openssl/windows/umul128-arm64.patch b/ports/openssl/windows/umul128-arm64.patch
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5809,8 +5809,8 @@
       "port-version": 0
     },
     "openssl": {
-      "baseline": "3.0.8",
-      "port-version": 2
+      "baseline": "3.1.0",
+      "port-version": 0
     },
     "openssl-unix": {
       "baseline": "deprecated",

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "179a1ad3f5a5bbcb77f2e00688e4c467f03d4311",
+      "version": "3.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3fbd85566107cc3a76ed800844569f1a7503f9d6",
       "version": "3.0.8",