refactor: various fixes

- Drop thread priority by 1
- Reduce signed/unsigned conversions

.gitignore

@@ -1,4 +1,3 @@
 build/
 .cache/
 cmake-build-*
-.vscode/

CMakeLists.txt

@@ -1,27 +1,19 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.10)
 
 project(kgg-dec VERSION 0.6.0 LANGUAGES CXX)
 
-option(USE_SYSTEM_SQLITE3 "Use system SQLite3 (if not using WinSQLite3 and available)" ON)
+option(USE_WIN_SQLITE3 "Use Windows SQLite3 (MSVC Only)" ${MSVC})
-option(USE_OPENSSL "Use OpenSSL API (if not using WinCrypto API and available)" ON)
+option(USE_WIN_CRYPTO "Use Windows Crypto API" ${WIN32})
 
-if(WIN32)
-    option(USE_WIN_SQLITE3 "Use Windows SQLite3 (MSVC Only)" ${MSVC})
-    option(USE_WIN_CRYPTO "Use Windows Crypto API" ${WIN32})
-else()
-    set(USE_WIN_SQLITE3 OFF)
-    set(USE_WIN_CRYPTO OFF)
-endif()
-
-# Setup CryptoAPI
-if (NOT USE_WIN_CRYPTO AND USE_OPENSSL)
-    find_package(OpenSSL REQUIRED)
-endif()
-
-include(cmake/SetupSQLite3.cmake)
 add_subdirectory(third-party/aes)
 add_subdirectory(third-party/md5)
 
+include(cmake/FindWinSQLite3.cmake)
+if (NOT WinSQLite3_Found)
+    message("including sqlite3 to the build")
+    add_subdirectory(third-party/sqlite3)
+endif ()
+
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -43,29 +35,19 @@ target_include_directories(kgg-dec
         src/tc_tea
 )
 
-# Base crypto implementations
 target_link_libraries(kgg-dec PRIVATE libaes libmd5)
-if (USE_WIN_CRYPTO)
-    target_compile_definitions(kgg-dec PRIVATE USE_WIN_CRYPTO=1)
-elseif(USE_OPENSSL)
-    target_compile_definitions(kgg-dec PRIVATE USE_OPENSSL=1)
-endif ()
-
-# Win32 specific
 if (WIN32)
     target_link_libraries(kgg-dec PRIVATE shell32 ole32)
-    target_compile_definitions(kgg-dec PRIVATE NOMINMAX)
 endif ()
-
-# SQLite3
 if (WinSQLite3_Found)
     target_link_libraries(kgg-dec PRIVATE WinSQLite3)
     target_include_directories(kgg-dec PRIVATE ${WindowsKitInclude})
-elseif(SQLite3_FOUND)
-    target_link_libraries(kgg-dec PRIVATE SQLite::SQLite3)
 else ()
     target_link_libraries(kgg-dec PRIVATE sqlite3)
 endif ()
-
+target_compile_definitions(kgg-dec PRIVATE NOMINMAX)
-# Extra definitions
 target_compile_definitions(kgg-dec PRIVATE KGGDEC_PROJECT_VERSION="${PROJECT_VERSION}")
+
+if (USE_WIN_CRYPTO)
+    target_compile_definitions(kgg-dec PRIVATE USE_WIN_CRYPTO=1)
+endif ()

cmake/FindWinSQLite3.cmake

@@ -12,13 +12,3 @@ if (MSVC AND USE_WIN_SQLITE3)
         message("Using WinSQLite3 from Windows SDK (${WindowsKitVersion}).")
     endif ()
 endif ()
-
-if (NOT WinSQLite3_Found)
-    if (USE_SYSTEM_SQLITE3)
-        message("Using existing SQLite3.")
-        find_package(SQLite3 REQUIRED)
-    else()
-        message("including sqlite3 to the build")
-        add_subdirectory(third-party/sqlite3)
-    endif()
-endif()

src/jobs.hpp

@@ -39,8 +39,8 @@ class KggTask {
         std::ifstream kgg_stream_in(kgg_path_, std::ios::binary);
         std::array<uint8_t, 0x400> header{};
         kgg_stream_in.read(reinterpret_cast<char*>(header.data()), header.size());
-        if (!std::equal(kMagicHeader.cbegin(), kMagicHeader.cend(), header.cbegin())) {
+        if (std::equal(kMagicHeader.cbegin(), kMagicHeader.cend(), header.cbegin())) {
-            warning(LSR_STR("invalid kgg header (not a kgg file)"));
+            warning(LSR_STR("invalid kgg header"));
             return;
         }
         const auto offset_to_audio = Endian::le_read<uint32_t>(&header[0x10]);

third-party/aes/CMakeLists.txt

@@ -7,16 +7,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(SOURCES)
 if (USE_WIN_CRYPTO)
-    message("Using Windows Crypto API for AES-CBC-128")
     list(APPEND SOURCES aes_win32.cpp)
-elseif (USE_OPENSSL)
-    message("Using OpenSSL API for AES-CBC-128")
-    find_package(OpenSSL REQUIRED)    
-    list(APPEND SOURCES aes_openssl.cpp)
 else ()
     # Tiny AES in C (https://github.com/kokke/tiny-AES-c/)
     #   is licensed under the Unlicense license.
-    message("Using included AES-CBC-128 implementation")
     list(APPEND SOURCES aes.cpp)
 endif ()
 
@@ -29,7 +23,4 @@ target_include_directories(libaes
 if (USE_WIN_CRYPTO)
     target_link_libraries(libaes PRIVATE bcrypt)
     target_compile_definitions(libaes PRIVATE USE_WIN_CRYPTO=1)
-elseif (USE_OPENSSL)
-    target_link_libraries(libaes PRIVATE OpenSSL::Crypto)
-    target_compile_definitions(libaes PRIVATE USE_OPENSSL=1)
 endif ()

third-party/aes/aes.h

@@ -7,8 +7,6 @@
 #include <windows.h>
 
 #include <bcrypt.h>
-#elif USE_OPENSSL
-#include <openssl/evp.h>
 #endif
 
 namespace AES {
@@ -22,8 +20,6 @@ struct AES_ctx {
     BCRYPT_ALG_HANDLE hAlg;
     BCRYPT_KEY_HANDLE hKey;
     uint8_t iv[0x10];
-#elif USE_OPENSSL
-    EVP_CIPHER_CTX* cipher_ctx;
 #else
     uint8_t RoundKey[kKeyExpansionSize];
     uint8_t Iv[16];
@@ -39,7 +35,7 @@ bool AES_init_ctx_iv(AES_ctx* ctx, const uint8_t* key, const uint8_t* iv);
 size_t AES_CBC_encrypt_buffer(AES_ctx* ctx, uint8_t* buf, size_t length);
 size_t AES_CBC_decrypt_buffer(AES_ctx* ctx, uint8_t* buf, size_t length);
 
-#if USE_WIN_CRYPTO || USE_OPENSSL
+#if USE_WIN_CRYPTO
 bool AES_cleanup(AES_ctx* ctx);
 #else
 inline bool AES_cleanup(AES_ctx* ctx) {

third-party/aes/aes_openssl.cpp

@@ -1,43 +0,0 @@
-#include <cassert>
-#include <cstring>
-
-#include "aes.h"
-
-namespace AES {
-
-bool AES_init_ctx_iv(AES_ctx* ctx, const uint8_t* key, const uint8_t* iv) {
-    ctx->cipher_ctx = EVP_CIPHER_CTX_new();
-    if (!ctx->cipher_ctx) {
-        return false;
-    }
-
-    if (EVP_DecryptInit_ex(ctx->cipher_ctx, EVP_aes_128_cbc(), nullptr, key, iv) != 1) {
-        AES_cleanup(ctx);
-        return false;
-    }
-
-    EVP_CIPHER_CTX_set_padding(ctx->cipher_ctx, 0);
-    return true;
-}
-
-size_t AES_CBC_encrypt_buffer(struct AES_ctx* ctx, uint8_t* buf, size_t length) {
-    // not implemented
-    return 0;
-}
-
-size_t AES_CBC_decrypt_buffer(struct AES_ctx* ctx, uint8_t* buf, size_t length) {
-    auto buf_len = static_cast<int>(length);
-    EVP_DecryptUpdate(ctx->cipher_ctx, buf, &buf_len, buf, buf_len);
-    assert(buf_len == length && "AES_CBC_decrypt_buffer: buffer length mismatch");
-    return buf_len;
-}
-
-bool AES_cleanup(AES_ctx* ctx) {
-    if (ctx->cipher_ctx) {
-        EVP_CIPHER_CTX_free(ctx->cipher_ctx);
-        ctx->cipher_ctx = nullptr;
-    }
-    return true;
-}
-
-}  // namespace AES

third-party/md5/CMakeLists.txt

@@ -7,16 +7,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(SOURCES)
 if (USE_WIN_CRYPTO)
-    message("Using Windows Crypto API for MD5")
     list(APPEND SOURCES md5_win32.cpp)
-elseif (USE_OPENSSL)
-    message("Using OpenSSL API for MD5")
-    find_package(OpenSSL REQUIRED)
-    list(APPEND SOURCES md5_openssl.cpp)
 else ()
     # Derived from the "RSA Data Security, Inc. MD5 Message-Digest Algorithm":
     # https://github.com/freebsd/freebsd-src/blob/release/14.2.0/sys/kern/md5c.c
-    message("Using included MD5 implementation")
     list(APPEND SOURCES md5.cpp)
 endif ()
 
@@ -30,7 +24,4 @@ target_include_directories(libmd5
 if (USE_WIN_CRYPTO)
     target_link_libraries(libmd5 PRIVATE crypt32)
     target_compile_definitions(libmd5 PRIVATE USE_WIN_CRYPTO=1)
-elseif (USE_OPENSSL)
-    target_link_libraries(libmd5 PRIVATE OpenSSL::Crypto)
-    target_compile_definitions(libmd5 PRIVATE USE_OPENSSL=1)
 endif ()

third-party/md5/md5.h

@@ -1,23 +1,21 @@
 #pragma once
 
-#include <cstdint>
-
 #if USE_WIN_CRYPTO
 #include <windows.h>
 
 #include <wincrypt.h>
-#elif USE_OPENSSL
-#include <openssl/evp.h>
 #endif
 
+#include <cstdint>
+
+#define MD5_BLOCK_LENGTH 64
 #define MD5_DIGEST_LENGTH 16
+#define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1)
 
 struct MD5_CTX {
 #if USE_WIN_CRYPTO
     HCRYPTPROV hProv;
     HCRYPTHASH hHash;
-#elif USE_OPENSSL
-    EVP_MD_CTX* md_ctx;
 #else
     uint64_t count;           /* number of bits, modulo 2^64 (lsb first) */
     uint32_t state[4];        /* state (ABCD) */
@@ -25,8 +23,8 @@ struct MD5_CTX {
 #endif
 };
 
-#if USE_WIN_CRYPTO || USE_OPENSSL
+#if USE_WIN_CRYPTO
-bool md5_init(MD5_CTX* ctx);
+bool md5_init(MD5_CTX* context);
 bool md5_cleanup(MD5_CTX* ctx);
 #else
 /* MD5 initialization. Begins an MD5 operation, writing a new context. */

third-party/md5/md5_openssl.cpp

@@ -1,32 +0,0 @@
-#include <openssl/evp.h>
-#include <cstring>
-#include "md5.h"
-
-bool md5_init(MD5_CTX* ctx) {
-    memset(ctx, 0, sizeof(*ctx));
-
-    ctx->md_ctx = EVP_MD_CTX_new();
-    if (!ctx->md_ctx) {
-        return false;
-    }
-
-    return EVP_DigestInit_ex(ctx->md_ctx, EVP_md5(), nullptr) == 1;
-}
-
-bool md5_cleanup(MD5_CTX* ctx) {
-    if (ctx->md_ctx != nullptr) {
-        EVP_MD_CTX_free(ctx->md_ctx);
-    }
-    memset(ctx, 0xcc, sizeof(*ctx));
-    return true;
-}
-
-void md5_update(MD5_CTX* ctx, const uint8_t* in, size_t len) {
-    EVP_DigestUpdate(ctx->md_ctx, in, len);
-}
-
-void md5_final(MD5_CTX* ctx, uint8_t* digest) {
-    unsigned int len{MD5_DIGEST_LENGTH};
-    EVP_DigestFinal_ex(ctx->md_ctx, digest, &len);
-    EVP_MD_CTX_reset(ctx->md_ctx);
-}