From 057bf48924a111761503ae4dd9a349adbcc50770 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Tue, 11 May 2021 07:15:45 +0200 Subject: [PATCH] Fixed unit tests using 'null' as padding method in Crypt::CBC but actually want to use 'none' --- docs/changes.txt | 1 + tools/test_modules/m09500.pm | 4 ++-- tools/test_modules/m09600.pm | 4 ++-- tools/test_modules/m10700.pm | 2 +- tools/test_modules/m15300.pm | 16 ++++++++-------- tools/test_modules/m15900.pm | 16 ++++++++-------- tools/test_modules/m16600.pm | 2 +- tools/test_modules/m23100.pm | 6 +++--- tools/test_modules/m23300.pm | 2 +- tools/test_modules/m23700.pm | 2 +- 10 files changed, 28 insertions(+), 27 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 9f693489d..1da0dc692 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -67,6 +67,7 @@ - Fixed too-early execution of some module functions that use non-final values opts_type and opti_type - Fixed unexpected non-unique salts in multi-hash cracking in Bitcoin/Litecoin wallet.dat module which led to false negatives - Fixed unit test for -m 3000 by preventing it to generate zero hashes +- Fixed unit tests using 'null' as padding method in Crypt::CBC but actually want to use 'none' - Fixed vector datatype support in -m 21100 only -P mode and only -a 3 mode were affected ## diff --git a/tools/test_modules/m09500.pm b/tools/test_modules/m09500.pm index b7117f501..765fcada6 100644 --- a/tools/test_modules/m09500.pm +++ b/tools/test_modules/m09500.pm @@ -48,7 +48,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 16, - padding => "null", + padding => "none", }); my $cipher2 = Crypt::CBC->new ({ @@ -58,7 +58,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 16, - padding => "null", + padding => "none", }); my $encdata; diff --git a/tools/test_modules/m09600.pm b/tools/test_modules/m09600.pm index fe21369bf..79b438bc9 100644 --- a/tools/test_modules/m09600.pm +++ b/tools/test_modules/m09600.pm @@ -48,7 +48,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 32, - padding => "null", + padding => "none", }); my $cipher2 = Crypt::CBC->new ({ @@ -58,7 +58,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 32, - padding => "null", + padding => "none", }); my $encdata; diff --git a/tools/test_modules/m10700.pm b/tools/test_modules/m10700.pm index 5b1e467e4..7bf5b3489 100644 --- a/tools/test_modules/m10700.pm +++ b/tools/test_modules/m10700.pm @@ -65,7 +65,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 16, - padding => "null", + padding => "none", }); my $data = $aes->encrypt ($data); diff --git a/tools/test_modules/m15300.pm b/tools/test_modules/m15300.pm index 517d38a1b..de51b1373 100644 --- a/tools/test_modules/m15300.pm +++ b/tools/test_modules/m15300.pm @@ -190,7 +190,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); my $p2 = Crypt::ECB->new ({ @@ -199,7 +199,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); my $p3 = Crypt::ECB->new ({ @@ -208,7 +208,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); # let's compute a 3DES-EDE-CBC decryption @@ -256,7 +256,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 32, - padding => "null", + padding => "none", }); my $expected_cleartext = $aes->decrypt ($cipher); @@ -288,7 +288,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); my $p2 = Crypt::ECB->new ({ @@ -297,7 +297,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); my $p3 = Crypt::ECB->new ({ @@ -306,7 +306,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); # let's compute a 3DES-EDE-CBC encryption @@ -342,7 +342,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 32, - padding => "null", + padding => "none", }); $cipher = $aes->encrypt ($cleartext); diff --git a/tools/test_modules/m15900.pm b/tools/test_modules/m15900.pm index cee12b2e8..36d7801b0 100644 --- a/tools/test_modules/m15900.pm +++ b/tools/test_modules/m15900.pm @@ -192,7 +192,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); my $p2 = Crypt::ECB->new ({ @@ -201,7 +201,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); my $p3 = Crypt::ECB->new ({ @@ -210,7 +210,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); # let's compute a 3DES-EDE-CBC decryption @@ -258,7 +258,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 32, - padding => "null", + padding => "none", }); my $expected_cleartext = $aes->decrypt ($cipher); @@ -290,7 +290,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); my $p2 = Crypt::ECB->new ({ @@ -299,7 +299,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); my $p3 = Crypt::ECB->new ({ @@ -308,7 +308,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 8, - padding => "null", + padding => "none", }); # let's compute a 3DES-EDE-CBC encryption @@ -344,7 +344,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 32, - padding => "null", + padding => "none", }); $cipher = $aes->encrypt ($cleartext); diff --git a/tools/test_modules/m16600.pm b/tools/test_modules/m16600.pm index c0055446e..99d965c5a 100644 --- a/tools/test_modules/m16600.pm +++ b/tools/test_modules/m16600.pm @@ -33,7 +33,7 @@ sub module_generate_hash literal_key => 1, header => "none", keysize => 32, - padding => "null", + padding => "none", }); if (defined $plain_bin) diff --git a/tools/test_modules/m23100.pm b/tools/test_modules/m23100.pm index 06106adcd..7a9d27bf8 100644 --- a/tools/test_modules/m23100.pm +++ b/tools/test_modules/m23100.pm @@ -44,7 +44,7 @@ sub module_generate_hash cipher => "DES", literal_key => 1, header => "none", - padding => "null", + padding => "none", }); my $des2 = Crypt::CBC->new ({ @@ -53,7 +53,7 @@ sub module_generate_hash cipher => "DES", literal_key => 1, header => "none", - padding => "null", + padding => "none", }); my $des3 = Crypt::CBC->new ({ @@ -62,7 +62,7 @@ sub module_generate_hash cipher => "DES", literal_key => 1, header => "none", - padding => "null", + padding => "none", }); my $data_encrypted = ""; diff --git a/tools/test_modules/m23300.pm b/tools/test_modules/m23300.pm index 55278f77b..268025812 100644 --- a/tools/test_modules/m23300.pm +++ b/tools/test_modules/m23300.pm @@ -75,7 +75,7 @@ sub module_generate_hash keysize => 16, literal_key => 1, header => "none", - padding => "null" + padding => "none" }); if ($is_decrypt == 1) diff --git a/tools/test_modules/m23700.pm b/tools/test_modules/m23700.pm index ee09c8b53..ed4191ba5 100644 --- a/tools/test_modules/m23700.pm +++ b/tools/test_modules/m23700.pm @@ -375,7 +375,7 @@ sub module_generate_hash -keysize => 16, -literal_key => 1, -header => 'none', - -padding => 'null' + -padding => 'none' ); if (defined ($data))