Add mangle to mode 60 attack 3

[hashcat.git] / src / ext_nvapi.c

diff --git a/src/ext_nvapi.c b/src/ext_nvapi.c
index 671cb55..4aada02 100644 (file)
--- a/src/ext_nvapi.c
+++ b/src/ext_nvapi.c
@@ -9,7 +9,7 @@
 
 int nvapi_init (NVAPI_PTR *nvapi)
 {
-  if (!nvapi) return (-1);
+  if (!nvapi) return -1;
 
   memset (nvapi, 0, sizeof (NVAPI_PTR));
 
@@ -28,7 +28,7 @@ int nvapi_init (NVAPI_PTR *nvapi)
     //if (data.quiet == 0)
     //  log_info ("WARNING: load NVAPI library failed, proceed without NVAPI HWMon enabled.");
 
-    return (-1);
+    return -1;
   }
 
   HC_LOAD_FUNC(nvapi, nvapi_QueryInterface,             NVAPI_QUERYINTERFACE,             NVAPI,                0)
@@ -39,6 +39,7 @@ int nvapi_init (NVAPI_PTR *nvapi)
   HC_LOAD_ADDR(nvapi, NvAPI_GPU_GetPerfPoliciesInfo,    NVAPI_GPU_GETPERFPOLICIESINFO,    nvapi_QueryInterface, 0x409D9841, NVAPI, 0)
   HC_LOAD_ADDR(nvapi, NvAPI_GPU_GetPerfPoliciesStatus,  NVAPI_GPU_GETPERFPOLICIESSTATUS,  nvapi_QueryInterface, 0x3D358A0C, NVAPI, 0)
   HC_LOAD_ADDR(nvapi, NvAPI_GPU_SetCoolerLevels,        NVAPI_GPU_SETCOOLERLEVELS,        nvapi_QueryInterface, 0x891FA0AE, NVAPI, 0)
+  HC_LOAD_ADDR(nvapi, NvAPI_GPU_RestoreCoolerSettings,  NVAPI_GPU_RESTORECOOLERSETTINGS,  nvapi_QueryInterface, 0x8F6ED0FB, NVAPI, 0)
 
   return 0;
 }
@@ -56,7 +57,7 @@ void nvapi_close (NVAPI_PTR *nvapi)
 
 int hm_NvAPI_Initialize (NVAPI_PTR *nvapi)
 {
-  if (!nvapi) return (-1);
+  if (!nvapi) return -1;
 
   NvAPI_Status NvAPI_rc = nvapi->NvAPI_Initialize ();
 
@@ -76,7 +77,7 @@ int hm_NvAPI_Initialize (NVAPI_PTR *nvapi)
 
 int hm_NvAPI_Unload (NVAPI_PTR *nvapi)
 {
-  if (!nvapi) return (-1);
+  if (!nvapi) return -1;
 
   NvAPI_Status NvAPI_rc = nvapi->NvAPI_Unload ();
 
@@ -94,14 +95,14 @@ int hm_NvAPI_Unload (NVAPI_PTR *nvapi)
 
 int hm_NvAPI_GetErrorMessage (NVAPI_PTR *nvapi, NvAPI_Status NvAPI_rc, NvAPI_ShortString string)
 {
-  if (!nvapi) return (-1);
+  if (!nvapi) return -1;
 
   return nvapi->NvAPI_GetErrorMessage (NvAPI_rc, string);
 }
 
 int hm_NvAPI_EnumPhysicalGPUs (NVAPI_PTR *nvapi, NvPhysicalGpuHandle nvGPUHandle[NVAPI_MAX_PHYSICAL_GPUS], NvU32 *pGpuCount)
 {
-  if (!nvapi) return (-1);
+  if (!nvapi) return -1;
 
   NvAPI_Status NvAPI_rc = nvapi->NvAPI_EnumPhysicalGPUs (nvGPUHandle, pGpuCount);
 
@@ -119,7 +120,7 @@ int hm_NvAPI_EnumPhysicalGPUs (NVAPI_PTR *nvapi, NvPhysicalGpuHandle nvGPUHandle
 
 int hm_NvAPI_GPU_GetPerfPoliciesInfo (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhysicalGpu, NV_GPU_PERF_POLICIES_INFO_PARAMS_V1 *perfPolicies_info)
 {
-  if (!nvapi) return (-1);
+  if (!nvapi) return -1;
 
   NvAPI_Status NvAPI_rc = nvapi->NvAPI_GPU_GetPerfPoliciesInfo (hPhysicalGpu, perfPolicies_info);
 
@@ -137,7 +138,7 @@ int hm_NvAPI_GPU_GetPerfPoliciesInfo (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhy
 
 int hm_NvAPI_GPU_GetPerfPoliciesStatus (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhysicalGpu, NV_GPU_PERF_POLICIES_STATUS_PARAMS_V1 *perfPolicies_status)
 {
-  if (!nvapi) return (-1);
+  if (!nvapi) return -1;
 
   NvAPI_Status NvAPI_rc = nvapi->NvAPI_GPU_GetPerfPoliciesStatus (hPhysicalGpu, perfPolicies_status);
 
@@ -155,7 +156,7 @@ int hm_NvAPI_GPU_GetPerfPoliciesStatus (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hP
 
 int hm_NvAPI_GPU_SetCoolerLevels (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhysicalGpu, NvU32 coolerIndex, NV_GPU_COOLER_LEVELS *pCoolerLevels)
 {
-  if (!nvapi) return (-1);
+  if (!nvapi) return -1;
 
   NvAPI_Status NvAPI_rc = nvapi->NvAPI_GPU_SetCoolerLevels (hPhysicalGpu, coolerIndex, pCoolerLevels);
 
@@ -171,6 +172,24 @@ int hm_NvAPI_GPU_SetCoolerLevels (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhysica
   return NvAPI_rc;
 }
 
+int hm_NvAPI_GPU_RestoreCoolerSettings (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhysicalGpu, NvU32 coolerIndex)
+{
+  if (!nvapi) return -1;
+
+  NvAPI_Status NvAPI_rc = nvapi->NvAPI_GPU_RestoreCoolerSettings (hPhysicalGpu, coolerIndex);
+
+  if (NvAPI_rc != NVAPI_OK)
+  {
+    NvAPI_ShortString string = { 0 };
+
+    hm_NvAPI_GetErrorMessage (nvapi, NvAPI_rc, string);
+
+    log_info ("WARN: %s %d %s\n", "NvAPI_GPU_RestoreCoolerSettings()", NvAPI_rc, string);
+  }
+
+  return NvAPI_rc;
+}
+
 #ifdef __MINGW64__
 
 void __security_check_cookie (uintptr_t _StackCookie)