mirror of
https://github.com/hashcat/hashcat
synced 2024-11-28 05:21:38 +01:00
Merge pull request #3840 from philsmd/padding_for_for_13400_29800_tests
verify test fix for -m 13400/-m 29700
This commit is contained in:
commit
042f913590
@ -239,14 +239,32 @@ sub module_generate_hash
|
|||||||
$final_algorithm = "Crypt::Rijndael";
|
$final_algorithm = "Crypt::Rijndael";
|
||||||
}
|
}
|
||||||
|
|
||||||
my $cipher = Crypt::CBC->new ({
|
my $cipher;
|
||||||
|
|
||||||
|
if ($version == 1)
|
||||||
|
{
|
||||||
|
$cipher = Crypt::CBC->new ({
|
||||||
key => $final_key,
|
key => $final_key,
|
||||||
cipher => $final_algorithm,
|
cipher => $final_algorithm,
|
||||||
iv => $enc_iv,
|
iv => $enc_iv,
|
||||||
literal_key => 1,
|
literal_key => 1,
|
||||||
header => "none",
|
header => "none",
|
||||||
|
padding => "standard",
|
||||||
keysize => 32
|
keysize => 32
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$cipher = Crypt::CBC->new ({
|
||||||
|
key => $final_key,
|
||||||
|
cipher => $final_algorithm,
|
||||||
|
iv => $enc_iv,
|
||||||
|
literal_key => 1,
|
||||||
|
header => "none",
|
||||||
|
padding => "none",
|
||||||
|
keysize => 32
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
my $hash;
|
my $hash;
|
||||||
|
|
||||||
|
@ -243,14 +243,32 @@ sub module_generate_hash
|
|||||||
$final_algorithm = "Crypt::Rijndael";
|
$final_algorithm = "Crypt::Rijndael";
|
||||||
}
|
}
|
||||||
|
|
||||||
my $cipher = Crypt::CBC->new ({
|
my $cipher;
|
||||||
|
|
||||||
|
if ($version == 1)
|
||||||
|
{
|
||||||
|
$cipher = Crypt::CBC->new ({
|
||||||
key => $final_key,
|
key => $final_key,
|
||||||
cipher => $final_algorithm,
|
cipher => $final_algorithm,
|
||||||
iv => $enc_iv,
|
iv => $enc_iv,
|
||||||
literal_key => 1,
|
literal_key => 1,
|
||||||
header => "none",
|
header => "none",
|
||||||
|
padding => "standard",
|
||||||
keysize => 32
|
keysize => 32
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$cipher = Crypt::CBC->new ({
|
||||||
|
key => $final_key,
|
||||||
|
cipher => $final_algorithm,
|
||||||
|
iv => $enc_iv,
|
||||||
|
literal_key => 1,
|
||||||
|
header => "none",
|
||||||
|
padding => "none",
|
||||||
|
keysize => 32
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
my $hash;
|
my $hash;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user