From 8b439b5219fc498bc5a5480aa7e5a22c1273a256 Mon Sep 17 00:00:00 2001 From: Jose Luis Verdeguer Date: Mon, 8 Jan 2024 11:03:26 +0100 Subject: [PATCH] moved sipcrack to sipdigestcrack and sipdump to sippcapdump --- bin/{sipcrack => sipdigestcrack} | 6 +++--- bin/{sipdump => sippcapdump} | 8 ++++---- changelog.txt | 2 ++ setup.py | 4 ++-- src/sippts/lib/logos.py | 2 +- src/sippts/lib/params.py | 4 ++-- src/sippts/{sipcrack.py => sipdigestcrack.py} | 6 +++--- src/sippts/{sipdump.py => sippcapdump.py} | 6 +++--- 8 files changed, 20 insertions(+), 18 deletions(-) rename bin/{sipcrack => sipdigestcrack} (80%) rename bin/{sipdump => sippcapdump} (66%) rename src/sippts/{sipcrack.py => sipdigestcrack.py} (98%) rename src/sippts/{sipdump.py => sippcapdump.py} (96%) diff --git a/bin/sipcrack b/bin/sipdigestcrack similarity index 80% rename from bin/sipcrack rename to bin/sipdigestcrack index fbc4b2b..24ce0f2 100755 --- a/bin/sipcrack +++ b/bin/sipdigestcrack @@ -7,13 +7,13 @@ __license__ = "GPL" __copyright__ = "Copyright (C) 2015-2022, SIPPTS" __email__ = "pepeluxx@gmail.com" -from sippts.sipcrack import SipDigestCrack -from sippts.lib.params import get_sipcrack_args +from sippts.sipdigestcrack import SipDigestCrack +from sippts.lib.params import get_sipdigestcrack_args def main(): # Values - file, verbose, wordlist, bruteforce, charset, max, min, prefix, suffix = get_sipcrack_args() + file, verbose, wordlist, bruteforce, charset, max, min, prefix, suffix = get_sipdigestcrack_args() s = SipDigestCrack() s.file = file diff --git a/bin/sipdump b/bin/sippcapdump similarity index 66% rename from bin/sipdump rename to bin/sippcapdump index 55f27e6..5b7abc2 100755 --- a/bin/sipdump +++ b/bin/sippcapdump @@ -7,14 +7,14 @@ __license__ = "GPL" __copyright__ = "Copyright (C) 2015-2022, SIPPTS" __email__ = "pepeluxx@gmail.com" -from sippts.sipdump import SipDump -from sippts.lib.params import get_sipdump_args +from sippts.sippcapdump import SipPCAPDump +from sippts.lib.params import get_sippcapdump_args def main(): - file, ofile = get_sipdump_args() + file, ofile = get_sippcapdump_args() - s = SipDump() + s = SipPCAPDump() s.file = file s.ofile = ofile diff --git a/changelog.txt b/changelog.txt index e3dc859..aba8f3b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -12,6 +12,8 @@ devel: - added param -header to insert custom headers - global: - bug fixes +- Renamed script sipdump to sippcapdump +- Renamed script sipcrack to sipdigestcrack v3.3 (Nov/2022): - sipflood: diff --git a/setup.py b/setup.py index 9768bd0..68441b8 100755 --- a/setup.py +++ b/setup.py @@ -8,9 +8,9 @@ "bin/rtpbleed", "bin/rtpbleedflood", "bin/rtpbleedinject", - "bin/sipcrack", + "bin/sipdigestcrack", "bin/sipdigestleak", - "bin/sipdump", + "bin/sippcapdump", "bin/sipenumerate", "bin/sipexten", "bin/sipflood", diff --git a/src/sippts/lib/logos.py b/src/sippts/lib/logos.py index b2f9a68..9e8942e 100644 --- a/src/sippts/lib/logos.py +++ b/src/sippts/lib/logos.py @@ -84,7 +84,7 @@ def get_logo(self): ▀▄▄▄▄▄▀▄▄▄▀▄▄▄▀▀▀▀▀▄▄▄▄▄▀▄▄▄▀▀▄▄▀▀▄▄▄▄▀▀▄▄▄▀▄▄▄▀▄▄▄▄▄▀▄▄▀▄▄▀▄▄▀▄▄▀▀▄▄▄▀▀▄▄▄▄▄▀ ''' - if self.script == 'sipdump': + if self.script == 'sippcapdump': return ''' ██████████████████████████████████████████████ █─▄▄▄▄█▄─▄█▄─▄▄─███▄─▄▄▀█▄─██─▄█▄─▀█▀─▄█▄─▄▄─█ diff --git a/src/sippts/lib/params.py b/src/sippts/lib/params.py index f8a395d..16ac952 100644 --- a/src/sippts/lib/params.py +++ b/src/sippts/lib/params.py @@ -433,7 +433,7 @@ def get_sipinvite_args(): sys.exit(1) -def get_sipcrack_args(): +def get_sipdigestcrack_args(): parser = argparse.ArgumentParser( formatter_class=lambda prog: argparse.RawDescriptionHelpFormatter( prog, max_help_position=50), @@ -657,7 +657,7 @@ def get_sipenumerate_args(): sys.exit(1) -def get_sipdump_args(): +def get_sippcapdump_args(): parser = argparse.ArgumentParser( formatter_class=lambda prog: argparse.RawDescriptionHelpFormatter( prog, max_help_position=50), diff --git a/src/sippts/sipcrack.py b/src/sippts/sipdigestcrack.py similarity index 98% rename from src/sippts/sipcrack.py rename to src/sippts/sipdigestcrack.py index 9d2cacf..e5cc423 100644 --- a/src/sippts/sipcrack.py +++ b/src/sippts/sipdigestcrack.py @@ -142,7 +142,7 @@ def read_data(self): word_start = '' try: - with io.open("sipcrack.res", "r", newline=None, encoding="latin-1") as fd: + with io.open("sipdigestcrack.res", "r", newline=None, encoding="latin-1") as fd: for pline in fd: try: pl = pline.replace('\n', '') @@ -200,7 +200,7 @@ def save_file(self, wl, usr, pwd): print(self.c.WHITE + '\nSaving restore data ...') try: - with io.open("sipcrack.res", "r", newline=None, encoding="latin-1") as fd: + with io.open("sipdigestcrack.res", "r", newline=None, encoding="latin-1") as fd: for pline in fd: try: pl = pline.replace('\n', '') @@ -238,7 +238,7 @@ def save_file(self, wl, usr, pwd): self.charset, self.prefix, self.suffix, usr, b64pwd) lines.append(pl) - with open('sipcrack.res', 'w+') as f: + with open('sipdigestcrack.res', 'w+') as f: for l in lines: f.write(l+'\n') diff --git a/src/sippts/sipdump.py b/src/sippts/sippcapdump.py similarity index 96% rename from src/sippts/sipdump.py rename to src/sippts/sippcapdump.py index 6c43b61..e701f96 100644 --- a/src/sippts/sipdump.py +++ b/src/sippts/sippcapdump.py @@ -14,7 +14,7 @@ from .lib.logos import Logo -class SipDump: +class SipPCAPDump: def __init__(self): self.file = '' self.ofile = '' @@ -22,9 +22,9 @@ def __init__(self): self.c = Color() def start(self): - tmpfile = 'sipdump.tmp' + tmpfile = 'sippcapdump.tmp' - logo = Logo('sipdump') + logo = Logo('sippcapdump') logo.print() print(self.c.BWHITE+'[✓] Input file: %s ...' % self.file)