1 files changed, 11 insertions, 5 deletions

diff --git a/src/mailman/rules/approved.py b/src/mailman/rules/approved.py
index 3e2b7bc83..3ff7d21ec 100644
--- a/src/mailman/rules/approved.py
+++ b/src/mailman/rules/approved.py
@@ -28,9 +28,9 @@ __all__ = [
 import re
 
 from email.iterators import typed_subpart_iterator
-from flufl.password import verify
-from zope.interface import implements
+from zope.interface import implementer
 
+from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 
@@ -45,9 +45,9 @@ HEADERS = [
 
 
 
+@implementer(IRule)
 class Approved:
     """Look for moderator pre-approval."""
-    implements(IRule)
 
     name = 'approved'
     description = _('The message has a matching Approve or Approved header.')
@@ -119,8 +119,14 @@ class Approved:
         else:
             for header in HEADERS:
                 del msg[header]
-        return (password is not missing and 
-                verify(mlist.moderator_password, password))
+        if password is missing:
+            return False
+        is_valid, new_hash = config.password_context.verify(
+            mlist.moderator_password, password)
+        if is_valid and new_hash:
+            # Hash algorithm migration.
+            mlist.moderator_password = new_hash
+        return is_valid