From 000416c401c63e15df5af10e17b9143b19252bfd Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 19 Feb 2019 20:50:21 +0100 Subject: [PATCH] pacrypt_dovecot: Don't blacklist SCRAM-SHA-1 Actually it doesn't include the username at all. Fixes commit f444de4. --- functions.inc.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/functions.inc.php b/functions.inc.php index 9156cfa4..f375562a 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -988,13 +988,10 @@ function _pacrypt_dovecot($pw, $pw_db = '') { # if (strtolower($method) == 'md5-crypt') die("\$CONF['encrypt'] = 'dovecot:md5-crypt' will not work because dovecotpw generates a random salt each time. Please use \$CONF['encrypt'] = 'md5crypt' instead."); # $crypt_method = preg_match ("/.*-CRYPT$/", $method); - # digest-md5 and SCRAM-SHA-1 hashes include the username - until someone implements it, let's declare it as unsupported + # digest-md5 hashes include the username - until someone implements it, let's declare it as unsupported if (strtolower($method) == 'digest-md5') { die("Sorry, \$CONF['encrypt'] = 'dovecot:digest-md5' is not supported by PostfixAdmin."); } - if (strtoupper($method) == 'SCRAM-SHA-1') { - die("Sorry, \$CONF['encrypt'] = 'dovecot:scram-sha-1' is not supported by PostfixAdmin."); - } # TODO: add -u option for those hashes, or for everything that is salted (-u was available before dovecot 2.1 -> no problem with backward compatibility ) $dovecotpw = "doveadm pw";