From c963dc824d8cfbc28a4f1f3f63f0142a5777aff4 Mon Sep 17 00:00:00 2001
From: lbermes <l.bermes@asctechnologies.com>
Date: Thu, 27 Apr 2023 07:00:19 +0200
Subject: [PATCH 1/3] Corrected fipsmodule.cnf install

move it to the same position as openssl.cnf, both are only examples of openssl
---
 ports/openssl/windows/portfile.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake
index e9c0df4d7acab1..f7263609e72915 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()

From b32f784fa9e99cca0ef116d2379535d7c35ddedc Mon Sep 17 00:00:00 2001
From: lbermes <l.bermes@asctechnologies.com>
Date: Thu, 27 Apr 2023 07:08:48 +0200
Subject: [PATCH 2/3] Adjusted port version

---
 ports/openssl/vcpkg.json | 2 +-
 versions/baseline.json   | 2 +-
 versions/o-/openssl.json | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index 31fafaceb04ed1..4c3f2b42590adf 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/versions/baseline.json b/versions/baseline.json
index 246fa331d424f2..e369bb07875b8a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5882,7 +5882,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 4a3a2cb5d28f00..f4bfce0e6754ab 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a1b9f0bc8d29903e850804838c058d963dbe0519",
+      "version": "3.1.0",
+      "port-version": 3
+    },
     {
       "git-tree": "64fc47730d346ecacc9f948c2c3138363ed8f702",
       "version": "3.1.0",

From 17c4688f492b9507a7f3d02a2d2ccf37804853de Mon Sep 17 00:00:00 2001
From: lbermes <l.bermes@asctechnologies.com>
Date: Thu, 27 Apr 2023 07:09:51 +0200
Subject: [PATCH 3/3] Adjusted SHA for vcpkg x-add-version --all

---
 versions/o-/openssl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index f4bfce0e6754ab..6862d442a0c13a 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "a1b9f0bc8d29903e850804838c058d963dbe0519",
+      "git-tree": "b99152f5be63f45b2f3be6eb1624d96d70b21b49",
       "version": "3.1.0",
       "port-version": 3
     },