From d58f87665d9a3b6c8e82973676ffc5320a092b98 Mon Sep 17 00:00:00 2001
From: Joshua Kocinski <git@cl0secall.net>
Date: Sat, 16 Apr 2016 15:18:43 -0400
Subject: [PATCH] unit test plus fixes for naming of the hasher.

---
 modoboa/admin/tests/password_schemes.py   | 3 +++
 modoboa/core/app_settings.py              | 2 +-
 modoboa/core/password_hashers/__init__.py | 2 +-
 modoboa/core/password_hashers/advanced.py | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modoboa/admin/tests/password_schemes.py b/modoboa/admin/tests/password_schemes.py
index 28b1331b7..f19ba7bf3 100644
--- a/modoboa/admin/tests/password_schemes.py
+++ b/modoboa/admin/tests/password_schemes.py
@@ -34,6 +34,9 @@ class PasswordSchemesTestCase(ModoTestCase):
         self.assertTrue(account.password.startswith(startpattern))
         self.assertTrue(account.check_password('Toto1234'))
 
+    def test_bcrypt_scheme(self):
+        self._test_scheme('blfcrypt', '{BLF-CRYPT}')
+
     def test_sha512crypt_scheme(self):
         self._test_scheme('sha512crypt', '{SHA512-CRYPT}')
 
diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py
index c2fd2b651..ee35f1598 100644
--- a/modoboa/core/app_settings.py
+++ b/modoboa/core/app_settings.py
@@ -48,7 +48,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         label=ugettext_lazy("Default password scheme"),
         choices=[("sha512crypt", "sha512crypt"),
                  ("sha256crypt", "sha256crypt"),
-                 ("bcrypt", "bcrypt"),
+                 ("blfcrypt", "bcrypt"),
                  ("md5crypt", ugettext_lazy("md5crypt (weak)")),
                  ("sha256", ugettext_lazy("sha256 (weak)")),
                  ("md5", ugettext_lazy("md5 (weak)")),
diff --git a/modoboa/core/password_hashers/__init__.py b/modoboa/core/password_hashers/__init__.py
index c453f2763..653b0dd56 100644
--- a/modoboa/core/password_hashers/__init__.py
+++ b/modoboa/core/password_hashers/__init__.py
@@ -5,7 +5,7 @@ from modoboa.core.password_hashers.base import (
     PLAINHasher, CRYPTHasher, MD5Hasher, SHA256Hasher
 )
 from modoboa.core.password_hashers.advanced import (
-    BCRYPTHasher, MD5CRYPTHasher, SHA256CRYPTHasher, SHA512CRYPTHasher
+    BLFCRYPTHasher, MD5CRYPTHasher, SHA256CRYPTHasher, SHA512CRYPTHasher
 )
 
 
diff --git a/modoboa/core/password_hashers/advanced.py b/modoboa/core/password_hashers/advanced.py
index e12c9af37..55915e6db 100644
--- a/modoboa/core/password_hashers/advanced.py
+++ b/modoboa/core/password_hashers/advanced.py
@@ -7,7 +7,7 @@ from passlib.hash import bcrypt, md5_crypt, sha256_crypt, sha512_crypt
 from modoboa.core.password_hashers.base import PasswordHasher
 from modoboa.lib import parameters
 
-class BCRYPTHasher(PasswordHasher):
+class BLFCRYPTHasher(PasswordHasher):
     """
     BLF-CRYPT password hasher.