diff --git a/src/java/com/samskivert/servlet/user/User.java b/src/java/com/samskivert/servlet/user/User.java index e377890a..866d2bf5 100644 --- a/src/java/com/samskivert/servlet/user/User.java +++ b/src/java/com/samskivert/servlet/user/User.java @@ -106,26 +106,6 @@ public class User setModified("siteId"); } - /** - * Converts a legacy password. - * - * @return true if a conversion took place, false if not. - */ - public boolean updateLegacyPassword (String password) - { - // we may have an old crypt() encrypted password - if (this.password.length() == 13) { - // check both the case sensitive and insensitive versions for further legacy reasons - if (this.password.equals(UserUtil.legacyEncrypt(username, password, false)) || - this.password.equals(UserUtil.legacyEncrypt(username, password, true))) { - // update our password with the new encryption method - setPassword(password); - return true; - } - } - return false; - } - /** * Compares the supplied password with the password associated with this user record. * diff --git a/src/java/com/samskivert/servlet/user/UserManager.java b/src/java/com/samskivert/servlet/user/UserManager.java index 924cc29e..9a6f9f53 100644 --- a/src/java/com/samskivert/servlet/user/UserManager.java +++ b/src/java/com/samskivert/servlet/user/UserManager.java @@ -251,13 +251,6 @@ public class UserManager throw new NoSuchUserException("error.no_such_user"); } - // potentially convert the user's legacy password - if (password != null && password.getCleartext() != null && - user.updateLegacyPassword(password.getCleartext())) { - log.info("Updated legacy password " + user.username + "."); - _repository.updateUser(user); - } - // run the user through the authentication gamut auth.authenticateUser(user, username, password); @@ -290,13 +283,6 @@ public class UserManager throw new NoSuchUserException("error.no_such_user"); } - // potentially convert the user's legacy password - if (password != null && password.getCleartext() != null && - user.updateLegacyPassword(password.getCleartext())) { - log.info("Updated legacy password " + user.username + "."); - _repository.updateUser(user); - } - // run the user through the authentication gamut auth.authenticateUser(user, username, password);