zeroed sector unscramble with lba 10350, removed dic tests

superg · Dec 13, 2022 · 37960c6 · 37960c6
1 parent 9424d09
commit 37960c6
Show file tree

Hide file tree

Showing 48 changed files with 2 additions and 49 deletions.
diff --git a/scrambler.cc b/scrambler.cc
@@ -18,8 +18,8 @@ bool Scrambler::Descramble(uint8_t *sector, int32_t *lba, uint32_t size) const
 {
 	bool unscrambled = false;
 
-	// not enough data to analyze
-	if(size < sizeof(Sector::sync) + sizeof(Sector::header))
+	// zeroed or not enough data to analyze
+	if(is_zeroed(sector, size) || size < sizeof(Sector::sync) + sizeof(Sector::header))
 		return unscrambled;
 
 	// unscramble sector

diff --git a/tests/tests.cc b/tests/tests.cc
@@ -167,51 +167,6 @@ bool test_unscramble()
 }
 
 
-bool test_unscramble_dic()
-{
-	bool success = true;
-
-	Scrambler scrambler;
-
-	std::set<std::filesystem::path> test_files;
-	for(auto const &f : std::filesystem::directory_iterator("unscramble/dic"))
-		if(f.is_regular_file())
-			test_files.insert(f.path());
-
-	for(auto const &f : test_files)
-	{
-		std::cout << fmt::format("descramble DIC: {}... ", f.filename().string()) << std::flush;
-
-		std::vector<uint8_t> sector = read_vector(f);
-
-		auto tokens = tokenize(f.filename().string(), ".", nullptr);
-		if(tokens.size() == 3)
-		{
-			int32_t lba = 0;
-			int32_t *lba_ptr = &lba;
-			if(tokens[1] == "null")
-				lba_ptr = nullptr;
-			else
-				*lba_ptr = std::stol(tokens[1]);
-			bool scrambled = tokens[2] == "pass";
-			bool unscrambled = scrambler.DescrambleDIC(sector.data(), lba_ptr, sector.size());
-
-			if(unscrambled == scrambled)
-				std::cout << "success";
-			else
-			{
-				std::cout << "failure";
-				success = false;
-			}
-		}
-
-		std::cout << std::endl;
-	}
-
-	return success;
-}
-
-
 
 int main(int argc, char *argv[])
 {
@@ -223,8 +178,6 @@ int main(int argc, char *argv[])
 	std::cout << std::endl;
 	success |= (int)!test_unscramble();
 	std::cout << std::endl;
-	success |= (int)!test_unscramble_dic();
-	std::cout << std::endl;
 
 	return success;
 }
diff --git a/tests/unscramble/46_zeroed_sector.10350.fail b/tests/unscramble/46_zeroed_sector.10350.fail
diff --git a/tests/unscramble/dic/01_invalid_sync.0.fail b/tests/unscramble/dic/01_invalid_sync.0.fail
diff --git a/tests/unscramble/dic/02_not_enough_data.0.fail b/tests/unscramble/dic/02_not_enough_data.0.fail
diff --git a/tests/unscramble/dic/03_mode0_zeroed_data.0.pass b/tests/unscramble/dic/03_mode0_zeroed_data.0.pass
diff --git a/tests/unscramble/dic/04_mode0_non_zeroed_data.0.fail b/tests/unscramble/dic/04_mode0_non_zeroed_data.0.fail
diff --git a/tests/unscramble/dic/05_mode0_non_zeroed_data_last_byte.0.fail b/tests/unscramble/dic/05_mode0_non_zeroed_data_last_byte.0.fail
diff --git a/tests/unscramble/dic/06_mode0_truncated_data_max.0.pass b/tests/unscramble/dic/06_mode0_truncated_data_max.0.pass
diff --git a/tests/unscramble/dic/07_mode0_truncated_data_min.0.pass b/tests/unscramble/dic/07_mode0_truncated_data_min.0.pass
diff --git a/tests/unscramble/dic/08_mode1.0.pass b/tests/unscramble/dic/08_mode1.0.pass
diff --git a/tests/unscramble/dic/09_mode2.0.pass b/tests/unscramble/dic/09_mode2.0.pass
diff --git a/tests/unscramble/dic/10_invalid_mode_zeroed_intermediate.0.pass b/tests/unscramble/dic/10_invalid_mode_zeroed_intermediate.0.pass
diff --git a/tests/unscramble/dic/11_invalid_mode_non_zeroed_intermediate.0.fail b/tests/unscramble/dic/11_invalid_mode_non_zeroed_intermediate.0.fail
diff --git a/tests/unscramble/dic/12_invalid_mode_non_zeroed_intermediate_last_byte.0.fail b/tests/unscramble/dic/12_invalid_mode_non_zeroed_intermediate_last_byte.0.fail
diff --git a/tests/unscramble/dic/13_invalid_mode_truncated_intermediate_max.0.pass b/tests/unscramble/dic/13_invalid_mode_truncated_intermediate_max.0.pass
diff --git a/tests/unscramble/dic/14_invalid_mode_truncated_intermediate_min.0.pass b/tests/unscramble/dic/14_invalid_mode_truncated_intermediate_min.0.pass
diff --git a/tests/unscramble/dic/15_invalid_mode_no_intermediate_max.0.fail b/tests/unscramble/dic/15_invalid_mode_no_intermediate_max.0.fail
diff --git a/tests/unscramble/dic/16_msf_mismatch_invalid_sync.42.fail b/tests/unscramble/dic/16_msf_mismatch_invalid_sync.42.fail
diff --git a/tests/unscramble/dic/17_msf_mismatch_not_enough_data.42.fail b/tests/unscramble/dic/17_msf_mismatch_not_enough_data.42.fail
diff --git a/tests/unscramble/dic/18_msf_mismatch_mode0_zeroed_data.42.pass b/tests/unscramble/dic/18_msf_mismatch_mode0_zeroed_data.42.pass
diff --git a/tests/unscramble/dic/19_msf_mismatch_mode0_non_zeroed_data.42.fail b/tests/unscramble/dic/19_msf_mismatch_mode0_non_zeroed_data.42.fail
diff --git a/tests/unscramble/dic/20_msf_mismatch_mode0_non_zeroed_data_last_byte.42.fail b/tests/unscramble/dic/20_msf_mismatch_mode0_non_zeroed_data_last_byte.42.fail
diff --git a/tests/unscramble/dic/21_msf_mismatch_mode0_truncated_data_max.42.pass b/tests/unscramble/dic/21_msf_mismatch_mode0_truncated_data_max.42.pass
diff --git a/tests/unscramble/dic/22_msf_mismatch_mode0_truncated_data_min.42.pass b/tests/unscramble/dic/22_msf_mismatch_mode0_truncated_data_min.42.pass
diff --git a/tests/unscramble/dic/23_msf_mismatch_mode1.42.pass b/tests/unscramble/dic/23_msf_mismatch_mode1.42.pass
diff --git a/tests/unscramble/dic/24_msf_mismatch_mode2.42.pass b/tests/unscramble/dic/24_msf_mismatch_mode2.42.pass
diff --git a/tests/unscramble/dic/25_msf_mismatch_invalid_mode_zeroed_intermediate.42.pass b/tests/unscramble/dic/25_msf_mismatch_invalid_mode_zeroed_intermediate.42.pass
diff --git a/tests/unscramble/dic/26_msf_mismatch_invalid_mode_non_zeroed_intermediate.42.fail b/tests/unscramble/dic/26_msf_mismatch_invalid_mode_non_zeroed_intermediate.42.fail
diff --git a/tests/unscramble/dic/27_msf_mismatch_invalid_mode_non_zeroed_intermediate_last_byte.42.fail b/tests/unscramble/dic/27_msf_mismatch_invalid_mode_non_zeroed_intermediate_last_byte.42.fail
diff --git a/tests/unscramble/dic/28_msf_mismatch_invalid_mode_truncated_intermediate_max.42.pass b/tests/unscramble/dic/28_msf_mismatch_invalid_mode_truncated_intermediate_max.42.pass
diff --git a/tests/unscramble/dic/29_msf_mismatch_invalid_mode_truncated_intermediate_min.42.pass b/tests/unscramble/dic/29_msf_mismatch_invalid_mode_truncated_intermediate_min.42.pass
diff --git a/tests/unscramble/dic/30_msf_mismatch_invalid_mode_no_intermediate_max.42.fail b/tests/unscramble/dic/30_msf_mismatch_invalid_mode_no_intermediate_max.42.fail
diff --git a/tests/unscramble/dic/31_no_msf_invalid_sync.null.fail b/tests/unscramble/dic/31_no_msf_invalid_sync.null.fail
diff --git a/tests/unscramble/dic/32_no_msf_not_enough_data.null.fail b/tests/unscramble/dic/32_no_msf_not_enough_data.null.fail
diff --git a/tests/unscramble/dic/33_no_msf_mode0_zeroed_data.null.pass b/tests/unscramble/dic/33_no_msf_mode0_zeroed_data.null.pass
diff --git a/tests/unscramble/dic/34_no_msf_mode0_non_zeroed_data.null.fail b/tests/unscramble/dic/34_no_msf_mode0_non_zeroed_data.null.fail
diff --git a/tests/unscramble/dic/35_no_msf_mode0_non_zeroed_data_last_byte.null.fail b/tests/unscramble/dic/35_no_msf_mode0_non_zeroed_data_last_byte.null.fail
diff --git a/tests/unscramble/dic/36_no_msf_mode0_truncated_data_max.null.pass b/tests/unscramble/dic/36_no_msf_mode0_truncated_data_max.null.pass
diff --git a/tests/unscramble/dic/37_no_msf_mode0_truncated_data_min.null.pass b/tests/unscramble/dic/37_no_msf_mode0_truncated_data_min.null.pass
diff --git a/tests/unscramble/dic/38_no_msf_mode1.null.pass b/tests/unscramble/dic/38_no_msf_mode1.null.pass
diff --git a/tests/unscramble/dic/39_no_msf_mode2.null.pass b/tests/unscramble/dic/39_no_msf_mode2.null.pass
diff --git a/tests/unscramble/dic/40_no_msf_invalid_mode_zeroed_intermediate.null.pass b/tests/unscramble/dic/40_no_msf_invalid_mode_zeroed_intermediate.null.pass
diff --git a/tests/unscramble/dic/41_no_msf_invalid_mode_non_zeroed_intermediate.null.fail b/tests/unscramble/dic/41_no_msf_invalid_mode_non_zeroed_intermediate.null.fail
diff --git a/tests/unscramble/dic/42_no_msf_invalid_mode_non_zeroed_intermediate_last_byte.null.fail b/tests/unscramble/dic/42_no_msf_invalid_mode_non_zeroed_intermediate_last_byte.null.fail
diff --git a/tests/unscramble/dic/43_no_msf_invalid_mode_truncated_intermediate_max.null.pass b/tests/unscramble/dic/43_no_msf_invalid_mode_truncated_intermediate_max.null.pass
diff --git a/tests/unscramble/dic/44_no_msf_invalid_mode_truncated_intermediate_min.null.pass b/tests/unscramble/dic/44_no_msf_invalid_mode_truncated_intermediate_min.null.pass
diff --git a/tests/unscramble/dic/45_no_msf_invalid_mode_no_intermediate_max.null.fail b/tests/unscramble/dic/45_no_msf_invalid_mode_no_intermediate_max.null.fail