1
mirror of https://github.com/hashcat/hashcat synced 2024-11-20 23:27:31 +01:00

Merge pull request #3848 from philsmd/32200_verify_fix

verify fix for -m 32200=Kerberos 5, etype 18, AS-REP
This commit is contained in:
Jens Steube 2023-09-02 20:00:25 +02:00 committed by GitHub
commit 0dcd2a757b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -105,9 +105,9 @@ sub module_generate_hash
my $truncated_ticket_decrypted = byte2hex ($b_truncated_ticket_decrypted);
my $check_correct = ((substr ($truncated_ticket_decrypted, 16, 4) eq "7981" || substr ($truncated_ticket_decrypted, 16, 4) eq "7a81") && (substr ($truncated_ticket_decrypted, 22, 2) eq "30")) ||
((substr ($truncated_ticket_decrypted, 16, 2) eq "79" || substr ($truncated_ticket_decrypted, 16, 2) eq "7a") && (substr ($truncated_ticket_decrypted, 20, 2) eq "30")) ||
((substr ($truncated_ticket_decrypted, 16, 4) eq "7982" || substr ($truncated_ticket_decrypted, 16, 4) eq "7a82") && (substr ($truncated_ticket_decrypted, 24, 2) eq "30"));
my $check_correct = ((substr ($truncated_ticket_decrypted, 32, 4) eq "7981" || substr ($truncated_ticket_decrypted, 32, 4) eq "7a81") && (substr ($truncated_ticket_decrypted, 38, 2) eq "30")) ||
((substr ($truncated_ticket_decrypted, 32, 2) eq "79" || substr ($truncated_ticket_decrypted, 32, 2) eq "7a") && (substr ($truncated_ticket_decrypted, 36, 2) eq "30")) ||
((substr ($truncated_ticket_decrypted, 32, 4) eq "7982" || substr ($truncated_ticket_decrypted, 32, 4) eq "7a82") && (substr ($truncated_ticket_decrypted, 40, 2) eq "30"));
if ($check_correct == 1)
{
@ -145,7 +145,7 @@ sub module_generate_hash
}
else
{
if (!defined $edata2)
if (! defined $edata2)
{
my $nonce = unpack ("H*", random_bytes (16));