Hash-Info: don't show Salt.Len.Min, Salt.Len.Max and Hashes.w/.Same.Salt if salt_type is not SALT_TYPE_GENERIC or SALT_TYPE_EMBEDDED

src/terminal.c

@@ -724,6 +724,10 @@ void hash_info_single_json (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *us
 
       const char *t_salt_desc = (t == SALT_TYPE_EMBEDDED) ? "embedded" : (t == SALT_TYPE_GENERIC) ? "generic" : "virtual";
 
+      printf ("\"salt_type\": \"%s\", ", t_salt_desc);
+
+      if (hashconfig->salt_type == SALT_TYPE_GENERIC || hashconfig->salt_type == SALT_TYPE_EMBEDDED)
+      {
         u32 t_salt_min = hashconfig->salt_min;
         u32 t_salt_max = hashconfig->salt_max;
 
@@ -736,10 +740,10 @@ void hash_info_single_json (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *us
           }
         }
 
-      printf ("\"salt_type\": \"%s\", ", t_salt_desc);
         printf ("\"salt_len_min\": %u, ", t_salt_min);
         printf ("\"salt_len_max\": %u, ", t_salt_max);
       }
+    }
 
     if ((hashconfig->has_pure_kernel) && (hashconfig->has_optimized_kernel))
     {
@@ -771,6 +775,8 @@ void hash_info_single_json (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *us
       printf ("\"hashes_count_min\": %d, ", hashconfig->hashes_count_min);
       printf ("\"hashes_count_max\": %d, ", hashconfig->hashes_count_max);
 
+      if (hashconfig->salt_type == SALT_TYPE_GENERIC || hashconfig->salt_type == SALT_TYPE_EMBEDDED)
+      {
         bool multi_hash_same_salt = true;
 
         if ((hashconfig->opts_type & OPTS_TYPE_DEEP_COMP_KERNEL) == 0)
@@ -783,6 +789,7 @@ void hash_info_single_json (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *us
 
         printf ("\"hashes_with_same_salt\": %s, ", (multi_hash_same_salt == true) ? "true" : "false");
       }
+    }
 
     if ((hashconfig->st_hash != NULL) && (hashconfig->st_pass != NULL))
     {
@@ -951,6 +958,10 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
 
       const char *t_salt_desc = (t == SALT_TYPE_EMBEDDED) ? "Embedded\0" : (t == SALT_TYPE_GENERIC) ? "Generic\0" : "Virtual\0";
 
+      event_log_info (hashcat_ctx, "  Salt.Type...........: %s", t_salt_desc);
+
+      if (hashconfig->salt_type == SALT_TYPE_GENERIC || hashconfig->salt_type == SALT_TYPE_EMBEDDED)
+      {
         u32 t_salt_min = hashconfig->salt_min;
         u32 t_salt_max = hashconfig->salt_max;
 
@@ -963,10 +974,10 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
           }
         }
 
-      event_log_info (hashcat_ctx, "  Salt.Type...........: %s", t_salt_desc);
         event_log_info (hashcat_ctx, "  Salt.Len.Min........: %u", t_salt_min);
         event_log_info (hashcat_ctx, "  Salt.Len.Max........: %u", t_salt_max);
       }
+    }
 
     if ((hashconfig->has_pure_kernel) && (hashconfig->has_optimized_kernel))
     {
@@ -998,6 +1009,8 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
       event_log_info (hashcat_ctx, "  Hashes.Count.Min....: %d", hashconfig->hashes_count_min);
       event_log_info (hashcat_ctx, "  Hashes.Count.Max....: %d", hashconfig->hashes_count_max);
 
+      if (hashconfig->salt_type == SALT_TYPE_GENERIC || hashconfig->salt_type == SALT_TYPE_EMBEDDED)
+      {
         bool multi_hash_same_salt = true;
 
         if ((hashconfig->opts_type & OPTS_TYPE_DEEP_COMP_KERNEL) == 0)
@@ -1010,6 +1023,7 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
 
         event_log_info (hashcat_ctx, "  Hashes.w/.Same.Salt.: %s", (multi_hash_same_salt == true) ? "Allowed" : "Not allowed");
       }
+    }
 
     if ((hashconfig->st_hash != NULL) && (hashconfig->st_pass != NULL))
     {