Merge branch 'dev' of github.com:xmrig/xmrig into dev

Improved LibreSSL support.
Merge pull request #3680 from benthetechguy/armhf
2025-06-29 12:29:01 +07:00 · 2025-06-29 12:28:35 +07:00 · 2025-06-25 04:14:22 +07:00 · 2025-06-24 15:28:01 -04:00 · 2025-06-23 08:37:15 +07:00 · 2025-06-23 08:36:52 +07:00
5 changed files with 19 additions and 13 deletions
--- 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)$")
+    elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l|armv7ve|armv8l)$")
        set(ARM_TARGET 7)
    endif()
 endif()
--- a/cmake/os.cmake
+++ b/cmake/os.cmake
@ -17,6 +17,8 @@ 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()

@ -43,6 +45,8 @@ 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()

--- a/src/base/kernel/Platform_unix.cpp
+++ b/src/base/kernel/Platform_unix.cpp
@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2025 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2025 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   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
-#ifdef __DragonFly__
+#if defined(__DragonFly__) || defined(XMRIG_OS_OPENBSD)

 bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
 {
-    return true;
+    return false;
 }

 #else
--- a/src/base/net/tls/TlsContext.cpp
+++ b/src/base/net/tls/TlsContext.cpp
@ -1,7 +1,7 @@
 /* XMRig
 * Copyright (c) 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2025 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2025 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   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)
+#if OPENSSL_VERSION_NUMBER < 0x30000000L || (defined(LIBRESSL_VERSION_NUMBER) && !defined(LIBRESSL_HAS_TLS1_3))
 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_VERSION_NUMBER)
+#   if OPENSSL_VERSION_NUMBER >= 0x1010100fL || defined(LIBRESSL_HAS_TLS1_3)
    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_VERSION_NUMBER)
+#   if OPENSSL_VERSION_NUMBER >= 0x1010100fL || defined(LIBRESSL_HAS_TLS1_3)
    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)
+#   if OPENSSL_VERSION_NUMBER < 0x30000000L || (defined(LIBRESSL_VERSION_NUMBER) && !defined(LIBRESSL_HAS_TLS1_3))
    DH *dh = nullptr;

    if (dhparam != nullptr) {
--- 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.0"
+#define APP_VERSION   "6.24.1-dev"
 #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  0
+#define APP_VER_PATCH  1

 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1930)
@ -64,6 +64,8 @@
 #    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
Author	SHA1	Message	Date
XMRig	dd6671bc59	Merge branch 'dev' of github.com:xmrig/xmrig into dev	2025-06-29 12:29:01 +07:00
XMRig	a1ee2fd9d2	Improved LibreSSL support.	2025-06-29 12:28:35 +07:00
xmrig	2619131176	Merge pull request #3680 from benthetechguy/armhf Add armv8l to list of 32 bit ARM targets	2025-06-25 04:14:22 +07:00
Ben Westover	1161f230c5	Add armv8l to list of 32 bit ARM targets armv8l is what CMAKE_SYSTEM_PROCESSOR is set to when an ARMv8 processor is in 32-bit mode, so it should be added to the ARMv7 target list even though it's v8 because it's 32 bits. Currently, it's not in any ARM target list which means x86 is assumed and the build fails.	2025-06-24 15:28:01 -04:00
XMRig	d2363ba28b	v6.24.1-dev	2025-06-23 08:37:15 +07:00
XMRig	1676da1fe9	Merge branch 'master' into dev	2025-06-23 08:36:52 +07:00