remove sha512, move md5 to thirdparty (#1443)

title. Tested that Auth runs and I can login still.
DarkflameUniverse · Feb 9, 2024 · 62b670d · 62b670d
1 parent d2aeebc
commit 62b670d
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 231 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -245,6 +245,7 @@ set(INCLUDED_DIRECTORIES
 	"thirdparty/SQLite"
 	"thirdparty/cpplinq"
 	"thirdparty/cpp-httplib"
+	"thirdparty/MD5"
 
 	"tests"
 	"tests/dCommonTests"
@@ -320,7 +321,7 @@ add_subdirectory(dPhysics)
 add_subdirectory(dServer)
 
 # Create a list of common libraries shared between all binaries
-set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp" "magic_enum")
+set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp" "magic_enum" "MD5")
 
 # Add platform specific common libraries
 if(UNIX)

diff --git a/dCommon/CMakeLists.txt b/dCommon/CMakeLists.txt
@@ -8,11 +8,9 @@ set(DCOMMON_SOURCES
 		"Game.cpp"
 		"GeneralUtils.cpp"
 		"LDFFormat.cpp"
-		"MD5.cpp"
 		"Metrics.cpp"
 		"NiPoint3.cpp"
 		"NiQuaternion.cpp"
-		"SHA512.cpp"
 		"Demangler.cpp"
 		"ZCompression.cpp"
 		"BrickByBrickFix.cpp"
@@ -68,8 +66,3 @@ else ()
 endif ()
 
 target_link_libraries(dCommon ZLIB::ZLIB)
-
-# Disable deprecation warnings on MD5.cpp and SHA512.cpp for Apple Clang
-if (APPLE)
-	set_source_files_properties("MD5.cpp" "SHA512.cpp" PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
-endif()
diff --git a/dCommon/SHA512.cpp b/dCommon/SHA512.cpp
diff --git a/dCommon/SHA512.h b/dCommon/SHA512.h
diff --git a/dNet/AuthPackets.cpp b/dNet/AuthPackets.cpp
@@ -7,7 +7,6 @@
 #include "Database.h"
 #include "ZoneInstanceManager.h"
 #include "MD5.h"
-#include "SHA512.h"
 #include "GeneralUtils.h"
 
 #include <bcrypt/BCrypt.hpp>

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -57,3 +57,5 @@ if(UNIX AND NOT APPLE)
 		include_directories(${backtrace_SOURCE_DIR})
 	endif()
 endif()
+
+add_subdirectory(MD5)
diff --git a/thirdparty/MD5/CMakeLists.txt b/thirdparty/MD5/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_library(MD5 "MD5.cpp")
+
+# Disable deprecation warnings on MD5.cpp for Apple Clang
+if (APPLE)
+	set_source_files_properties("MD5.cpp" PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
+endif()
diff --git a/dCommon/MD5.cpp → thirdparty/MD5/MD5.cpp b/dCommon/MD5.cpp → thirdparty/MD5/MD5.cpp
diff --git a/dCommon/MD5.h → thirdparty/MD5/MD5.h b/dCommon/MD5.h → thirdparty/MD5/MD5.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,3 +57,5 @@ if(UNIX AND NOT APPLE) @@
     		include_directories(${backtrace_SOURCE_DIR})
     	endif()
     endif()
+    add_subdirectory(MD5)