Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/getFound.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@
foreach ($current as $entry) {
$output .= $entry->getHash();
if (strlen($entry->getSalt()) > 0) {
$output .= "\t" . $entry->getSalt();
$salts = explode($hashlist->getSaltSeparator(), $entry->getSalt()); // Double salt
foreach ($salts as $salt) {
$output .= "\t" . $salt;
}
}
$output .= "\tFF" . $lineDelimiter;
}
Expand Down
6 changes: 5 additions & 1 deletion src/getHashlist.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,14 @@

$output = "";
$count += sizeof($current);

foreach ($current as $entry) {
$output .= $entry->getHash();
if (strlen($entry->getSalt()) > 0) {
$output .= "\t" . $entry->getSalt();
$salts = explode($hashlist->getSaltSeparator(), $entry->getSalt()); // Double salt
foreach ($salts as $salt) {
$output .= "\t" . $salt;
}
}
$output .= $lineDelimiter;
}
Expand Down
4 changes: 4 additions & 0 deletions src/inc/api/APISendProgress.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ public function execute($QUERY = array()) {
$plain = $splitLine[2]; // if hash is salted
$crackPos = $splitLine[4];
}
else if (sizeof($splitLine) == 6) { // Doulbe salt
$plain = $splitLine[3]; // if hash is salted
$crackPos = $splitLine[5];
}
else {
$plain = $splitLine[1];
$crackPos = $splitLine[3];
Expand Down
5 changes: 4 additions & 1 deletion src/inc/utils/TaskUtils.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,10 @@ public static function getCrackedHashes($taskId, $user) {
"crackpos" => $entry->getCrackPos()
];
if (strlen($entry->getSalt()) > 0) {
$arr["hash"] .= $hashlist->getSaltSeparator() . $entry->getSalt();
$salts = explode($hashlist->getSaltSeparator(), $entry->getSalt()); // Double salt
foreach ($salts as $salt) {
$arr["hash"] .= $hashlist->getSaltSeparator() . $salt;
}
}
$hashes[] = $arr;
}
Expand Down