Continued with hub development: validation of chunk hash added

[hub.git] / application / hub / main / package / fragmenter / class_PackageFragmenter.php

diff --git a/application/hub/main/package/fragmenter/class_PackageFragmenter.php b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
index ef6798126019981d1fb235ffff53687b265eee38..a254b3d18db7c4575a0d9dcef7a4409c7cf56982 100644 (file)
--- a/application/hub/main/package/fragmenter/class_PackageFragmenter.php
+++ b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
@@ -273,8 +273,11 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
         * @return      $hash           Hash from the raw data
         */
        private function generateHashFromRawData ($rawData) {
-               // Get the crypto instance and hash the data
-               $hash = $this->getCryptoInstance()->hashString($rawData);
+               /*
+                * Get the crypto instance and hash the data with no extra salt because
+                * the other peer doesn't have *this* peer's salt.
+                */
+               $hash = $this->getCryptoInstance()->hashString($rawData, '', false);
 
                // Return it
                return $hash;
@@ -348,7 +351,7 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
                        $chunk = substr($rawData, $idx, $dataChunkSize);
 
                        // Hash it and remember it in seperate array
-                       $chunkHash = $this->getCryptoInstance()->hashString($chunk);
+                       $chunkHash = $this->getCryptoInstance()->hashString($chunk, '', false);
                        $this->chunkHashes[$finalHash][] = $chunkHash;
 
                        // Prepend the hash to the chunk
@@ -396,7 +399,7 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
                        $chunk = substr($rawData, $idx, $dataChunkSize);
 
                        // Hash it and remember it in seperate array
-                       $chunkHash = $this->getCryptoInstance()->hashString($chunk);
+                       $chunkHash = $this->getCryptoInstance()->hashString($chunk, '', false);
                        array_unshift($this->chunkHashes[$finalHash], $chunkHash);
 
                        // Prepend the hash to the chunk