[Checkins] SVN: zope.app.authentication/trunk/ Make old encoded password work

[Dan Korostelev]

Log message for revision 95851:
  Make old encoded password work

Changed:
  U   zope.app.authentication/trunk/CHANGES.txt
  U   zope.app.authentication/trunk/src/zope/app/authentication/password.py

-=-
Modified: zope.app.authentication/trunk/CHANGES.txt
===================================================================
--- zope.app.authentication/trunk/CHANGES.txt	2009-02-01 13:00:27 UTC (rev 95850)
+++ zope.app.authentication/trunk/CHANGES.txt	2009-02-01 13:18:34 UTC (rev 95851)
@@ -5,7 +5,7 @@
 3.5.0a2 (unreleased)
 --------------------
 
-* ...
+* Make old encoded passwords really work.
 
 3.5.0a1 (2009-01-31)
 --------------------

Modified: zope.app.authentication/trunk/src/zope/app/authentication/password.py
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/password.py	2009-02-01 13:00:27 UTC (rev 95850)
+++ zope.app.authentication/trunk/src/zope/app/authentication/password.py	2009-02-01 13:18:34 UTC (rev 95851)
@@ -113,7 +113,7 @@
             salt = storedPassword[5:-32]
             return storedPassword == self.encodePassword(password, salt)
         salt = storedPassword[:-32]
-        return storedPassword == self.encodePassword(password, salt)[6:]
+        return storedPassword == self.encodePassword(password, salt)[5:]
 
 
 class SHA1PasswordManager(PlainTextPasswordManager):
@@ -161,7 +161,7 @@
             salt = storedPassword[6:-40]
             return storedPassword == self.encodePassword(password, salt)
         salt = storedPassword[:-40]
-        return storedPassword == self.encodePassword(password, salt)[7:]
+        return storedPassword == self.encodePassword(password, salt)[6:]
 
 class SSHAPasswordManager(PlainTextPasswordManager):
     """SSHA password manager.