Improved password hashes.

Replaced crypt($password, '$6$') with password_hash and password_verify in order to produce salted hashes from passwords.

(cherry picked from commit 2a025de4)
(cherry picked from commit bd2d28c6)

src/etc/config.xml.sample

@@ -204,7 +204,7 @@
       <descr><![CDATA[System Administrator]]></descr>
       <scope>system</scope>
       <groupname>admins</groupname>
-      <password>$6$$Y8Et6wWDdXO2tJZRabvSfQvG2Lc8bAS6D9COIsMXEJ2KjA27wqDuAyd/CdazBQc3H3xQX.JXMKxJeRz2OqTkl.</password>
+      <password>$2b$10$YRVoF4SgskIsrXOvOQjGieB9XqHPRra9R7d80B3BZdbY/j21TwBfS</password>
       <uid>0</uid>
     </user>
     <nextuid>2000</nextuid>

src/etc/inc/auth.inc

@@ -488,14 +488,16 @@ function local_user_del($user)
 
 function local_user_set_password(&$user, $password)
 {
-    $user['password'] = crypt($password, '$6$');
-
-    // Converts ascii to unicode.
-    $astr = (string) $password;
-    $ustr = '';
-    for ($i = 0; $i < strlen($astr); $i++) {
-        $a = ord($astr{$i}) << 8;
-        $ustr.= sprintf("%X", $a);
+    $cost = 10;
+
+    $hash = password_hash($password, PASSWORD_BCRYPT, [ 'cost' => $cost ]);
+    if ($hash !== false) {
+        /*
+         * $2y$ returned is supported in FreeBSD 11.0 and up,
+         * but we started with FreeBSD 10.3 so need to fix:
+         */
+        $hash[2] = 'b';
+        $user['password'] = $hash;
     }
 }
 

src/www/system_usermanager_passwordmg.php

@@ -40,7 +40,7 @@ if (isset($_POST['save'])) {
     do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
     if ($_POST['passwordfld1'] != $_POST['passwordfld2'] ||
-        $config['system']['user'][$userindex[$username]]['password'] != crypt($_POST['passwordfld0'], '$6$')) {
+        !password_verify($_POST['passwordfld0'], $config['system']['user'][$userindex[$username]]['password'])) {
         $input_errors[] = gettext("The passwords do not match.");
     }
 
@@ -58,7 +58,7 @@ if (isset($_POST['save'])) {
 
     if (count($input_errors) == 0) {
         // all values are okay --> saving changes
-        $config['system']['user'][$userindex[$username]]['password'] = crypt($_POST['passwordfld1'], '$6$');
+        local_user_set_password($config['system']['user'][$userindex[$username]], $_POST['passwordfld1']);
         local_user_set($config['system']['user'][$userindex[$username]]);
 
         write_config();