From 234ec46f36755c261cf43ac9ac7c56741b1dca5a Mon Sep 17 00:00:00 2001
From: Gent Semaj <me@ycc.dev>
Date: Sat, 16 Nov 2024 19:16:49 -0800
Subject: [PATCH] Move timingSafeStrcmp to main

---
 src/core/CNStructs.hpp |  1 +
 src/db/login.cpp       | 12 ++----------
 src/main.cpp           | 11 +++++++++++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/core/CNStructs.hpp b/src/core/CNStructs.hpp
index f870f52..74afc82 100644
--- a/src/core/CNStructs.hpp
+++ b/src/core/CNStructs.hpp
@@ -49,6 +49,7 @@ std::string U16toU8(char16_t* src, size_t max);
 size_t U8toU16(std::string src, char16_t* des, size_t max); // returns number of char16_t that was written at des
 time_t getTime();
 time_t getTimestamp();
+int timingSafeStrcmp(const char* a, const char* b);
 void terminate(int);
 
 // The PROTOCOL_VERSION definition can be defined by the build system.
diff --git a/src/db/login.cpp b/src/db/login.cpp
index 25523a1..b7afd29 100644
--- a/src/db/login.cpp
+++ b/src/db/login.cpp
@@ -1,17 +1,9 @@
+#include "core/CNStructs.hpp"
+
 #include "db/internal.hpp"
 
 #include "bcrypt/BCrypt.hpp"
 
-static int timingSafeStrcmp(const char* a, const char* b) {
-    int diff = 0;
-    while (*a && *b) {
-        diff |= *a++ ^ *b++;
-    }
-    diff |= *a;
-    diff |= *b;
-    return diff;
-}
-
 void Database::findAccount(Account* account, std::string login) {
     std::lock_guard<std::mutex> lock(dbCrit);
 
diff --git a/src/main.cpp b/src/main.cpp
index 68e93a8..e57faa1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -222,6 +222,17 @@ time_t getTimestamp() {
     return (time_t)value.count();
 }
 
+// timing safe strcmp implementation for e.g. cookie validation
+int timingSafeStrcmp(const char* a, const char* b) {
+    int diff = 0;
+    while (*a && *b) {
+        diff |= *a++ ^ *b++;
+    }
+    diff |= *a;
+    diff |= *b;
+    return diff;
+}
+
 // convert integer timestamp (in s) to FF systime struct
 sSYSTEMTIME timeStampToStruct(uint64_t time) {