webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-07 17:42:53 +03:00
Code Activity

change default for php_crypt to SHA512

Browse Source 
(+ a few whitespace changes)
This commit is contained in:
Christian Boltz
2018-05-02 22:18:24 +02:00
parent bd5ac21398
commit a3feba7c73
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
functions.inc.php
View File

@@ -1060,7 +1060,7 @@ function _pacrypt_php_crypt($pw, $pw_db) {
// existing pw provided. send entire password hash as salt for crypt() to figure out // existing pw provided. send entire password hash as salt for crypt() to figure out
$salt = $pw_db; $salt = $pw_db;
} else { } else {
$salt_method = 'MD5'; // default. $salt_method = 'SHA512'; // default.
// no pw provided. create new password hash // no pw provided. create new password hash
if (strpos($CONF['encrypt'], ':') !== false) { if (strpos($CONF['encrypt'], ':') !== false) {
// use specified hash method // use specified hash method
@@ -1076,7 +1076,7 @@ function _pacrypt_php_crypt($pw, $pw_db) {
} }
// used for php_crypt method // used for php_crypt method
function _php_crypt_generate_crypt_salt($hash_type='MD5') { function _php_crypt_generate_crypt_salt($hash_type='SHA512') {
// generate a salt (with magic matching chosen hash algorithm) for the PHP crypt() function // generate a salt (with magic matching chosen hash algorithm) for the PHP crypt() function
// most commonly used alphabet // most commonly used alphabet
@@ -1105,19 +1105,19 @@ function _php_crypt_generate_crypt_salt($hash_type='MD5') {
} }
$salt = _php_crypt_random_string($alphabet, $length); $salt = _php_crypt_random_string($alphabet, $length);
return sprintf('$%s$%02d$%s', $algorithm, $cost, $salt); return sprintf('$%s$%02d$%s', $algorithm, $cost, $salt);
case 'SHA256': case 'SHA256':
$length = 16; $length = 16;
$algorithm = '5'; $algorithm = '5';
$salt = _php_crypt_random_string($alphabet, $length); $salt = _php_crypt_random_string($alphabet, $length);
return sprintf('$%s$%s', $algorithm, $salt); return sprintf('$%s$%s', $algorithm, $salt);
case 'SHA512': case 'SHA512':
$length = 16; $length = 16;
$algorithm = '6'; $algorithm = '6';
$salt = _php_crypt_random_string($alphabet, $length); $salt = _php_crypt_random_string($alphabet, $length);
return sprintf('$%s$%s', $algorithm, $salt); return sprintf('$%s$%s', $algorithm, $salt);
default: default:
die("unknown hash type: '$hash_type'"); die("unknown hash type: '$hash_type'");
} }