diff -r 0a02c433f52d -r 5883ce99ee12 Utilities/PasswordChecker.py --- a/Utilities/PasswordChecker.py Fri Nov 01 15:48:48 2013 +0100 +++ b/Utilities/PasswordChecker.py Sun Nov 03 15:58:22 2013 +0100 @@ -327,7 +327,7 @@ lowercasedPassword = password.lower() if self.passwordLength["count"] >= self.sequentialLetters["length"]: - for index in range(len(self.sequentialLetters["data"]) - \ + for index in range(len(self.sequentialLetters["data"]) - self.sequentialLetters["length"] + 1): fwd = self.sequentialLetters["data"][ index:index + self.sequentialLetters["length"]] @@ -339,7 +339,7 @@ # Check for sequential numeric string patterns (forward and reverse) if self.passwordLength["count"] >= self.sequentialNumerics["length"]: - for index in range(len(self.sequentialNumerics["data"]) - \ + for index in range(len(self.sequentialNumerics["data"]) - self.sequentialNumerics["length"] + 1): fwd = self.sequentialNumerics["data"][ index:index + self.sequentialNumerics["length"]] @@ -355,7 +355,7 @@ for pattern in self.keyboardPatterns["data"]: for index in range( len(pattern) - self.keyboardPatterns["length"] + 1): - fwd = pattern[index:index + + fwd = pattern[index:index + self.keyboardPatterns["length"]] rev = self.__strReverse(fwd) if lowercasedPassword.find(fwd) != -1: @@ -369,7 +369,7 @@ # Try to find repeated sequences of characters. if self.passwordLength["count"] >= self.repeatedSequences["length"]: - for index in range(len(lowercasedPassword) - \ + for index in range(len(lowercasedPassword) - self.repeatedSequences["length"] + 1): fwd = lowercasedPassword[ index:index + self.repeatedSequences["length"]] @@ -379,7 +379,7 @@ # Try to find mirrored sequences of characters. if self.passwordLength["count"] >= self.mirroredSequences["length"]: - for index in range(len(lowercasedPassword) - \ + for index in range(len(lowercasedPassword) - self.mirroredSequences["length"] + 1): fwd = lowercasedPassword[ index:index + self.mirroredSequences["length"]] @@ -397,7 +397,7 @@ if self.passwordLength["count"] >= self.passwordLength["minimum"]: # credit additional characters over minimum self.passwordLength["rating"] = self.passwordLength["bonus"] + \ - (self.passwordLength["count"] - + (self.passwordLength["count"] - self.passwordLength["minimum"]) * \ self.passwordLength["factor"] else: @@ -411,7 +411,7 @@ self.recommendedPasswordLength["minimum"]: self.recommendedPasswordLength["rating"] = \ self.recommendedPasswordLength["bonus"] + \ - (self.passwordLength["count"] - \ + (self.passwordLength["count"] - self.recommendedPasswordLength["minimum"]) * \ self.recommendedPasswordLength["factor"] else: @@ -552,7 +552,7 @@ # judge the requirement status self.basicRequirements["status"] = self.__determineStatus( - self.basicRequirements["count"] - + self.basicRequirements["count"] - self.basicRequirements["minimum"]) if self.basicRequirements["status"] != self.Status_Failed: self.basicRequirements["rating"] = \ @@ -566,14 +566,14 @@ # beyond basic requirements self.recommendedPasswordLength["status"] = self.__determineStatus( - self.recommendedPasswordLength["count"] - \ - self.recommendedPasswordLength["minimum"]) + self.recommendedPasswordLength["count"] - + self.recommendedPasswordLength["minimum"]) self.middleNumerics["status"] = self.__determineStatus( - self.middleNumerics["count"] - \ - self.middleNumerics["minimum"]) + self.middleNumerics["count"] - + self.middleNumerics["minimum"]) self.middleSymbols["status"] = self.__determineStatus( - self.middleSymbols["count"] - \ - self.middleSymbols["minimum"]) + self.middleSymbols["count"] - + self.middleSymbols["minimum"]) self.sequentialLetters["status"] = self.__determineBinaryStatus( self.sequentialLetters["count"]) self.sequentialNumerics["status"] = self.__determineBinaryStatus(