diff --git a/hashcat.hctune b/hashcat.hctune index 5f645ff7a..f9655a3fb 100644 --- a/hashcat.hctune +++ b/hashcat.hctune @@ -73,9 +73,6 @@ Quadro_K6000 ALIAS_nv_real_simd Quadro_K600 ALIAS_nv_real_simd Quadro_Plex_7000 ALIAS_nv_real_simd -NVIDIA_NVS_310 ALIAS_nv_real_simd -NVIDIA_NVS_315 ALIAS_nv_real_simd -NVIDIA_NVS_510 ALIAS_nv_real_simd NVS_310 ALIAS_nv_real_simd NVS_315 ALIAS_nv_real_simd NVS_4200M ALIAS_nv_real_simd @@ -197,7 +194,7 @@ Quadro_M500M ALIAS_nv_sm50_or_higher Quadro_M5500M ALIAS_nv_sm50_or_higher Quadro_M600M ALIAS_nv_sm50_or_higher -NVIDIA_NVS_810 ALIAS_nv_sm50_or_higher +NVS_810 ALIAS_nv_sm50_or_higher GeForce_GTX_750 ALIAS_nv_sm50_or_higher GeForce_GTX_750_Ti ALIAS_nv_sm50_or_higher @@ -228,7 +225,7 @@ TITAN_Xp ALIAS_nv_sm50_or_higher TITAN_V ALIAS_nv_sm50_or_higher TITAN_RTX ALIAS_nv_sm50_or_higher -NVIDIA_Tegra_X1 ALIAS_nv_sm50_or_higher +Tegra_X1 ALIAS_nv_sm50_or_higher GeForce_910M ALIAS_nv_sm50_or_higher GeForce_920M ALIAS_nv_sm50_or_higher @@ -264,10 +261,19 @@ GeForce_MX130 ALIAS_nv_sm50_or_higher GeForce_MX150 ALIAS_nv_sm50_or_higher GeForce_RTX_2060 ALIAS_nv_sm50_or_higher +GeForce_RTX_2060_SUPER ALIAS_nv_sm50_or_higher GeForce_RTX_2070 ALIAS_nv_sm50_or_higher +GeForce_RTX_2070_SUPER ALIAS_nv_sm50_or_higher GeForce_RTX_2080 ALIAS_nv_sm50_or_higher +GeForce_RTX_2080_SUPER ALIAS_nv_sm50_or_higher GeForce_RTX_2080_Ti ALIAS_nv_sm50_or_higher +GeForce_RTX_3060 ALIAS_nv_sm50_or_higher +GeForce_RTX_3060_Ti ALIAS_nv_sm50_or_higher +GeForce_RTX_3070 ALIAS_nv_sm50_or_higher +GeForce_RTX_3080 ALIAS_nv_sm50_or_higher +GeForce_RTX_3090 ALIAS_nv_sm50_or_higher + ############# ## ENTRIES ## ############# @@ -367,13 +373,17 @@ DEVICE_TYPE_CPU * 8900 1 N DEVICE_TYPE_GPU * 8900 1 N 1 DEVICE_TYPE_CPU * 9300 1 N 1 DEVICE_TYPE_GPU * 9300 1 N 1 -DEVICE_TYPE_CPU * 15700 1 N 1 -DEVICE_TYPE_GPU * 15700 1 1 1 -DEVICE_TYPE_CPU * 22700 1 N 1 -DEVICE_TYPE_GPU * 22700 1 N 1 +DEVICE_TYPE_CPU * 15700 1 N 1 +DEVICE_TYPE_GPU * 15700 1 1 1 +DEVICE_TYPE_CPU * 22700 1 N 1 +DEVICE_TYPE_GPU * 22700 1 N 1 -GeForce_GTX_980 * 8900 1 28 1 -GeForce_GTX_980 * 9300 1 128 1 -GeForce_GTX_980 * 15700 1 1 1 -GeForce_GTX_980 * 22700 1 28 1 +GeForce_GTX_980 * 8900 1 28 1 +GeForce_GTX_980 * 9300 1 128 1 +GeForce_GTX_980 * 15700 1 1 1 +GeForce_GTX_980 * 22700 1 28 1 +GeForce_RTX_2080_Ti * 8900 1 68 1 +GeForce_RTX_2080_Ti * 9300 1 544 1 +GeForce_RTX_2080_Ti * 15700 1 4 1 +GeForce_RTX_2080_Ti * 22700 1 N 1 diff --git a/src/tuningdb.c b/src/tuningdb.c index 1d9d34cd7..cfdb70a86 100644 --- a/src/tuningdb.c +++ b/src/tuningdb.c @@ -316,7 +316,7 @@ void tuning_db_destroy (hashcat_ctx_t *hashcat_ctx) memset (tuning_db, 0, sizeof (tuning_db_t)); } -tuning_db_entry_t *tuning_db_search (hashcat_ctx_t *hashcat_ctx, const char *device_name, const cl_device_type device_type, int attack_mode, const int hash_mode) +tuning_db_entry_t *tuning_db_search_real (hashcat_ctx_t *hashcat_ctx, const char *device_name, const cl_device_type device_type, int attack_mode, const int hash_mode) { tuning_db_t *tuning_db = hashcat_ctx->tuning_db; @@ -423,3 +423,21 @@ tuning_db_entry_t *tuning_db_search (hashcat_ctx_t *hashcat_ctx, const char *dev return entry; } + +tuning_db_entry_t *tuning_db_search (hashcat_ctx_t *hashcat_ctx, const char *device_name, const cl_device_type device_type, int attack_mode, const int hash_mode) +{ + tuning_db_entry_t *entry; + + const char *NV_prefix = (const char *) "NVIDIA "; + + if (memcmp (device_name, NV_prefix, strlen (NV_prefix)) == 0) + { + entry = tuning_db_search_real (hashcat_ctx, device_name + strlen (NV_prefix), device_type, attack_mode, hash_mode); + + if (entry) return entry; + } + + entry = tuning_db_search_real (hashcat_ctx, device_name, device_type, attack_mode, hash_mode); + + return entry; +}