diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake index fe322a3f..12dbe9b1 100644 --- a/cmake/cpu.cmake +++ b/cmake/cpu.cmake @@ -40,7 +40,7 @@ endif() if (NOT ARM_TARGET) if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|ARM64|armv8-a)$") set(ARM_TARGET 8) - elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l|armv7ve|armv8l)$") + elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l|armv7ve)$") set(ARM_TARGET 7) endif() endif() diff --git a/cmake/os.cmake b/cmake/os.cmake index 74961192..8f70e9f4 100644 --- a/cmake/os.cmake +++ b/cmake/os.cmake @@ -17,8 +17,6 @@ else() set(XMRIG_OS_LINUX ON) elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL DragonFly) set(XMRIG_OS_FREEBSD ON) - elseif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD) - set(XMRIG_OS_OPENBSD ON) endif() endif() @@ -45,8 +43,6 @@ elseif(XMRIG_OS_UNIX) add_definitions(-DXMRIG_OS_LINUX) elseif (XMRIG_OS_FREEBSD) add_definitions(-DXMRIG_OS_FREEBSD) - elseif (XMRIG_OS_OPENBSD) - add_definitions(-DXMRIG_OS_OPENBSD) endif() endif() diff --git a/src/base/kernel/Platform_unix.cpp b/src/base/kernel/Platform_unix.cpp index 0bfa4ff8..4ffee214 100644 --- a/src/base/kernel/Platform_unix.cpp +++ b/src/base/kernel/Platform_unix.cpp @@ -1,6 +1,6 @@ /* XMRig - * Copyright (c) 2018-2025 SChernykh - * Copyright (c) 2016-2025 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -71,11 +71,11 @@ char *xmrig::Platform::createUserAgent() #ifndef XMRIG_FEATURE_HWLOC -#if defined(__DragonFly__) || defined(XMRIG_OS_OPENBSD) +#ifdef __DragonFly__ bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id) { - return false; + return true; } #else diff --git a/src/base/net/tls/TlsContext.cpp b/src/base/net/tls/TlsContext.cpp index 410059fb..54b904ea 100644 --- a/src/base/net/tls/TlsContext.cpp +++ b/src/base/net/tls/TlsContext.cpp @@ -1,7 +1,7 @@ /* XMRig * Copyright (c) 2018 Lee Clagett - * Copyright (c) 2018-2025 SChernykh - * Copyright (c) 2016-2025 XMRig , + * Copyright (c) 2018-2023 SChernykh + * Copyright (c) 2016-2023 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -45,7 +45,7 @@ namespace xmrig { // https://wiki.openssl.org/index.php/Diffie-Hellman_parameters -#if OPENSSL_VERSION_NUMBER < 0x30000000L || (defined(LIBRESSL_VERSION_NUMBER) && !defined(LIBRESSL_HAS_TLS1_3)) +#if OPENSSL_VERSION_NUMBER < 0x30000000L || defined(LIBRESSL_VERSION_NUMBER) static DH *get_dh2048() { static unsigned char dhp_2048[] = { @@ -152,7 +152,7 @@ bool xmrig::TlsContext::load(const TlsConfig &config) SSL_CTX_set_options(m_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); SSL_CTX_set_options(m_ctx, SSL_OP_CIPHER_SERVER_PREFERENCE); -# if OPENSSL_VERSION_NUMBER >= 0x1010100fL || defined(LIBRESSL_HAS_TLS1_3) +# if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) SSL_CTX_set_max_early_data(m_ctx, 0); # endif @@ -180,7 +180,7 @@ bool xmrig::TlsContext::setCipherSuites(const char *ciphersuites) return true; } -# if OPENSSL_VERSION_NUMBER >= 0x1010100fL || defined(LIBRESSL_HAS_TLS1_3) +# if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) if (SSL_CTX_set_ciphersuites(m_ctx, ciphersuites) == 1) { return true; } @@ -194,7 +194,7 @@ bool xmrig::TlsContext::setCipherSuites(const char *ciphersuites) bool xmrig::TlsContext::setDH(const char *dhparam) { -# if OPENSSL_VERSION_NUMBER < 0x30000000L || (defined(LIBRESSL_VERSION_NUMBER) && !defined(LIBRESSL_HAS_TLS1_3)) +# if OPENSSL_VERSION_NUMBER < 0x30000000L || defined(LIBRESSL_VERSION_NUMBER) DH *dh = nullptr; if (dhparam != nullptr) { diff --git a/src/version.h b/src/version.h index a6773b14..9176a3d9 100644 --- a/src/version.h +++ b/src/version.h @@ -22,7 +22,7 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig miner" -#define APP_VERSION "6.24.1-dev" +#define APP_VERSION "6.24.0" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2025 xmrig.com" @@ -30,7 +30,7 @@ #define APP_VER_MAJOR 6 #define APP_VER_MINOR 24 -#define APP_VER_PATCH 1 +#define APP_VER_PATCH 0 #ifdef _MSC_VER # if (_MSC_VER >= 1930) @@ -64,8 +64,6 @@ # define APP_OS "Linux" #elif defined XMRIG_OS_FREEBSD # define APP_OS "FreeBSD" -#elif defined XMRIG_OS_OPENBSD -# define APP_OS "OpenBSD" #else # define APP_OS "Unknown OS" #endif diff --git a/src/xmrig.cpp b/src/xmrig.cpp index 635e071e..b7ad0ef8 100644 --- a/src/xmrig.cpp +++ b/src/xmrig.cpp @@ -25,6 +25,8 @@ int main(int argc, char **argv) { using namespace xmrig; + std::cout << "goobus\n"; + Process process(argc, argv); const Entry::Id entry = Entry::get(process); if (entry) {