github/hashcat
1
Fork 0
mirror of https://github.com/hashcat/hashcat synced 2025-01-07 02:16:23 +01:00
Code Releases Activity

Merge pull request #1270 from roycewilliams/master

Browse Source 
$chacha20$ (all lower case) per @magnumripper
This commit is contained in:
Jens Steube 2017-06-06 15:45:36 +02:00 committed by GitHub
commit 47c4ce58d3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interface.c
View File

@ -384,7 +384,7 @@ static const char SIGNATURE_FORTIGATE[] = "AK1";
static const char SIGNATURE_ATLASSIAN[] = "{PKCS5S2}";
static const char SIGNATURE_NETBSD_SHA1CRYPT[] = "$sha1$";
static const char SIGNATURE_BLAKE2B[] = "$BLAKE2$";
static const char SIGNATURE_CHACHA20[] = "$ChaCha20$";
static const char SIGNATURE_CHACHA20[] = "$chacha20$";
static const char SIGNATURE_ETHEREUM_PBKDF2[] = "$ethereum$p";
static const char SIGNATURE_ETHEREUM_SCRYPT[] = "$ethereum$s";

2
tools/test.pl
View File

@ -8584,7 +8584,7 @@ END_CODE
my $enc_offset = substr($enc, $offset, 8);
$hash_buf = $enc_offset;
$tmp_hash = sprintf ("\$ChaCha20\$\*%s\*%d\*%s\*%s\*%s", $counter, $offset, $iv, unpack("H*", substr($plaintext, $offset, 8)), unpack("H*", $enc_offset));
$tmp_hash = sprintf ("\$chacha20\$\*%s\*%d\*%s\*%s\*%s", $counter, $offset, $iv, unpack("H*", substr($plaintext, $offset, 8)), unpack("H*", $enc_offset));
}
elsif ($mode == 15600)
{