Count/report hashes removed by --salts or --cost options

Closes #5699

Author: magnumripper

src/john.c

@@ -1084,7 +1084,7 @@ static void john_load(void)
 	}
 
 	if (options.flags & FLG_PASSWD) {
-		int total;
+		int total, cracked;
 		int i = 0;
 
 		if (options.flags & FLG_SHOW_CHK) {
@@ -1241,16 +1241,16 @@ static void john_load(void)
  */
 		load_extra_pots(&database, &ldr_load_pot_file);
 
-		total = ldr_fix_database(&database);
+		total = database.password_count;
+		cracked = ldr_fix_database(&database);
 
 		if (database.password_count && options.regen_lost_salts)
 			build_fake_salts_for_regen_lost(&database);
 
-		if (john_main_process && database.password_count < total) {
-			int count = total - database.password_count;
+		if (john_main_process && cracked) {
 			printf("Cracked %d password hash%s%s%s%s, use \"--show\"\n",
-			    count, count != 1 ? "es" : "",
-			    loaded_extra_pots ? "" : (count != 1 ? " (are in " : " (is in "),
+			    cracked, cracked != 1 ? "es" : "",
+			    loaded_extra_pots ? "" : (cracked != 1 ? " (are in " : " (is in "),
 			    loaded_extra_pots ? "" : path_expand(options.activepot),
 			    loaded_extra_pots ? "" : ")");
 		}

src/loader.c

@@ -2038,6 +2038,7 @@ static void ldr_fill_user_words(struct db_main *db)
 int ldr_fix_database(struct db_main *db)
 {
 	int total = db->password_count;
+	int cracked = 0;
 
 	ldr_init_salts(db);
 	MEM_FREE(db->password_hash);
@@ -2047,20 +2048,34 @@ int ldr_fix_database(struct db_main *db)
 		MEM_FREE(db->salt_hash);
 
 	if (!ldr_loading_testdb) {
+		FILE *out_file = options.loader.showuncracked ? stderr : stdout;
+
 		if (db->options->best_pps) {
 			ldr_sort_salts(db, 1);
 			ldr_filter_n_best_salts(db);
 		} else
 			ldr_filter_salts(db);
+		int filtered = total - db->password_count;
+		if (filtered && john_main_process) {
+			fprintf(out_file, "Removed %d password hash%s due to --salts\n",
+			       filtered, filtered != 1 ? "es" : "");
+		}
+
+		total = db->password_count;
 		ldr_filter_costs(db);
+		filtered = total - db->password_count;
+		if (filtered && john_main_process) {
+			fprintf(out_file, "Removed %d password hash%s due to --cost\n",
+			       filtered, filtered != 1 ? "es" : "");
+		}
+
 		total = db->password_count;
 		ldr_remove_marked(db);
+		cracked = total - db->password_count;
 		if (options.loader.showuncracked) {
-			int cracked = total - db->password_count;
-			if (john_main_process)
-				fprintf(stderr, "%s%d password hash%s cracked,"
-					" %d left\n", cracked ? "\n" : "", cracked,
-					cracked != 1 ? "es" : "", db->password_count);
+			fprintf(stderr, "%s%d password hash%s cracked, %d left\n",
+			        cracked ? "\n" : "", cracked,
+			        cracked != 1 ? "es" : "", db->password_count);
 			exit(0);
 		}
 	}
@@ -2076,7 +2091,7 @@ int ldr_fix_database(struct db_main *db)
 	if (!ldr_loading_testdb && options.seed_per_user)
 		ldr_fill_user_words(db);
 
-	return total;
+	return cracked;
 }
 
 static int ldr_cracked_hash(char *ciphertext)

src/loader.h

@@ -305,8 +305,7 @@ extern void ldr_load_pot_file(struct db_main *db, char *name);
 /*
  * Finalizes the database after loading, which includes removal of salts and
  * hashes that don't meet criteria, as well as of hashes marked as previously
- * cracked.  Returns the number of hashes that were in the database after
- * removal of those not meeting criteria, but before removal of those cracked.
+ * cracked.  Returns the number of hashes that were cracked.
  */
 extern int ldr_fix_database(struct db_main *db);