[openssl] add feature to enable ssl3/weak-ssl-ciphers (#35196)

microsoft · Dec 21, 2023 · ec05fe4 · ec05fe4
1 parent 4874bea
commit ec05fe4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
@@ -36,8 +36,6 @@ vcpkg_from_github(
 vcpkg_list(SET CONFIGURE_OPTIONS
     enable-static-engine
     enable-capieng
-    no-ssl3
-    no-weak-ssl-ciphers
     no-tests
     no-docs
 )
@@ -58,6 +56,15 @@ if(NOT "tools" IN_LIST FEATURES)
     vcpkg_list(APPEND CONFIGURE_OPTIONS no-apps)
 endif()
 
+if("weak-ssl-ciphers" IN_LIST FEATURES)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-weak-ssl-ciphers)
+endif()
+
+if("ssl3" IN_LIST FEATURES)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-ssl3)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-ssl3-method)
+endif()
+
 if(DEFINED OPENSSL_USE_NOPINSHARED)
     vcpkg_list(APPEND CONFIGURE_OPTIONS no-pinshared)
 endif()

diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "openssl",
   "version": "3.2.0",
+  "port-version": 1,
   "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",
@@ -23,9 +24,15 @@
       "description": "Enable fips",
       "supports": "!static"
     },
+    "ssl3": {
+      "description": "Enable SSL3"
+    },
     "tools": {
       "description": "Install openssl executable and scripts",
       "supports": "!uwp"
+    },
+    "weak-ssl-ciphers": {
+      "description": "Enable weak-ssl-ciphers"
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6338,7 +6338,7 @@
     },
     "openssl": {
       "baseline": "3.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "openssl-unix": {
       "baseline": "deprecated",

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dd76b04663283d999c149033c3fac211d08f0324",
+      "version": "3.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "b9b4587c2e00e793e735d8ac5094f64dbfcf44e1",
       "version": "3.2.0",