diff --git a/maskgen.py b/maskgen.py index 2147a87..681f0e3 100755 --- a/maskgen.py +++ b/maskgen.py @@ -179,15 +179,15 @@ def getmaskscoverage(self, checkmasks): if __name__ == "__main__": - header = " _ \n" - header += " MaskGen %s | |\n" % VERSION - header += " _ __ __ _ ___| | _\n" - header += " | '_ \ / _` |/ __| |/ /\n" - header += " | |_) | (_| | (__| < \n" - header += " | .__/ \__,_|\___|_|\_\\\n" - header += " | | \n" - header += " |_| iphelix@thesprawl.org\n" - header += "\n" + header = " _ \n" + header += " MaskGen %s | |\n" % VERSION + header += " _ __ __ _ ___| | _\n" + header += r" | '_ \ / _` |/ __| |/ /{}".format("\n") + header += " | |_) | (_| | (__| < \n" + header += r" | .__/ \__,_|\___|_|\_{}".format("\\\n") + header += " | | \n" + header += " |_| iphelix@thesprawl.org\n" + header += "\n" parser = OptionParser("%prog pass0.masks [pass1.masks ...] [options]", version="%prog "+VERSION) diff --git a/policygen.py b/policygen.py index 108d759..bcae5ba 100755 --- a/policygen.py +++ b/policygen.py @@ -148,15 +148,15 @@ def generate_masks(self, noncompliant): if __name__ == "__main__": - header = " _ \n" - header += " PolicyGen %s | |\n" % VERSION - header += " _ __ __ _ ___| | _\n" - header += " | '_ \ / _` |/ __| |/ /\n" - header += " | |_) | (_| | (__| < \n" - header += " | .__/ \__,_|\___|_|\_\\\n" - header += " | | \n" - header += " |_| iphelix@thesprawl.org\n" - header += "\n" + header = " _ \n" + header += " PolicyGen %s | |\n" % VERSION + header += " _ __ __ _ ___| | _\n" + header += r" | '_ \ / _` |/ __| |/ /{}".format("\n") + header += " | |_) | (_| | (__| < \n" + header += r" | .__/ \__,_|\___|_|\_{}".format("\\\n") + header += " | | \n" + header += " |_| iphelix@thesprawl.org\n" + header += "\n" # parse command line arguments parser = OptionParser("%prog [options]\n\nType --help for more options", version="%prog " + VERSION) diff --git a/rulegen.py b/rulegen.py index 29397f4..dc389cb 100755 --- a/rulegen.py +++ b/rulegen.py @@ -73,8 +73,8 @@ def __init__(self, language="en", providers="aspell,myspell", basename='analysis # Preanalysis Password Patterns self.password_pattern = dict() self.password_pattern["insertion"] = re.compile('^[^a-z]*(?P.+?)[^a-z]*$', re.IGNORECASE) - self.password_pattern["email"] = re.compile('^(?P.+?)@[A-Z0-9.-]+\.[A-Z]{2,4}', re.IGNORECASE) - self.password_pattern["alldigits"] = re.compile('^(\d+)$', re.IGNORECASE) + self.password_pattern["email"] = re.compile(r'^(?P.+?)@[A-Z0-9.-]+\.[A-Z]{2,4}', re.IGNORECASE) + self.password_pattern["alldigits"] = re.compile(r'^(\d+)$', re.IGNORECASE) self.password_pattern["allspecial"] = re.compile('^([^a-z0-9]+)$', re.IGNORECASE) ######################################################################## @@ -1130,14 +1130,14 @@ def verify_hashcat_rules(self, word, rules, password): if __name__ == "__main__": header = " _ \n" - header += " RuleGen %s | |\n" % VERSION - header += " _ __ __ _ ___| | _\n" - header += " | '_ \ / _` |/ __| |/ /\n" - header += " | |_) | (_| | (__| < \n" - header += " | .__/ \__,_|\___|_|\_\\\n" - header += " | | \n" - header += " |_| iphelix@thesprawl.org\n" - header += "\n" + header += " RuleGen %s | |\n" % VERSION + header += " _ __ __ _ ___| | _\n" + header += r" | '_ \ / _` |/ __| |/ /{}".format("\n") + header += " | |_) | (_| | (__| < \n" + header += r" | .__/ \__,_|\___|_|\_{}".format("\\\n") + header += " | | \n" + header += " |_| iphelix@thesprawl.org\n" + header += "\n" parser = OptionParser("%prog [options] passwords.txt", version="%prog " + VERSION) diff --git a/statsgen.py b/statsgen.py index d6f174a..c81bb2a 100755 --- a/statsgen.py +++ b/statsgen.py @@ -241,15 +241,15 @@ def print_stats(self): if __name__ == "__main__": - header = " _ \n" - header += " StatsGen %s | |\n" % VERSION - header += " _ __ __ _ ___| | _\n" - header += " | '_ \ / _` |/ __| |/ /\n" - header += " | |_) | (_| | (__| < \n" - header += " | .__/ \__,_|\___|_|\_\\\n" - header += " | | \n" - header += " |_| iphelix@thesprawl.org\n" - header += "\n" + header = " _ \n" + header += " StatsGen %s | |\n" % VERSION + header += " _ __ __ _ ___| | _\n" + header += r" | '_ \ / _` |/ __| |/ /{}".format("\n") + header += " | |_) | (_| | (__| < \n" + header += r" | .__/ \__,_|\___|_|\_{}".format("\\\n") + header += " | | \n" + header += " |_| iphelix@thesprawl.org\n" + header += "\n" parser = OptionParser("%prog [options] passwords.txt\n\nType --help for more options", version="%prog "+VERSION)