🔧 Replaced sha1_util with Poco::SHA1Engine

Author: AnotherFoxGuy

.clang-format

@@ -0,0 +1,4 @@
+---
+BasedOnStyle: Microsoft
+
+...

CMakeLists.txt

@@ -1,8 +1,13 @@
 # ensure cmake features we need
 CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake)
+set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_BINARY_DIR})
 
 project(rorserver)
 
+
+find_package(Poco REQUIRED)
+
 # setup paths
 SET(RUNTIME_OUTPUT_DIRECTORY "${rorserver_SOURCE_DIR}/bin/")
 SET(LIBRARY_OUTPUT_DIRECTORY "${rorserver_SOURCE_DIR}/lib/")

conanfile.txt

@@ -0,0 +1,13 @@
+[requires]
+poco/1.11.1
+
+[generators]
+cmake_find_package_multi
+virtualrunenv
+
+[imports]
+bin, *.dll -> ./bin/ @ keep_path=False
+lib, *.dll -> ./bin/ @ keep_path=False
+
+[options]
+poco:enable_pagecompiler=True

source/server/CMakeLists.txt

@@ -11,6 +11,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE
         ${CMAKE_SOURCE_DIR}/dependencies/jsoncpp/include/
         )
 
+target_link_libraries(${PROJECT_NAME} PRIVATE Poco::Poco)
+
 # libraries
 if (RORSERVER_WITH_ANGELSCRIPT)
     add_dependencies(${PROJECT_NAME} angelscript)

source/server/config.cpp

@@ -22,12 +22,12 @@ along with Foobar. If not, see <http://www.gnu.org/licenses/>.
 
 #include "logger.h"
 #include "sequencer.h"
-#include "sha1_util.h"
 #include "spamfilter.h"
 #include "utils.h"
 
 #include <cmath>
 #include <cstring>
+#include "Poco/SHA1Engine.h"
 
 #ifdef __GNUC__
 
@@ -385,15 +385,20 @@ namespace Config {
     }
 
     bool setPublicPass(const std::string &pub_pass) {
-        if (pub_pass.length() > 0 && pub_pass.size() < 250 &&
-            !SHA1FromString(s_public_password, pub_pass)) {
+        try
+        {
+            Poco::SHA1Engine engine;
+            engine.update(pub_pass);
+            s_public_password = Poco::DigestEngine::digestToHex(engine.digest());
+            Logger::Log(LOG_DEBUG, "sha1(%s) = %s", pub_pass.c_str(), s_public_password.c_str());
+            return true;
+        }
+        catch (...)
+        {
             Logger::Log(LOG_ERROR, "could not generate server SHA1 password hash!");
             s_public_password = "";
             return false;
         }
-        Logger::Log(LOG_DEBUG, "sha1(%s) = %s", pub_pass.c_str(),
-                    s_public_password.c_str());
-        return true;
     }
 
     bool setIPAddr(const std::string &ip) {

source/server/rorserver.cpp

@@ -29,9 +29,6 @@ along with Foobar. If not, see <http://www.gnu.org/licenses/>.
 #include "master-server.h"
 #include "utils.h"
 
-#include "sha1_util.h"
-#include "sha1.h"
-
 #include <iostream>
 #include <cstdlib>
 #include <csignal>
@@ -286,11 +283,6 @@ int main(int argc, char *argv[]) {
         return 1;
     }
 
-    if (!sha1check()) {
-        Logger::Log(LOG_ERROR, "sha1 malfunction!");
-        return -1;
-    }
-
 #ifndef _WIN32
     if (!Config::getForeground()) {
         // no output because of background mode

source/server/sequencer.cpp

@@ -21,7 +21,6 @@ along with Foobar. If not, see <http://www.gnu.org/licenses/>.
 #include "sequencer.h"
 
 #include "messaging.h"
-#include "sha1_util.h"
 #include "receiver.h"
 #include "broadcaster.h"
 #include "userauth.h"