arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-07-22 06:28:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4294 from Oblivionsage/fix-terminal-todo-investigation

Browse Source 
Fix terminal TODO: Implement Windows system info display
This commit is contained in:
hashcat-bot 2025-07-09 15:01:19 +02:00 committed by GitHub
commit ad17d36270
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/terminal.c
View File

@ -1254,21 +1254,60 @@ void backend_info (hashcat_ctx_t *hashcat_ctx)
} }
#if defined (_WIN) || defined (__CYGWIN__) || defined (__MSYS__) #if defined (_WIN) || defined (__CYGWIN__) || defined (__MSYS__)
// TODO // Get Windows system information
SYSTEM_INFO sysinfo;
OSVERSIONINFO osvi;
char platform_buf[256] = "N/A";
char release_buf[256] = "N/A";
GetSystemInfo (&sysinfo);
// Initialize version info structure
ZeroMemory (&osvi, sizeof (OSVERSIONINFO));
osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
bool rc_version = (GetVersionEx (&osvi) != 0);
// Get processor architecture string
switch (sysinfo.wProcessorArchitecture)
{
case PROCESSOR_ARCHITECTURE_AMD64:
snprintf (platform_buf, sizeof (platform_buf), "x86_64");
break;
case PROCESSOR_ARCHITECTURE_INTEL:
snprintf (platform_buf, sizeof (platform_buf), "x86");
break;
case PROCESSOR_ARCHITECTURE_ARM64:
snprintf (platform_buf, sizeof (platform_buf), "ARM64");
break;
case PROCESSOR_ARCHITECTURE_ARM:
snprintf (platform_buf, sizeof (platform_buf), "ARM");
break;
default:
snprintf (platform_buf, sizeof (platform_buf), "Unknown");
}
// Get Windows version string
if (rc_version)
{
snprintf (release_buf, sizeof (release_buf), "%lu.%lu.%lu",
osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber);
}
if (user_options->machine_readable == false) if (user_options->machine_readable == false)
{ {
event_log_info (hashcat_ctx, "OS.Name......: Windows"); event_log_info (hashcat_ctx, "OS.Name......: Windows");
event_log_info (hashcat_ctx, "OS.Release...: N/A"); event_log_info (hashcat_ctx, "OS.Release...: %s", release_buf);
event_log_info (hashcat_ctx, "HW.Platform..: N/A"); event_log_info (hashcat_ctx, "HW.Platform..: %s", platform_buf);
event_log_info (hashcat_ctx, "HW.Model.....: N/A"); event_log_info (hashcat_ctx, "HW.Model.....: N/A");
} }
else else
{ {
printf ("\"OS\": { "); printf ("\"OS\": { ");
printf ("\"Name\": \"%s\", ", "Windows"); printf ("\"Name\": \"%s\", ", "Windows");
printf ("\"Release\": \"%s\" }, ", "N/A"); printf ("\"Release\": \"%s\" }, ", release_buf);
printf ("\"Hardware\": { "); printf ("\"Hardware\": { ");
printf ("\"Platform\": \"%s\", ", "N/A"); printf ("\"Platform\": \"%s\", ", platform_buf);
printf ("\"Model\": \"%s\" } ", "N/A"); printf ("\"Model\": \"%s\" } ", "N/A");
printf ("}, "); printf ("}, ");
} }