From e52999ee1a61bfea654733712288c5d4469d38bc Mon Sep 17 00:00:00 2001
From: lbermes <41416957+lbermes@users.noreply.github.com>
Date: Fri, 28 Apr 2023 07:48:59 +0200
Subject: [PATCH] [openssl] correct fipsmodule install (#31142)

* Corrected fipsmodule.cnf install

move it to the same position as openssl.cnf, both are only examples of openssl

* Adjusted port version

* Adjusted SHA for vcpkg x-add-version --all

---------

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/openssl/vcpkg.json             | 2 +-
 ports/openssl/windows/portfile.cmake | 2 ++
 versions/baseline.json               | 2 +-
 versions/o-/openssl.json             | 5 +++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index 31fafaceb0..4c3f2b4259 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version": "3.1.0",
-  "port-version": 2,
+  "port-version": 3,
   "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/portfile.cmake b/ports/openssl/windows/portfile.cmake
index e9c0df4d7a..f7263609e7 100644
--- a/ports/openssl/windows/portfile.cmake
+++ b/ports/openssl/windows/portfile.cmake
@@ -89,6 +89,7 @@ set(scripts "bin/c_rehash.pl" "misc/CA.pl" "misc/tsget.pl")
 if("tools" IN_LIST FEATURES)
     file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
     file(RENAME "${CURRENT_PACKAGES_DIR}/openssl.cnf" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/openssl.cnf")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/fipsmodule.cnf" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fipsmodule.cnf")
     foreach(script IN LISTS scripts)
         file(COPY "${CURRENT_PACKAGES_DIR}/${script}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
         file(REMOVE "${CURRENT_PACKAGES_DIR}/${script}" "${CURRENT_PACKAGES_DIR}/debug/${script}")
@@ -96,6 +97,7 @@ if("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(TOOL_NAMES openssl AUTO_CLEAN)
 else()
     file(REMOVE "${CURRENT_PACKAGES_DIR}/openssl.cnf")
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/fipsmodule.cnf")
     foreach(script IN LISTS scripts)
         file(REMOVE "${CURRENT_PACKAGES_DIR}/${script}" "${CURRENT_PACKAGES_DIR}/debug/${script}")
     endforeach()
diff --git a/versions/baseline.json b/versions/baseline.json
index d8420dd78d..d5d5bcc7ec 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5890,7 +5890,7 @@
     },
     "openssl": {
       "baseline": "3.1.0",
-      "port-version": 2
+      "port-version": 3
     },
     "openssl-unix": {
       "baseline": "deprecated",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 4a3a2cb5d2..6862d442a0 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b99152f5be63f45b2f3be6eb1624d96d70b21b49",
+      "version": "3.1.0",
+      "port-version": 3
+    },
     {
       "git-tree": "64fc47730d346ecacc9f948c2c3138363ed8f702",
       "version": "3.1.0",