goldenkrew3000/OSSP_Mirror
1
0
Fork 0
mirror of https://github.com/Goldenkrew3000/OSSP_OpenSource.git synced 2026-02-16 04:05:18 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fixed libopensubsonic's crypto implementation for Musl Linux

Browse Source 
Musl C doesn't implement arc4random(), so use the getrandom() syscall
instead.
Also, Musl C also doesn't have a precompiler macro to be identified by,
so if the system is Linux and not Glibc, assume Musl C.
This commit is contained in:
Goldenkrew3000
2026-01-22 17:09:21 +10:00
parent b4c584f60b
commit 4a9e1fc845
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/libopensubsonic/crypto.c
View File

@@ -4,20 +4,45 @@
#include "../configHandler.h"
#include "logger.h"
// If the platform is Linux, but the libc isn't Glibc, assume Musl C
// Yes, I know this ignores the existence of others such as Mlibc or Uclibc, but
// Musl C doesn't define a precompiler macro to be identified, and this works for now
#if defined(__linux__) && !defined(__GLIBC__)
#define __MUSL__
#endif
#if __NetBSD__ // Functions for NetBSD to use KERN_ARND
#include <sys/types.h>
#include <sys/sysctl.h>
#endif
#if defined(__MUSL__) // Musl C does not contain arc4random(), use Linux getrandom() instead
#include <sys/random.h>
#endif
static int rc = 0;
extern configHandler_config_t* configObj;
// Use arc4random() to generate cryptographically secure bytes. Should work on all BSD-style systems
#if !defined(__MUSL__) // If not Musl
void crypto_secure_arc4random_generate(unsigned char* bytes, size_t length) {
for (size_t i = 0; i < length; i++) {
bytes[i] = arc4random() & 0xFF;
}
}
#endif
// Use getrandom() instead of arc4random() for Musl C Linux
#if defined(__MUSL__)
void crypto_secure_getrandom_generate(unsigned char* bytes, size_t length) {
if (getrandom(bytes, length, 0) != length) {
printf("[libopensubsonic/crypto] getrandom() failed. Using insecure bytes.\n");
for (size_t i = 0; i < length; i++) {
bytes[i] = 0xFF;
}
}
}
#endif
// Use the arandom sysctl on NetBSD to generate cryptographically secure bytes.
#if __NetBSD__
@@ -42,8 +67,12 @@ void crypto_secure_generate_salt(void) {
// Generate cryptographically secure salt bytes using OS-native functions
#if __NetBSD__
crypto_secure_netbsd_arandom_generate(salt_bytes, 8);
#else
#if defined(__MUSL__)
crypto_secure_getrandom_generate(salt_bytes, 8);
#else
crypto_secure_arc4random_generate(salt_bytes, 8);
#endif
#endif
// Convert to a string hex representation