TeamTofuShop/segatools
24
36
Fork 24
forked from Hay1tsme/segatools
Code Issues 4 Pull Requests 4 Actions Packages Releases 15 Wiki Activity

common: add OpenSSL patch comments, bump capnhook

Browse Source
This commit is contained in:
Dniel97
2025-10-12 12:42:06 +02:00
parent 19cd7cb8df
commit 6fe8744b0f
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
common/platform/openssl.c
View File

@ -33,23 +33,32 @@ static const struct hook_symbol openssl_hooks[] = {
}, },
}; };
int check_intel_sha_extension() { static int check_intel_sha_extension() {
int n_ids;
int is_intel;
char vendor[0x20] = {0};
int cpui[4] = {0}; int cpui[4] = {0};
__cpuid(cpui, 0); /* OpenSSL 1.0.2 beta to 1.0.2k contain bugs that crash "AM Daemon" due to
int nIds_ = cpui[0]; bad SHA values on processors with the SHA extensions, such as Intel 10th
gen CPUs or higher.
Credits: kagaminehaku */
__cpuid(cpui, 0);
n_ids = cpui[0];
char vendor[0x20] = {0};
*((int *) vendor) = cpui[1]; *((int *) vendor) = cpui[1];
*((int *) (vendor + 4)) = cpui[3]; *((int *) (vendor + 4)) = cpui[3];
*((int *) (vendor + 8)) = cpui[2]; *((int *) (vendor + 8)) = cpui[2];
// Intel CPU /* Check that the CPU vendor is Intel */
int isIntel = (strcmp(vendor, "GenuineIntel") == 0); is_intel = (strcmp(vendor, "GenuineIntel") == 0);
if (isIntel && nIds_ >= 7) { if (is_intel && n_ids >= 7) {
__cpuidex(cpui, 7, 0); __cpuidex(cpui, 7, 0);
// SHA extension
/* SHA extensions supported */
return (cpui[1] & (1 << 29)) != 0; return (cpui[1] & (1 << 29)) != 0;
} }
@ -70,7 +79,7 @@ HRESULT openssl_hook_init(const struct openssl_config *cfg)
if (cfg->override) { if (cfg->override) {
dprintf("OpenSSL: hook enabled.\n"); dprintf("OpenSSL: hook enabled.\n");
} else if (check_intel_sha_extension()) { } else if (!check_intel_sha_extension()) {
dprintf("OpenSSL: Intel CPU SHA extension detected, hook enabled.\n"); dprintf("OpenSSL: Intel CPU SHA extension detected, hook enabled.\n");
} else { } else {
return S_FALSE; return S_FALSE;
@ -91,7 +100,8 @@ HRESULT openssl_hook_init(const struct openssl_config *cfg)
static char * __cdecl hook_getenv(const char *name) static char * __cdecl hook_getenv(const char *name)
{ {
/* Intercept OpenSSL CPU-cap override */ /* Overrides OpenSSL's Intel CPU identification. This disables the OpenSSL
code check for SHA extensions. */
if (name && strcmp(name, "OPENSSL_ia32cap") == 0) { if (name && strcmp(name, "OPENSSL_ia32cap") == 0) {
static char override[] = "~0x20000000"; static char override[] = "~0x20000000";

2
subprojects/capnhook.wrap
View File

@ -1,4 +1,4 @@
[wrap-git] [wrap-git]
directory = capnhook directory = capnhook
url = https://gitea.tendokyu.moe/TeamTofuShop/capnhook url = https://gitea.tendokyu.moe/TeamTofuShop/capnhook
revision = dafd0aa336ab80ba87a82370a9dc95a3389ef5e5 revision = 252465b23f51f36206e614190496663425f4ee5d