Don't use Sodium mixer on HHVM. Allow master/nightly to fail.

paragonie · Oct 6, 2017 · 2c5ea6c · 2c5ea6c
1 parent cc73417
commit 2c5ea6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,9 @@ matrix:
       env: USE_PSALM=1
     - php: "hhvm"
       env: USE_PSALM=1
+  allow_failures:
+    - php: "master"
+    - php: "nightly"
 
 before_script:
   - travis_retry composer self-update

diff --git a/lib/RandomLib/Mixer/SodiumMixer.php b/lib/RandomLib/Mixer/SodiumMixer.php
@@ -41,7 +41,7 @@ public static function getStrength()
      */
     public static function test()
     {
-        return is_callable('sodium_crypto_stream') && is_callable('sodium_crypto_generichash');
+        return is_callable('sodium_crypto_stream') && is_callable('sodium_crypto_generichash') && !defined('HHVM_VERSION');
     }
     /**
      * Get the block size (the size of the individual blocks used for the mixing)
@@ -67,7 +67,7 @@ protected function getPartSize()
      */
     protected function mixParts1($part1, $part2)
     {
-        return \sodium_crypto_generichash($part1 . $part2, '', $this->getPartSize());
+        return (string) \sodium_crypto_generichash($part1 . $part2, '', $this->getPartSize());
     }
 
     /**
@@ -83,10 +83,11 @@ protected function mixParts1($part1, $part2)
     protected function mixParts2($part1, $part2)
     {
         // Pre-hash the two inputs into a 448-bit output
+        /** @var string $hash */
         $hash = \sodium_crypto_generichash($part1 . $part2, '', 56);
 
         // Use salsa20 to expand into a pseudorandom string
-        return \sodium_crypto_stream(
+        return (string) \sodium_crypto_stream(
             $this->getPartSize(),
             Util::safeSubstr($hash, 0, 24),
             Util::safeSubstr($hash, 0, 32)