a

Rosalie241 · Nov 11, 2023 · 349b474 · 349b474
1 parent ec3eb3f
commit 349b474
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/.github/workflows/SporeMods.yml b/.github/workflows/SporeMods.yml
@@ -1,10 +1,6 @@
 name: SporeMods
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -18,7 +14,7 @@ jobs:
       - uses: microsoft/[email protected]
       - name: Install Dependencies
         run: |
-          choco install openssl --forcex86 -r -y
+          choco install openssl --version=1.1.1.2100 --forcex86 -r -y
           choco install 7zip -r -y
       - name: Build Spore-ModAPI
         run: |

diff --git a/.github/workflows/SporeServer.yml b/.github/workflows/SporeServer.yml
@@ -1,10 +1,6 @@
 name: SporeServer
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 jobs:
   build:

diff --git a/SporeMods/SporeServer/AssetBrowserFeed.cpp b/SporeMods/SporeServer/AssetBrowserFeed.cpp
@@ -14,6 +14,8 @@
 
 bool AssetBrowserFeed::InjectUrls(void)
 {
+    return true; // TODO: find out what's going wrong...
+
     struct
     {
         uint32_t Id1;

diff --git a/SporeMods/SporeServer/OpenSSL.cpp b/SporeMods/SporeServer/OpenSSL.cpp
@@ -53,7 +53,7 @@ static bool         SporeServerSslVerification = true;
 
 // needed for assetbrowserfeed category injection
 static std::string  HandshakeXml;
-static bool         LookForHandshakeEndpoint = true;
+static bool         LookForHandshakeEndpoint = false;
 static bool         ReadHandshakeXml = false;
 
 //
@@ -385,12 +385,12 @@ void OpenSSL::Initialize(void)
 
 void OpenSSL::AttachDetours(void)
 {
-    SSLCtxNewDetour::attach(Address(ModAPI::ChooseAddress(0x0117f200, 0x0117ca80)));
-    SSLNewDetour::attach(Address(ModAPI::ChooseAddress(0x0117ed00, 0x0117c580)));
-    SSLClearDetour::attach(Address(ModAPI::ChooseAddress(0x0117ebe0, 0x0117c460)));
-    SSLConnectDetour::attach(Address(ModAPI::ChooseAddress(0x0117f5d0, 0x0117ce50)));
-    SSLReadDetour::attach(Address(ModAPI::ChooseAddress(0x0117dbb0, 0x0117b430)));
-    SSLWriteDetour::attach(Address(ModAPI::ChooseAddress(0x0117dc40, 0x0117b4c0)));
+    //SSLCtxNewDetour::attach(Address(ModAPI::ChooseAddress(0x0117f200, 0x0117ca80)));
+    //SSLNewDetour::attach(Address(ModAPI::ChooseAddress(0x0117ed00, 0x0117c580)));
+    //SSLClearDetour::attach(Address(ModAPI::ChooseAddress(0x0117ebe0, 0x0117c460)));
+    //SSLConnectDetour::attach(Address(ModAPI::ChooseAddress(0x0117f5d0, 0x0117ce50)));
+    //SSLReadDetour::attach(Address(ModAPI::ChooseAddress(0x0117dbb0, 0x0117b430)));
+    //SSLWriteDetour::attach(Address(ModAPI::ChooseAddress(0x0117dc40, 0x0117b4c0)));
     GameValidateCertificate::attach(Address(ModAPI::ChooseAddress(0x0094f080, 0x0094eb60)));
     GameUseHttpsDetour::attach(Address(ModAPI::ChooseAddress(0x00621740, 0x006216e0)));
     GameUseHttpDetour::attach(Address(ModAPI::ChooseAddress(0x00621800, 0x006217a0)));
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,8 @@ @@
     bool AssetBrowserFeed::InjectUrls(void)
     {
+        return true; // TODO: find out what's going wrong...
         struct
         {
             uint32_t Id1;
@@ Expand Down @@