Add pwhash methods, which passthrough or throw an Error.

paragonie · Jul 5, 2017 · 43b7dd2 · 43b7dd2
1 parent 1b78c3c
commit 43b7dd2
Show file tree

Hide file tree

Showing 4 changed files with 400 additions and 54 deletions.
diff --git a/lib/php72compat.php b/lib/php72compat.php
@@ -303,6 +303,80 @@ function sodium_crypto_kx($my_secret, $their_public, $client_public, $server_pub
         );
     }
 }
+if (!is_callable('sodium_crypto_pwhash')) {
+    /**
+     * @param int $outlen
+     * @param string $passwd
+     * @param string $salt
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     */
+    function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('sodium_crypto_pwhash_str')) {
+    /**
+     * @param string $passwd
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     */
+    function sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('sodium_crypto_pwhash_str_verify')) {
+    /**
+     * @param string $passwd
+     * @param string $hash
+     * @return bool
+     */
+    function sodium_crypto_pwhash_str_verify($passwd, $hash)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
+    }
+}
+if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256')) {
+    /**
+     * @param int $outlen
+     * @param string $passwd
+     * @param string $salt
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     */
+    function sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str')) {
+    /**
+     * @param string $passwd
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     */
+    function sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str_verify')) {
+    /**
+     * @param string $passwd
+     * @param string $hash
+     * @return bool
+     */
+    function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+    }
+}
 if (!is_callable('sodium_crypto_scalarmult')) {
     /**
      * @param string $n

diff --git a/lib/sodium_compat.php b/lib/sodium_compat.php
@@ -265,6 +265,80 @@ function crypto_kx($my_secret, $their_public, $client_public, $server_public)
         );
     }
 }
+if (!is_callable('\\Sodium\\crypto_pwhash')) {
+    /**
+     * @param int $outlen
+     * @param string $passwd
+     * @param string $salt
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     */
+    function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_pwhash_str')) {
+    /**
+     * @param string $passwd
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     */
+    function crypto_pwhash_str($passwd, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_pwhash_str_verify')) {
+    /**
+     * @param string $passwd
+     * @param string $hash
+     * @return bool
+     */
+    function crypto_pwhash_str_verify($passwd, $hash)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256')) {
+    /**
+     * @param int $outlen
+     * @param string $passwd
+     * @param string $salt
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     */
+    function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str')) {
+    /**
+     * @param string $passwd
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     */
+    function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify')) {
+    /**
+     * @param string $passwd
+     * @param string $hash
+     * @return bool
+     */
+    function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+    }
+}
 if (!is_callable('\\Sodium\\crypto_scalarmult')) {
     /**
      * @param string $n