Add $PmCryptAlgo, pmcrypt() to call password_verify() if it exists.

git-svn-id: svn://pmwiki.org/pmwiki/trunk@4462 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 8 insertions, 2 deletions

diff --git a/pmwiki.php b/pmwiki.php
index d54538b0..d663de5b 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -851,11 +851,17 @@ function cb_toupper($m) { return strtoupper($m[1]); }
 function cb_tolower($m) { return strtolower($m[1]); }
 
 function pmcrypt($str, $salt=null) {
+  global $PmCryptAlgo;
+  SDV($PmCryptAlgo, PASSWORD_DEFAULT);
   if ($salt && preg_match('/^(-?@|\\*$)/',  $salt)) return false;
-  if (!is_null($salt)) return crypt($str, $salt);
+  if (!is_null($salt)) {
+    if(function_exists('password_verify'))
+      return password_verify($str, $salt);
+    return crypt($str, $salt);
+  }
 
   if (function_exists('password_hash'))
-    return password_hash($str, PASSWORD_DEFAULT);
+    return password_hash($str, $PmCryptAlgo);
   return crypt($str);
 }