From 81aab712cfe805dc00010cb2ff5761787d0a4050 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sat, 29 Oct 2011 10:17:30 -0400 Subject: SpliceX update: pyinstall added --- contrib/splicex.tgz | Bin 204800 -> 0 bytes contrib/splicex/README | 70 ++- contrib/splicex/configure | 69 ++- contrib/splicex/src/deshadow.pyx | 7 + contrib/splicex/src/make.in | 11 +- contrib/splicex/src/pymake.in | 62 +++ contrib/splicex/src/splicex-deshadow.py | 7 +- contrib/splicex/src/splicex.py | 2 +- contrib/splicex/src/splicex.pyx | 751 ++++++++++++++++---------------- 9 files changed, 559 insertions(+), 420 deletions(-) delete mode 100644 contrib/splicex.tgz create mode 100644 contrib/splicex/src/deshadow.pyx create mode 100644 contrib/splicex/src/pymake.in diff --git a/contrib/splicex.tgz b/contrib/splicex.tgz deleted file mode 100644 index 98e255b..0000000 Binary files a/contrib/splicex.tgz and /dev/null differ diff --git a/contrib/splicex/README b/contrib/splicex/README index 66dc9a7..2a44677 100644 --- a/contrib/splicex/README +++ b/contrib/splicex/README @@ -21,33 +21,71 @@ AUTHOR: d3v11 -DEPENDS ON: - python (>=2.6), python-dev(>=2.6), cython (>=0.12.1), - gcc (>=4.4.3), bash (>=4.1.5), man (>=2.5.7) (UN)INSTALL: - SOURCE: + You may optionally install splicex with cython. Doing so takes + longer to install because of compile times but splicex will + also be 20% to 35% faster, depending on your system. I recommend + this option if you intend on putting splicex to long-term use. + If your goal is simply to test, try, and/or debug splicex then + using the pythonic install will be more practical. - ./configure - make compile - make install + DEPENDS ON: - DEBIAN/UBUNTU: + python (>=2.6), python-dev(>=2.6), cython (>=0.12.1), + gcc (>=4.4.3), bash (>=4.1.5), man (>=2.5.7) - ./configure - make compile - make install-deb + SOURCE: - UNINSTALL: + ./configure + make compile + make install + + DEBIAN/UBUNTU: + + ./configure + make compile + make install-deb + + UNINSTALL: - source: - make uninstall + SOURCE: + make uninstall + + DEBIAN/UBUNTU: + apt-get remove splicex + +PYTHONIC (UN)INSTALL: + + You make optionally install splicex as pure python. + Install times are quick but splicex will be 20% to 35% + slower than compiling an executable binary with the + cython + gcc option above. I recommend using this option + if you simply want to test, try, and/or debug splicex. + + DEPENDS ON: - debian/ubuntu: - apt-get remove splicex + python (>=2.6), bash (>=4.1.5), man (>=2.5.7) + + SOURCE: + + ./configure --no-compile + make pyinstall + + DEBIAN/UBUNTU: + + ./configure --no-compile + make pyinstall-deb + + UNINSTALL: + + SOURCE: + make uninstall + DEBIAN/UBUNTU: + apt-get remove splicex TOOLS: diff --git a/contrib/splicex/configure b/contrib/splicex/configure index 2795772..535520e 100755 --- a/contrib/splicex/configure +++ b/contrib/splicex/configure @@ -1,11 +1,16 @@ #!/bin/bash if [ -z "$1" ]; then - echo 'usage: ./configure ' + echo 'usage: ./configure {optional: <--no-compile>}' + exit 1 +fi + +if [ -n "$2" ] && [[ "$2" != *--no-compile* ]]; then + echo 'usage: ./configure {optional: <--no-compile>}' exit 1 fi echo -e 'checking dependencies: ' -echo -ne " checking for python as <$1>..." +echo -ne " checking for python as <$1>..." if which `which "$1"` >/dev/null; then PYPATH=`which "$1"` echo -ne ' OK' @@ -24,32 +29,52 @@ else exit 1 fi -echo -ne ' checking for cython...' -if which cython >/dev/null; then - echo -ne ' OK' - echo -else - echo -ne ' FAILED' - exit 1 +if [ -z "$2" ]; then + echo -ne ' checking for cython...' + if which cython >/dev/null; then + echo -ne ' OK' + echo + else + echo -ne ' FAILED' + exit 1 + fi fi -echo -ne ' checking for gcc...' -if which gcc >/dev/null; then - echo -ne ' OK' - echo -else - echo -ne ' FAILED' - exit 1 +if [ -z "$2" ]; then + echo -ne ' checking for gcc...' + if which gcc >/dev/null; then + echo -ne ' OK' + echo + else + echo -ne ' FAILED' + exit 1 + fi fi echo echo -ne "configuring splicex: " echo -echo -e " python version == $1" -echo -e " interpreter path == $PYPATH" -echo -e " compiler flags == gcc -I/usr/include/$1" -sed -e s^PYTHON^"$1"^g src/make.in >Makefile -sed -e s^PYTHON^"$PYPATH"^g src/splicex.py >build/splicex -sed -e s^PYTHON^"$PYPATH"^g src/splicex-deshadow.py >build/splicex-deshadow +echo -e " python version == $1" +echo -e " interpreter path == $PYPATH" +if [ -z "$2" ]; then + echo -e " compiler flags == gcc -I/usr/include/$1" +fi +echo +if [ -z "$2" ]; then + sed -e s^PYTHON^"$PYPATH"^g src/splicex.py >build/splicex || exit 1 + sed -e s^PYTHON^"$PYPATH"^g src/splicex-deshadow.py >build/splicex-deshadow || exit 1 +fi +sed -e s^PYTHON^"$PYPATH"^g src/splicex.pyx >build/splicex.pyx || exit 1 +sed -e s^PYTHON^"$PYPATH"^g src/deshadow.pyx >build/deshadow.pyx || exit 1 +echo -ne " generating Makefile..." +if [ -z "$2" ]; then + sed -e s^PYTHON^"$1"^g src/make.in >Makefile || exit 1 + echo -ne ' DONE' + echo +else + sed -e s^PYTHON^"$1"^g src/pymake.in >Makefile || exit 1 + echo -ne ' DONE' + echo +fi echo echo -e 'splicex configured' diff --git a/contrib/splicex/src/deshadow.pyx b/contrib/splicex/src/deshadow.pyx new file mode 100644 index 0000000..c8e11ec --- /dev/null +++ b/contrib/splicex/src/deshadow.pyx @@ -0,0 +1,7 @@ +#!PYTHON +import sys; sys.tracebacklimit = 0 +from crypt import crypt +TestHash = crypt(sys.argv[1], sys.argv[2]) +HashValue = sys.argv[3] +if TestHash.__contains__(HashValue): + print("SHADOW CRACKED") diff --git a/contrib/splicex/src/make.in b/contrib/splicex/src/make.in index 1ed50d2..5393658 100644 --- a/contrib/splicex/src/make.in +++ b/contrib/splicex/src/make.in @@ -1,10 +1,13 @@ compile: - cython src/splicex.pyx -o build/splicex.c + cython build/deshadow.pyx -o build/deshadow.c + gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/PYTHON -c build/deshadow.c -o build/deshadow.o + gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions build/deshadow.o -o build/deshadow.so + + cython build/splicex.pyx -o build/splicex.c gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/PYTHON -c build/splicex.c -o build/splicex.o gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions build/splicex.o -o build/splicex.so install-deb: - make preinstall mkdir DEBIAN/splicex mkdir DEBIAN/splicex/DEBIAN mkdir DEBIAN/splicex/usr @@ -13,7 +16,8 @@ install-deb: mkdir DEBIAN/splicex/etc/splicex cp DEBIAN/control DEBIAN/splicex/DEBIAN/control cp build/splicex DEBIAN/splicex/usr/bin/splicex - cp build/splicex.so /etc/splicex/splicex.so + cp build/splicex.so DEBIAN/etc/splicex/splicex.so + cp build/deshadow.so DEBIAN/etc/splicex/deshadow.so cp build/splicex-deshadow DEBIAN/splicex/usr/bin/splicex-deshadow chmod +x DEBIAN/splicex/usr/bin/splicex chmod +x DEBIAN/splicex/usr/bin/splicex-deshadow @@ -36,6 +40,7 @@ install: mkdir /etc/splicex cp build/splicex /usr/bin/splicex cp build/splicex.so /etc/splicex/splicex.so + cp build/deshadow.so /etc/splicex/deshadow.so cp build/splicex-deshadow /usr/bin/splicex-deshadow chmod +x /usr/bin/splicex chmod +x /usr/bin/splicex-deshadow diff --git a/contrib/splicex/src/pymake.in b/contrib/splicex/src/pymake.in new file mode 100644 index 0000000..f948da6 --- /dev/null +++ b/contrib/splicex/src/pymake.in @@ -0,0 +1,62 @@ +pyinstall-deb: + mkdir DEBIAN/splicex + mkdir DEBIAN/splicex/DEBIAN + mkdir DEBIAN/splicex/usr + mkdir DEBIAN/splicex/usr/bin + mkdir DEBIAN/splicex/etc + mkdir DEBIAN/splicex/etc/splicex + cp DEBIAN/control DEBIAN/splicex/DEBIAN/control + cp build/splicex.pyx DEBIAN/splicex/usr/bin/splicex + cp build/deshadow.pyx DEBIAN/splicex/usr/bin/splicex-deshadow + chmod +x DEBIAN/splicex/usr/bin/splicex + chmod +x DEBIAN/splicex/usr/bin/splicex-deshadow + cp src/splicex.list DEBIAN/splicex/etc/splicex/splicex.list + cp src/manual DEBIAN/splicex/etc/splicex/splicex.1 + gzip DEBIAN/splicex/etc/splicex/splicex.1 + cp src/splicex.L DEBIAN/splicex/etc/splicex/splicex.L + cp src/splicex.N DEBIAN/splicex/etc/splicex/splicex.N + cp src/splicex.S DEBIAN/splicex/etc/splicex/splicex.S + cp src/splicex.LN DEBIAN/splicex/etc/splicex/splicex.LN + cp src/splicex.LS DEBIAN/splicex/etc/splicex/splicex.LS + cp src/splicex.NS DEBIAN/splicex/etc/splicex/splicex.NS + cp src/splicex.ALL DEBIAN/splicex/etc/splicex/splicex.ALL + dpkg-deb --build DEBIAN/splicex + dpkg -i DEBIAN/splicex.deb + rm -rf DEBIAN/splicex DEBIAN/splicex.deb + +pyinstall: + make preinstall + mkdir /etc/splicex + cp build/splicex.pyx /usr/bin/splicex + cp build/deshadow.pyx /usr/bin/splicex-deshadow + chmod +x /usr/bin/splicex + chmod +x /usr/bin/splicex-deshadow + cp src/splicex.list /etc/splicex/splicex.list + cp src/manual /etc/splicex/splicex.1 + gzip /etc/splicex/splicex.1 + cp src/splicex.L /etc/splicex/splicex.L + cp src/splicex.N /etc/splicex/splicex.N + cp src/splicex.S /etc/splicex/splicex.S + cp src/splicex.LN /etc/splicex/splicex.LN + cp src/splicex.LS /etc/splicex/splicex.LS + cp src/splicex.NS /etc/splicex/splicex.NS + cp src/splicex.ALL /etc/splicex/splicex.ALL + +uninstall: + rm -rf /etc/splicex + rm -f /usr/bin/splicex + rm -f /usr/bin/splicex-deshadow + +clean: + rm Makefile DEBIAN/splicex DEBIAN/*.deb build/* -rf + +preinstall: + rm -rf /etc/splicex + rm -f /usr/bin/splicex + rm -f /usr/bin/splicex-deshadow + rm DEBIAN/splicex DEBIAN/*.deb -rf + +update: + wget http://www.d3v11.ano/splicex.tgz + tar -xvf ../splicex.tgz --directory='../' + rm ../splicex.tgz diff --git a/contrib/splicex/src/splicex-deshadow.py b/contrib/splicex/src/splicex-deshadow.py index c8e11ec..d027f1c 100644 --- a/contrib/splicex/src/splicex-deshadow.py +++ b/contrib/splicex/src/splicex-deshadow.py @@ -1,7 +1,4 @@ #!PYTHON import sys; sys.tracebacklimit = 0 -from crypt import crypt -TestHash = crypt(sys.argv[1], sys.argv[2]) -HashValue = sys.argv[3] -if TestHash.__contains__(HashValue): - print("SHADOW CRACKED") +sys.path.append('/etc/splicex') +import deshadow diff --git a/contrib/splicex/src/splicex.py b/contrib/splicex/src/splicex.py index 968e163..8d3ff79 100644 --- a/contrib/splicex/src/splicex.py +++ b/contrib/splicex/src/splicex.py @@ -1,4 +1,4 @@ #!PYTHON -import sys +import sys; sys.tracebacklimit = 0 sys.path.append('/etc/splicex') import splicex diff --git a/contrib/splicex/src/splicex.pyx b/contrib/splicex/src/splicex.pyx index 859e6e3..22c4f32 100644 --- a/contrib/splicex/src/splicex.pyx +++ b/contrib/splicex/src/splicex.pyx @@ -1729,7 +1729,8 @@ else: if not Word: sys.exit(SpliceX + "error: compiled empty wordlist") -Word = list(set(Word)) +Word = list(set(Word)) +WordCount = 0 ShowWord = [] PassWd = [] for Input in Word: @@ -1739,9 +1740,7 @@ for Input in Word: c += "\\\\\\" + let PassWd.append(c) -timeup = 0 -PassAmount = 0 -StartTime = time.time() - 1 + if TIME != None: try: TIME = TIME.split(", ") @@ -1773,13 +1772,19 @@ else: length_start = 0 length_end = 10 -WordCount = 0 -for CountWords in ShowWord: - WordCount += 1 - def BF1(): - global timeup, PassAmount + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 + StartTime = time.time() + StartTime = StartTime - 1 + PassAmount = 0 + timeup = 0 for u in range(StateU, UserCount): + if length_start > 0: + break + if length_end < 0: + sys.exit(SpliceX + 'unable to find password') for x in range(StateW, WordCount): if SaveSwitch is True: WriteSave = [] @@ -1830,10 +1835,20 @@ def BF1(): print(output) def BF2(): - global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 + StartTime = time.time() + StartTime = StartTime - 1 + PassAmount = 0 + timeup = 0 for u in range(StateU, UserCount): + if length_start > 1: + break + if length_end < 1: + sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for x in range(StateW, WordCount): if SaveSwitch is True: @@ -1905,10 +1920,20 @@ def BF2(): print(output) def BF3(): - global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 + StartTime = time.time() + StartTime = StartTime - 1 + PassAmount = 0 + timeup = 0 for u in range(StateU, UserCount): + if length_start > 2: + break + if length_end < 2: + sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for x in range(StateW, WordCount): @@ -2000,10 +2025,20 @@ def BF3(): print(output) def BF4(): - global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 + StartTime = time.time() + StartTime = StartTime - 1 + PassAmount = 0 + timeup = 0 for u in range(StateU, UserCount): + if length_start > 3: + break + if length_end < 3: + sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2115,10 +2150,20 @@ def BF4(): print(output) def BF5(): - global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 + StartTime = time.time() + StartTime = StartTime - 1 + PassAmount = 0 + timeup = 0 for u in range(StateU, UserCount): + if length_start > 4: + break + if length_end < 4: + sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2214,10 +2259,20 @@ def BF5(): print(output) def BF6(): - global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 + StartTime = time.time() + StartTime = StartTime - 1 + PassAmount = 0 + timeup = 0 for u in range(StateU, UserCount): + if length_start > 5: + break + if length_end < 5: + sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2333,10 +2388,20 @@ def BF6(): print(output) def BF7(): - global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 + StartTime = time.time() + StartTime = StartTime - 1 + PassAmount = 0 + timeup = 0 for u in range(StateU, UserCount): + if length_start > 6: + break + if length_end < 6: + sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2436,10 +2501,20 @@ def BF7(): print(output) def BF8(): - global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 + StartTime = time.time() + StartTime = StartTime - 1 + PassAmount = 0 + timeup = 0 for u in range(StateU, UserCount): + if length_start > 7: + break + if length_end < 7: + sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2559,10 +2634,20 @@ def BF8(): print(output) def BF9(): - global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 + StartTime = time.time() + StartTime = StartTime - 1 + PassAmount = 0 + timeup = 0 for u in range(StateU, UserCount): + if length_start > 8: + break + if length_end < 8: + sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2666,10 +2751,20 @@ def BF9(): print(output) def BF10(): - global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 + StartTime = time.time() + StartTime = StartTime - 1 + PassAmount = 0 + timeup = 0 for u in range(StateU, UserCount): + if length_start > 9: + break + if length_end < 9: + sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2793,10 +2888,20 @@ def BF10(): print(output) def BF11(): - global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 + StartTime = time.time() + StartTime = StartTime - 1 + PassAmount = 0 + timeup = 0 for u in range(StateU, UserCount): + if length_start > 10: + break + if length_end < 10: + sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2904,7 +3009,14 @@ def BF11(): print(output) def SBF1(): + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 for u in range(StateU, UserCount): + if length_start > 0: + break + if length_end < 0: + sys.exit(0) for x in range(StateW, WordCount): if SaveSwitch is True: WriteSave = [] @@ -2940,9 +3052,16 @@ def SBF1(): print(NewShowWord.replace(" ", "")) def SBF2(): + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): + if length_start > 1: + break + if length_end < 1: + sys.exit(0) for a in range(StateA, EndCount): for x in range(StateW, WordCount): if SaveSwitch is True: @@ -2984,9 +3103,16 @@ def SBF2(): print(NewShowWord.replace(" ", "")) def SBF3(): + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): + if length_start > 2: + break + if length_end < 2: + sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for x in range(StateW, WordCount): @@ -3033,9 +3159,16 @@ def SBF3(): print(NewShowWord.replace(" ", "")) def SBF4(): + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): + if length_start > 3: + break + if length_end < 3: + sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3087,9 +3220,16 @@ def SBF4(): print(NewShowWord.replace(" ", "")) def SBF5(): + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): + if length_start > 4: + break + if length_end < 4: + sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3140,9 +3280,16 @@ def SBF5(): print(NewShowWord.replace(" ", "")) def SBF6(): + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): + if length_start > 5: + break + if length_end < 5: + sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3198,9 +3345,16 @@ def SBF6(): print(NewShowWord.replace(" ", "")) def SBF7(): + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): + if length_start > 6: + break + if length_end < 6: + sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3255,9 +3409,16 @@ def SBF7(): print(NewShowWord.replace(" ", "")) def SBF8(): + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): + if length_start > 7: + break + if length_end < 7: + sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3317,9 +3478,16 @@ def SBF8(): print(NewShowWord.replace(" ", "")) def SBF9(): + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): + if length_start > 8: + break + if length_end < 8: + sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3378,9 +3546,16 @@ def SBF9(): print(NewShowWord.replace(" ", "")) def SBF10(): + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): + if length_start > 9: + break + if length_end < 9: + sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3444,9 +3619,16 @@ def SBF10(): print(NewShowWord.replace(" ", "")) def SBF11(): + WordCount = 0 + for CountWords in ShowWord: + WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): + if length_start > 10: + break + if length_end < 10: + sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3547,183 +3729,6 @@ if Create is True: sys.stdout.write('\r') sys.exit(SpliceX + 'compiled ' + str(N) + ' passwords. enjoy ;-)') -def C_BF1(): - if length_start > 0: - pass - elif length_end < 0: - sys.exit(SpliceX + 'unable to find password') - elif StdoutSwitch is True: - BF1() - -def C_BF2(): - if length_start > 1: - pass - elif length_end < 1: - sys.exit(SpliceX + 'unable to find password') - else: - BF2() - -def C_BF3(): - if length_start > 2: - pass - elif length_end < 2: - sys.exit(SpliceX + 'unable to find password') - else: - BF3() - -def C_BF4(): - if length_start > 3: - pass - elif length_end < 3: - sys.exit(SpliceX + 'unable to find password') - else: - BF4() - -def C_BF5(): - if length_start > 4: - pass - elif length_end < 4: - sys.exit(SpliceX + 'unable to find password') - else: - BF5() - -def C_BF6(): - if length_start > 5: - pass - elif length_end < 5: - sys.exit(SpliceX + 'unable to find password') - else: - BF6() - -def C_BF7(): - if length_start > 6: - pass - elif length_end < 6: - sys.exit(SpliceX + 'unable to find password') - else: - BF7() - -def C_BF8(): - if length_start > 7: - pass - elif length_end < 7: - sys.exit(SpliceX + 'unable to find password') - else: - BF8() - -def C_BF9(): - if length_start > 8: - pass - elif length_end < 8: - sys.exit(SpliceX + 'unable to find password') - else: - BF9() - -def C_BF10(): - if length_start > 9: - pass - elif length_end < 9: - sys.exit(SpliceX + 'unable to find password') - else: - BF10() - -def C_BF11(): - if length_start > 10: - pass - elif length_end < 10: - sys.exit(SpliceX + 'unable to find password') - else: - BF11() - -def C_SBF1(): - if length_start > 0: - pass - elif length_end < 0: - sys.exit(0) - elif StdoutSwitch is True: - SBF1() - -def C_SBF2(): - if length_start > 1: - pass - elif length_end < 1: - sys.exit(0) - else: - SBF2() - -def C_SBF3(): - if length_start > 2: - pass - elif length_end < 2: - sys.exit(0) - else: - SBF3() - -def C_SBF4(): - if length_start > 3: - pass - elif length_end < 3: - sys.exit(0) - else: - SBF4() - -def C_SBF5(): - if length_start > 4: - pass - elif length_end < 4: - sys.exit(0) - else: - SBF5() - -def C_SBF6(): - if length_start > 5: - pass - elif length_end < 5: - sys.exit(0) - else: - SBF6() - -def C_SBF7(): - if length_start > 6: - pass - elif length_end < 6: - sys.exit(0) - else: - SBF7() - -def C_SBF8(): - if length_start > 7: - pass - elif length_end < 7: - sys.exit(0) - else: - SBF8() - -def C_SBF9(): - if length_start > 8: - pass - elif length_end < 8: - sys.exit(0) - else: - SBF9() - -def C_SBF10(): - if length_start > 9: - pass - elif length_end < 9: - sys.exit(0) - else: - SBF10() - -def C_SBF11(): - if length_start > 10: - pass - elif length_end < 10: - sys.exit(0) - else: - SBF11() - - if RestoreSwitch is False: StateCount = 0 if RestoreSwitch is False and StdoutSwitch is False: @@ -3739,17 +3744,17 @@ if RestoreSwitch is False and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF1() - C_BF2() - C_BF3() - C_BF4() - C_BF5() - C_BF6() - C_BF7() - C_BF8() - C_BF9() - C_BF10() - C_BF11() + BF1() + BF2() + BF3() + BF4() + BF5() + BF6() + BF7() + BF8() + BF9() + BF10() + BF11() sys.exit(SpliceX + " unable to find password") if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is False: @@ -3765,7 +3770,7 @@ if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF1() + BF1() StateW = 0 StateA = 0 StateB = 0 @@ -3777,18 +3782,18 @@ if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF2() - C_BF3() - C_BF4() - C_BF5() - C_BF6() - C_BF7() - C_BF8() - C_BF9() - C_BF10() - C_BF11() + BF2() + BF3() + BF4() + BF5() + BF6() + BF7() + BF8() + BF9() + BF10() + BF11() sys.exit(SpliceX + " unable to find password") -if StateCount == 23 and RestoreSwitch is True and StdoutSwitch is False: +if StateCount == 21 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) StateW = int(State[23]) StateA = 0 @@ -3801,7 +3806,7 @@ if StateCount == 23 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF1() + BF1() StateW = 0 StateA = 0 StateB = 0 @@ -3813,16 +3818,16 @@ if StateCount == 23 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF2() - C_BF3() - C_BF4() - C_BF5() - C_BF6() - C_BF7() - C_BF8() - C_BF9() - C_BF10() - C_BF11() + BF2() + BF3() + BF4() + BF5() + BF6() + BF7() + BF8() + BF9() + BF10() + BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -3837,7 +3842,7 @@ elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF2() + BF2() StateW = 0 StateA = 0 StateB = 0 @@ -3849,15 +3854,15 @@ elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF3() - C_BF4() - C_BF5() - C_BF6() - C_BF7() - C_BF8() - C_BF9() - C_BF10() - C_BF11() + BF3() + BF4() + BF5() + BF6() + BF7() + BF8() + BF9() + BF10() + BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -3872,7 +3877,7 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF3() + BF3() StateW = 0 StateA = 0 StateB = 0 @@ -3884,14 +3889,14 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF4() - C_BF5() - C_BF6() - C_BF7() - C_BF8() - C_BF9() - C_BF10() - C_BF11() + BF4() + BF5() + BF6() + BF7() + BF8() + BF9() + BF10() + BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 26 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -3906,7 +3911,7 @@ elif StateCount == 26 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF4() + BF4() StateW = 0 StateA = 0 StateB = 0 @@ -3918,13 +3923,13 @@ elif StateCount == 26 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF5() - C_BF6() - C_BF7() - C_BF8() - C_BF9() - C_BF10() - C_BF11() + BF5() + BF6() + BF7() + BF8() + BF9() + BF10() + BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -3939,7 +3944,7 @@ elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF5() + BF5() StateW = 0 StateA = 0 StateB = 0 @@ -3951,12 +3956,12 @@ elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF6() - C_BF7() - C_BF8() - C_BF9() - C_BF10() - C_BF11() + BF6() + BF7() + BF8() + BF9() + BF10() + BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -3971,7 +3976,7 @@ elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF6() + BF6() StateW = 0 StateA = 0 StateB = 0 @@ -3983,11 +3988,11 @@ elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF7() - C_BF8() - C_BF9() - C_BF10() - C_BF11() + BF7() + BF8() + BF9() + BF10() + BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -4002,7 +4007,7 @@ elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF7() + BF7() StateW = 0 StateA = 0 StateB = 0 @@ -4014,10 +4019,10 @@ elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF8() - C_BF9() - C_BF10() - C_BF11() + BF8() + BF9() + BF10() + BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -4032,7 +4037,7 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF8() + BF8() StateW = 0 StateA = 0 StateB = 0 @@ -4044,9 +4049,9 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF9() - C_BF10() - C_BF11() + BF9() + BF10() + BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -4061,7 +4066,7 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateH = int(State[31]) StateI = 0 StateJ = 0 - C_BF9() + BF9() StateW = 0 StateA = 0 StateB = 0 @@ -4073,8 +4078,8 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF10() - C_BF11() + BF10() + BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -4089,7 +4094,7 @@ elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is False: StateH = int(State[31]) StateI = int(State[32]) StateJ = 0 - C_BF10() + BF10() StateW = 0 StateA = 0 StateB = 0 @@ -4101,7 +4106,7 @@ elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - C_BF11() + BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 33 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -4116,7 +4121,7 @@ elif StateCount == 33 and RestoreSwitch is True and StdoutSwitch is False: StateH = int(State[31]) StateI = int(State[32]) StateJ = int(State[33]) - C_BF11() + BF11() sys.exit(SpliceX + " unable to find password") if RestoreSwitch is False and StdoutSwitch is True: @@ -4132,17 +4137,17 @@ if RestoreSwitch is False and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF1() - C_SBF2() - C_SBF3() - C_SBF4() - C_SBF5() - C_SBF6() - C_SBF7() - C_SBF8() - C_SBF9() - C_SBF10() - C_SBF11() + SBF1() + SBF2() + SBF3() + SBF4() + SBF5() + SBF6() + SBF7() + SBF8() + SBF9() + SBF10() + SBF11() sys.exit(0) if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is True: @@ -4158,7 +4163,7 @@ if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF1() + SBF1() StateW = 0 StateA = 0 StateB = 0 @@ -4170,16 +4175,16 @@ if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF2() - C_SBF3() - C_SBF4() - C_SBF5() - C_SBF6() - C_SBF7() - C_SBF8() - C_SBF9() - C_SBF10() - C_SBF11() + SBF2() + SBF3() + SBF4() + SBF5() + SBF6() + SBF7() + SBF8() + SBF9() + SBF10() + SBF11() sys.exit(0) if StateCount == 23 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4194,7 +4199,7 @@ if StateCount == 23 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF1() + SBF1() StateW = 0 StateA = 0 StateB = 0 @@ -4206,16 +4211,16 @@ if StateCount == 23 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF2() - C_SBF3() - C_SBF4() - C_SBF5() - C_SBF6() - C_SBF7() - C_SBF8() - C_SBF9() - C_SBF10() - C_SBF11() + SBF2() + SBF3() + SBF4() + SBF5() + SBF6() + SBF7() + SBF8() + SBF9() + SBF10() + SBF11() sys.exit(0) elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4230,7 +4235,7 @@ elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF2() + SBF2() StateW = 0 StateA = 0 StateB = 0 @@ -4242,15 +4247,15 @@ elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF3() - C_SBF4() - C_SBF5() - C_SBF6() - C_SBF7() - C_SBF8() - C_SBF9() - C_SBF10() - C_SBF11() + SBF3() + SBF4() + SBF5() + SBF6() + SBF7() + SBF8() + SBF9() + SBF10() + SBF11() sys.exit(0) elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4265,7 +4270,7 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF3() + SBF3() StateW = 0 StateA = 0 StateB = 0 @@ -4277,14 +4282,14 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF4() - C_SBF5() - C_SBF6() - C_SBF7() - C_SBF8() - C_SBF9() - C_SBF10() - C_SBF11() + SBF4() + SBF5() + SBF6() + SBF7() + SBF8() + SBF9() + SBF10() + SBF11() sys.exit(0) elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4299,7 +4304,7 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF4() + SBF4() StateW = 0 StateA = 0 StateB = 0 @@ -4311,13 +4316,13 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF5() - C_SBF6() - C_SBF7() - C_SBF8() - C_SBF9() - C_SBF10() - C_SBF11() + SBF5() + SBF6() + SBF7() + SBF8() + SBF9() + SBF10() + SBF11() sys.exit(0) elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4332,7 +4337,7 @@ elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF5() + SBF5() StateW = 0 StateA = 0 StateB = 0 @@ -4344,12 +4349,12 @@ elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF6() - C_SBF7() - C_SBF8() - C_SBF9() - C_SBF10() - C_SBF11() + SBF6() + SBF7() + SBF8() + SBF9() + SBF10() + SBF11() sys.exit(0) elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4364,7 +4369,7 @@ elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF6() + SBF6() StateW = 0 StateA = 0 StateB = 0 @@ -4376,11 +4381,11 @@ elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF7() - C_SBF8() - C_SBF9() - C_SBF10() - C_SBF11() + SBF7() + SBF8() + SBF9() + SBF10() + SBF11() sys.exit(0) elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4395,7 +4400,7 @@ elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF7() + SBF7() StateW = 0 StateA = 0 StateB = 0 @@ -4407,10 +4412,10 @@ elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF8() - C_SBF9() - C_SBF10() - C_SBF11() + SBF8() + SBF9() + SBF10() + SBF11() sys.exit(0) elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4425,7 +4430,7 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF8() + SBF8() StateW = 0 StateA = 0 StateB = 0 @@ -4437,9 +4442,9 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF9() - C_SBF10() - C_SBF11() + SBF9() + SBF10() + SBF11() sys.exit(0) elif StateCount == 31 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4454,7 +4459,7 @@ elif StateCount == 31 and RestoreSwitch is True and StdoutSwitch is True: StateH = int(State[31]) StateI = 0 StateJ = 0 - C_SBF9() + SBF9() StateW = 0 StateA = 0 StateB = 0 @@ -4466,8 +4471,8 @@ elif StateCount == 31 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF10() - C_SBF11() + SBF10() + SBF11() sys.exit(0) elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4482,7 +4487,7 @@ elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is True: StateH = int(State[31]) StateI = int(State[32]) StateJ = 0 - C_SBF10() + SBF10() StateW = 0 StateA = 0 StateB = 0 @@ -4494,7 +4499,7 @@ elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - C_SBF11() + SBF11() sys.exit(0) elif StateCount == 33 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4509,7 +4514,7 @@ elif StateCount == 33 and RestoreSwitch is True and StdoutSwitch is True: StateH = int(State[31]) StateI = int(State[32]) StateJ = int(State[33]) - C_SBF11() + SBF11() sys.exit(0) sys.exit(SpliceX + " unknown error: please report bug to author") -- cgit v1.2.3 From 78e607b3e4c55b830193dee5711b220e6ca79720 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sat, 29 Oct 2011 11:37:41 -0400 Subject: SpliceX patched compiler for /path/to/Python.h and /path/to/structmember.h --- contrib/splicex/CHANGES | 20 ++++++++++++++++++++ contrib/splicex/README | 14 ++++++++++++++ contrib/splicex/configure | 11 ++++++++++- contrib/splicex/src/make.in | 4 ++-- 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/contrib/splicex/CHANGES b/contrib/splicex/CHANGES index 3a0e43b..442a19e 100644 --- a/contrib/splicex/CHANGES +++ b/contrib/splicex/CHANGES @@ -25,3 +25,23 @@ CHANGES: via Cython. see README for dependencies and installation details. + SpliceX compiler flags patched. recent + update did not distinguish: + + /usr/include/ + + -FROM- + + /usr/local/include/ + + Thus, if you have debian python-dev or + source python-dev the ./configure script + should choose the appropriate option. + if the configure still failed to locate + the python development files (headers) + please let me know and I will correct. + + SpliceX can now optionally do a pure + python install. This cuts down on + dependencies and is useful if you just + want to test, try, and/or debug. diff --git a/contrib/splicex/README b/contrib/splicex/README index 2a44677..1a8bf8a 100644 --- a/contrib/splicex/README +++ b/contrib/splicex/README @@ -32,6 +32,20 @@ AUTHOR: If your goal is simply to test, try, and/or debug splicex then using the pythonic install will be more practical. + NOTES: + + If you installed Python from source you can ignore + the python-dev dependency below. However, your source + install of Python must have the development files. IE: + + tar xvf Python-*.tgz + cd Python-* + ./configure --with-pydebug + make install + + This generates Python.h and structmember.h, which are + need for gcc to compile splicex. + DEPENDS ON: python (>=2.6), python-dev(>=2.6), cython (>=0.12.1), diff --git a/contrib/splicex/configure b/contrib/splicex/configure index 535520e..933b51d 100755 --- a/contrib/splicex/configure +++ b/contrib/splicex/configure @@ -57,7 +57,15 @@ echo echo -e " python version == $1" echo -e " interpreter path == $PYPATH" if [ -z "$2" ]; then - echo -e " compiler flags == gcc -I/usr/include/$1" + if [ -e /usr/include/"$1"/Python.h ] && [ -e /usr/include/"$1"/structmember.h ]; then + PYHEADERS="/usr/include/$1" + echo -e " compiler flags == gcc -I /usr/include/$1" + elif [ -e /usr/local/include/"$1"/Python.h ] && [ -e /usr/local/include/"$1"/structmember.h ]; then + PYHEADERS="/usr/local/include/$1" + echo -e " compiler flags == gcc -I /usr/local/include/$1" + else + echo -e " Python.h and structmember.h could not be found... FAILED" + fi fi echo if [ -z "$2" ]; then @@ -69,6 +77,7 @@ sed -e s^PYTHON^"$PYPATH"^g src/deshadow.pyx >build/deshadow.pyx || exit 1 echo -ne " generating Makefile..." if [ -z "$2" ]; then sed -e s^PYTHON^"$1"^g src/make.in >Makefile || exit 1 + sed -i s^HEADERS^"$PYHEADERS"^g Makefile || exit 1 echo -ne ' DONE' echo else diff --git a/contrib/splicex/src/make.in b/contrib/splicex/src/make.in index 5393658..3ebd9a0 100644 --- a/contrib/splicex/src/make.in +++ b/contrib/splicex/src/make.in @@ -1,10 +1,10 @@ compile: cython build/deshadow.pyx -o build/deshadow.c - gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/PYTHON -c build/deshadow.c -o build/deshadow.o + gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I HEADERS -c build/deshadow.c -o build/deshadow.o gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions build/deshadow.o -o build/deshadow.so cython build/splicex.pyx -o build/splicex.c - gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/PYTHON -c build/splicex.c -o build/splicex.o + gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I HEADERS -c build/splicex.c -o build/splicex.o gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions build/splicex.o -o build/splicex.so install-deb: -- cgit v1.2.3 From 516246a2c7ca83a055711b5703b3859560b5a23c Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sat, 29 Oct 2011 11:41:38 -0400 Subject: SpliceX `make pyinstall*` now `make install` --- contrib/splicex/README | 4 ++-- contrib/splicex/src/pymake.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/splicex/README b/contrib/splicex/README index 1a8bf8a..66d01a2 100644 --- a/contrib/splicex/README +++ b/contrib/splicex/README @@ -86,12 +86,12 @@ PYTHONIC (UN)INSTALL: SOURCE: ./configure --no-compile - make pyinstall + make install DEBIAN/UBUNTU: ./configure --no-compile - make pyinstall-deb + make install-deb UNINSTALL: diff --git a/contrib/splicex/src/pymake.in b/contrib/splicex/src/pymake.in index f948da6..5ca74e2 100644 --- a/contrib/splicex/src/pymake.in +++ b/contrib/splicex/src/pymake.in @@ -1,4 +1,4 @@ -pyinstall-deb: +install-deb: mkdir DEBIAN/splicex mkdir DEBIAN/splicex/DEBIAN mkdir DEBIAN/splicex/usr @@ -24,7 +24,7 @@ pyinstall-deb: dpkg -i DEBIAN/splicex.deb rm -rf DEBIAN/splicex DEBIAN/splicex.deb -pyinstall: +install: make preinstall mkdir /etc/splicex cp build/splicex.pyx /usr/bin/splicex -- cgit v1.2.3 From ffe498e2ea71158854b23a3348f12648af870284 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sat, 29 Oct 2011 12:02:16 -0400 Subject: splicex readme update --- contrib/splicex/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/splicex/README b/contrib/splicex/README index 66d01a2..b851334 100644 --- a/contrib/splicex/README +++ b/contrib/splicex/README @@ -44,7 +44,7 @@ AUTHOR: make install This generates Python.h and structmember.h, which are - need for gcc to compile splicex. + needed for gcc to compile splicex. DEPENDS ON: -- cgit v1.2.3 From 17eab179fe15658c1b904ede61d5554ac222c1d1 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sat, 29 Oct 2011 17:06:38 -0400 Subject: SpliceX invalid argument detection made --- contrib/splicex/src/splicex.pyx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/splicex/src/splicex.pyx b/contrib/splicex/src/splicex.pyx index 22c4f32..1e7e271 100644 --- a/contrib/splicex/src/splicex.pyx +++ b/contrib/splicex/src/splicex.pyx @@ -275,6 +275,9 @@ for arg in sys.argv: DebugSwitch = True elif '--help' in arg: sys.exit(HELP()) + else: + if arg != '/usr/bin/splicex': + sys.exit(SpliceX + 'error: invalid argument: ' + arg) if DebugSwitch is False: sys.tracebacklimit = 0 -- cgit v1.2.3 From 47c0b07a9ee8949c421ebf6bccff54efbf357664 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sat, 29 Oct 2011 17:14:19 -0400 Subject: SpliceX improved invalid argument detection/reporting --- contrib/splicex/CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/splicex/CHANGES b/contrib/splicex/CHANGES index 442a19e..f550f6d 100644 --- a/contrib/splicex/CHANGES +++ b/contrib/splicex/CHANGES @@ -45,3 +45,6 @@ CHANGES: python install. This cuts down on dependencies and is useful if you just want to test, try, and/or debug. + + SpliceX now detects invalid arguments + and prints with error message. -- cgit v1.2.3 From 526841ec91f7d0e4d2ffd5589525fe91e42384c0 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sun, 30 Oct 2011 07:48:04 -0400 Subject: SpliceX fixed --- contrib/splicex/src/splicex.pyx | 756 ++++++++++++++++++++-------------------- 1 file changed, 375 insertions(+), 381 deletions(-) diff --git a/contrib/splicex/src/splicex.pyx b/contrib/splicex/src/splicex.pyx index 1e7e271..d5d23c8 100644 --- a/contrib/splicex/src/splicex.pyx +++ b/contrib/splicex/src/splicex.pyx @@ -275,9 +275,8 @@ for arg in sys.argv: DebugSwitch = True elif '--help' in arg: sys.exit(HELP()) - else: - if arg != '/usr/bin/splicex': - sys.exit(SpliceX + 'error: invalid argument: ' + arg) + elif arg != sys.argv[0]: + sys.exit(SpliceX + 'error: invalid argument: ' + arg) if DebugSwitch is False: sys.tracebacklimit = 0 @@ -1732,8 +1731,7 @@ else: if not Word: sys.exit(SpliceX + "error: compiled empty wordlist") -Word = list(set(Word)) -WordCount = 0 +Word = list(set(Word)) ShowWord = [] PassWd = [] for Input in Word: @@ -1743,7 +1741,9 @@ for Input in Word: c += "\\\\\\" + let PassWd.append(c) - +timeup = 0 +PassAmount = 0 +StartTime = time.time() - 1 if TIME != None: try: TIME = TIME.split(", ") @@ -1775,19 +1775,13 @@ else: length_start = 0 length_end = 10 +WordCount = 0 +for CountWords in ShowWord: + WordCount += 1 + def BF1(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 - StartTime = time.time() - StartTime = StartTime - 1 - PassAmount = 0 - timeup = 0 + global timeup, PassAmount for u in range(StateU, UserCount): - if length_start > 0: - break - if length_end < 0: - sys.exit(SpliceX + 'unable to find password') for x in range(StateW, WordCount): if SaveSwitch is True: WriteSave = [] @@ -1838,20 +1832,10 @@ def BF1(): print(output) def BF2(): + global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 - StartTime = time.time() - StartTime = StartTime - 1 - PassAmount = 0 - timeup = 0 for u in range(StateU, UserCount): - if length_start > 1: - break - if length_end < 1: - sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for x in range(StateW, WordCount): if SaveSwitch is True: @@ -1923,20 +1907,10 @@ def BF2(): print(output) def BF3(): + global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 - StartTime = time.time() - StartTime = StartTime - 1 - PassAmount = 0 - timeup = 0 for u in range(StateU, UserCount): - if length_start > 2: - break - if length_end < 2: - sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for x in range(StateW, WordCount): @@ -2028,20 +2002,10 @@ def BF3(): print(output) def BF4(): + global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 - StartTime = time.time() - StartTime = StartTime - 1 - PassAmount = 0 - timeup = 0 for u in range(StateU, UserCount): - if length_start > 3: - break - if length_end < 3: - sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2153,20 +2117,10 @@ def BF4(): print(output) def BF5(): + global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 - StartTime = time.time() - StartTime = StartTime - 1 - PassAmount = 0 - timeup = 0 for u in range(StateU, UserCount): - if length_start > 4: - break - if length_end < 4: - sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2262,20 +2216,10 @@ def BF5(): print(output) def BF6(): + global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 - StartTime = time.time() - StartTime = StartTime - 1 - PassAmount = 0 - timeup = 0 for u in range(StateU, UserCount): - if length_start > 5: - break - if length_end < 5: - sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2391,20 +2335,10 @@ def BF6(): print(output) def BF7(): + global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 - StartTime = time.time() - StartTime = StartTime - 1 - PassAmount = 0 - timeup = 0 for u in range(StateU, UserCount): - if length_start > 6: - break - if length_end < 6: - sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2504,20 +2438,10 @@ def BF7(): print(output) def BF8(): + global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 - StartTime = time.time() - StartTime = StartTime - 1 - PassAmount = 0 - timeup = 0 for u in range(StateU, UserCount): - if length_start > 7: - break - if length_end < 7: - sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2637,20 +2561,10 @@ def BF8(): print(output) def BF9(): + global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 - StartTime = time.time() - StartTime = StartTime - 1 - PassAmount = 0 - timeup = 0 for u in range(StateU, UserCount): - if length_start > 8: - break - if length_end < 8: - sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2754,20 +2668,10 @@ def BF9(): print(output) def BF10(): + global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 - StartTime = time.time() - StartTime = StartTime - 1 - PassAmount = 0 - timeup = 0 for u in range(StateU, UserCount): - if length_start > 9: - break - if length_end < 9: - sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -2891,20 +2795,10 @@ def BF10(): print(output) def BF11(): + global timeup, PassAmount if NoChar is True: sys.exit(SpliceX + 'unable to find password') - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 - StartTime = time.time() - StartTime = StartTime - 1 - PassAmount = 0 - timeup = 0 for u in range(StateU, UserCount): - if length_start > 10: - break - if length_end < 10: - sys.exit(SpliceX + 'unable to find password') for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3012,14 +2906,7 @@ def BF11(): print(output) def SBF1(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 for u in range(StateU, UserCount): - if length_start > 0: - break - if length_end < 0: - sys.exit(0) for x in range(StateW, WordCount): if SaveSwitch is True: WriteSave = [] @@ -3055,16 +2942,9 @@ def SBF1(): print(NewShowWord.replace(" ", "")) def SBF2(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): - if length_start > 1: - break - if length_end < 1: - sys.exit(0) for a in range(StateA, EndCount): for x in range(StateW, WordCount): if SaveSwitch is True: @@ -3106,16 +2986,9 @@ def SBF2(): print(NewShowWord.replace(" ", "")) def SBF3(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): - if length_start > 2: - break - if length_end < 2: - sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for x in range(StateW, WordCount): @@ -3162,16 +3035,9 @@ def SBF3(): print(NewShowWord.replace(" ", "")) def SBF4(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): - if length_start > 3: - break - if length_end < 3: - sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3223,16 +3089,9 @@ def SBF4(): print(NewShowWord.replace(" ", "")) def SBF5(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): - if length_start > 4: - break - if length_end < 4: - sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3283,16 +3142,9 @@ def SBF5(): print(NewShowWord.replace(" ", "")) def SBF6(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): - if length_start > 5: - break - if length_end < 5: - sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3348,16 +3200,9 @@ def SBF6(): print(NewShowWord.replace(" ", "")) def SBF7(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): - if length_start > 6: - break - if length_end < 6: - sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3412,16 +3257,9 @@ def SBF7(): print(NewShowWord.replace(" ", "")) def SBF8(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): - if length_start > 7: - break - if length_end < 7: - sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3481,16 +3319,9 @@ def SBF8(): print(NewShowWord.replace(" ", "")) def SBF9(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): - if length_start > 8: - break - if length_end < 8: - sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3549,16 +3380,9 @@ def SBF9(): print(NewShowWord.replace(" ", "")) def SBF10(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): - if length_start > 9: - break - if length_end < 9: - sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3622,16 +3446,9 @@ def SBF10(): print(NewShowWord.replace(" ", "")) def SBF11(): - WordCount = 0 - for CountWords in ShowWord: - WordCount += 1 if NoChar is True: sys.exit(0) for u in range(StateU, UserCount): - if length_start > 10: - break - if length_end < 10: - sys.exit(0) for a in range(StateA, EndCount): for b in range(StateB, EndCount): for c in range(StateC, EndCount): @@ -3732,6 +3549,183 @@ if Create is True: sys.stdout.write('\r') sys.exit(SpliceX + 'compiled ' + str(N) + ' passwords. enjoy ;-)') +def C_BF1(): + if length_start > 0: + pass + elif length_end < 0: + sys.exit(SpliceX + 'unable to find password') + elif StdoutSwitch is True: + BF1() + +def C_BF2(): + if length_start > 1: + pass + elif length_end < 1: + sys.exit(SpliceX + 'unable to find password') + else: + BF2() + +def C_BF3(): + if length_start > 2: + pass + elif length_end < 2: + sys.exit(SpliceX + 'unable to find password') + else: + BF3() + +def C_BF4(): + if length_start > 3: + pass + elif length_end < 3: + sys.exit(SpliceX + 'unable to find password') + else: + BF4() + +def C_BF5(): + if length_start > 4: + pass + elif length_end < 4: + sys.exit(SpliceX + 'unable to find password') + else: + BF5() + +def C_BF6(): + if length_start > 5: + pass + elif length_end < 5: + sys.exit(SpliceX + 'unable to find password') + else: + BF6() + +def C_BF7(): + if length_start > 6: + pass + elif length_end < 6: + sys.exit(SpliceX + 'unable to find password') + else: + BF7() + +def C_BF8(): + if length_start > 7: + pass + elif length_end < 7: + sys.exit(SpliceX + 'unable to find password') + else: + BF8() + +def C_BF9(): + if length_start > 8: + pass + elif length_end < 8: + sys.exit(SpliceX + 'unable to find password') + else: + BF9() + +def C_BF10(): + if length_start > 9: + pass + elif length_end < 9: + sys.exit(SpliceX + 'unable to find password') + else: + BF10() + +def C_BF11(): + if length_start > 10: + pass + elif length_end < 10: + sys.exit(SpliceX + 'unable to find password') + else: + BF11() + +def C_SBF1(): + if length_start > 0: + pass + elif length_end < 0: + sys.exit(0) + elif StdoutSwitch is True: + SBF1() + +def C_SBF2(): + if length_start > 1: + pass + elif length_end < 1: + sys.exit(0) + else: + SBF2() + +def C_SBF3(): + if length_start > 2: + pass + elif length_end < 2: + sys.exit(0) + else: + SBF3() + +def C_SBF4(): + if length_start > 3: + pass + elif length_end < 3: + sys.exit(0) + else: + SBF4() + +def C_SBF5(): + if length_start > 4: + pass + elif length_end < 4: + sys.exit(0) + else: + SBF5() + +def C_SBF6(): + if length_start > 5: + pass + elif length_end < 5: + sys.exit(0) + else: + SBF6() + +def C_SBF7(): + if length_start > 6: + pass + elif length_end < 6: + sys.exit(0) + else: + SBF7() + +def C_SBF8(): + if length_start > 7: + pass + elif length_end < 7: + sys.exit(0) + else: + SBF8() + +def C_SBF9(): + if length_start > 8: + pass + elif length_end < 8: + sys.exit(0) + else: + SBF9() + +def C_SBF10(): + if length_start > 9: + pass + elif length_end < 9: + sys.exit(0) + else: + SBF10() + +def C_SBF11(): + if length_start > 10: + pass + elif length_end < 10: + sys.exit(0) + else: + SBF11() + + if RestoreSwitch is False: StateCount = 0 if RestoreSwitch is False and StdoutSwitch is False: @@ -3747,17 +3741,17 @@ if RestoreSwitch is False and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF1() - BF2() - BF3() - BF4() - BF5() - BF6() - BF7() - BF8() - BF9() - BF10() - BF11() + C_BF1() + C_BF2() + C_BF3() + C_BF4() + C_BF5() + C_BF6() + C_BF7() + C_BF8() + C_BF9() + C_BF10() + C_BF11() sys.exit(SpliceX + " unable to find password") if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is False: @@ -3773,7 +3767,7 @@ if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF1() + C_BF1() StateW = 0 StateA = 0 StateB = 0 @@ -3785,18 +3779,18 @@ if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF2() - BF3() - BF4() - BF5() - BF6() - BF7() - BF8() - BF9() - BF10() - BF11() + C_BF2() + C_BF3() + C_BF4() + C_BF5() + C_BF6() + C_BF7() + C_BF8() + C_BF9() + C_BF10() + C_BF11() sys.exit(SpliceX + " unable to find password") -if StateCount == 21 and RestoreSwitch is True and StdoutSwitch is False: +if StateCount == 23 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) StateW = int(State[23]) StateA = 0 @@ -3809,7 +3803,7 @@ if StateCount == 21 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF1() + C_BF1() StateW = 0 StateA = 0 StateB = 0 @@ -3821,16 +3815,16 @@ if StateCount == 21 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF2() - BF3() - BF4() - BF5() - BF6() - BF7() - BF8() - BF9() - BF10() - BF11() + C_BF2() + C_BF3() + C_BF4() + C_BF5() + C_BF6() + C_BF7() + C_BF8() + C_BF9() + C_BF10() + C_BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -3845,7 +3839,7 @@ elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF2() + C_BF2() StateW = 0 StateA = 0 StateB = 0 @@ -3857,15 +3851,15 @@ elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF3() - BF4() - BF5() - BF6() - BF7() - BF8() - BF9() - BF10() - BF11() + C_BF3() + C_BF4() + C_BF5() + C_BF6() + C_BF7() + C_BF8() + C_BF9() + C_BF10() + C_BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -3880,7 +3874,7 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF3() + C_BF3() StateW = 0 StateA = 0 StateB = 0 @@ -3892,14 +3886,14 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF4() - BF5() - BF6() - BF7() - BF8() - BF9() - BF10() - BF11() + C_BF4() + C_BF5() + C_BF6() + C_BF7() + C_BF8() + C_BF9() + C_BF10() + C_BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 26 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -3914,7 +3908,7 @@ elif StateCount == 26 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF4() + C_BF4() StateW = 0 StateA = 0 StateB = 0 @@ -3926,13 +3920,13 @@ elif StateCount == 26 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF5() - BF6() - BF7() - BF8() - BF9() - BF10() - BF11() + C_BF5() + C_BF6() + C_BF7() + C_BF8() + C_BF9() + C_BF10() + C_BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -3947,7 +3941,7 @@ elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF5() + C_BF5() StateW = 0 StateA = 0 StateB = 0 @@ -3959,12 +3953,12 @@ elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF6() - BF7() - BF8() - BF9() - BF10() - BF11() + C_BF6() + C_BF7() + C_BF8() + C_BF9() + C_BF10() + C_BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -3979,7 +3973,7 @@ elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF6() + C_BF6() StateW = 0 StateA = 0 StateB = 0 @@ -3991,11 +3985,11 @@ elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF7() - BF8() - BF9() - BF10() - BF11() + C_BF7() + C_BF8() + C_BF9() + C_BF10() + C_BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -4010,7 +4004,7 @@ elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF7() + C_BF7() StateW = 0 StateA = 0 StateB = 0 @@ -4022,10 +4016,10 @@ elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF8() - BF9() - BF10() - BF11() + C_BF8() + C_BF9() + C_BF10() + C_BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -4040,7 +4034,7 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF8() + C_BF8() StateW = 0 StateA = 0 StateB = 0 @@ -4052,9 +4046,9 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF9() - BF10() - BF11() + C_BF9() + C_BF10() + C_BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -4069,7 +4063,7 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateH = int(State[31]) StateI = 0 StateJ = 0 - BF9() + C_BF9() StateW = 0 StateA = 0 StateB = 0 @@ -4081,8 +4075,8 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF10() - BF11() + C_BF10() + C_BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -4097,7 +4091,7 @@ elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is False: StateH = int(State[31]) StateI = int(State[32]) StateJ = 0 - BF10() + C_BF10() StateW = 0 StateA = 0 StateB = 0 @@ -4109,7 +4103,7 @@ elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is False: StateH = 0 StateI = 0 StateJ = 0 - BF11() + C_BF11() sys.exit(SpliceX + " unable to find password") elif StateCount == 33 and RestoreSwitch is True and StdoutSwitch is False: StateU = int(State[22]) @@ -4124,7 +4118,7 @@ elif StateCount == 33 and RestoreSwitch is True and StdoutSwitch is False: StateH = int(State[31]) StateI = int(State[32]) StateJ = int(State[33]) - BF11() + C_BF11() sys.exit(SpliceX + " unable to find password") if RestoreSwitch is False and StdoutSwitch is True: @@ -4140,17 +4134,17 @@ if RestoreSwitch is False and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF1() - SBF2() - SBF3() - SBF4() - SBF5() - SBF6() - SBF7() - SBF8() - SBF9() - SBF10() - SBF11() + C_SBF1() + C_SBF2() + C_SBF3() + C_SBF4() + C_SBF5() + C_SBF6() + C_SBF7() + C_SBF8() + C_SBF9() + C_SBF10() + C_SBF11() sys.exit(0) if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is True: @@ -4166,7 +4160,7 @@ if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF1() + C_SBF1() StateW = 0 StateA = 0 StateB = 0 @@ -4178,16 +4172,16 @@ if StateCount == 22 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF2() - SBF3() - SBF4() - SBF5() - SBF6() - SBF7() - SBF8() - SBF9() - SBF10() - SBF11() + C_SBF2() + C_SBF3() + C_SBF4() + C_SBF5() + C_SBF6() + C_SBF7() + C_SBF8() + C_SBF9() + C_SBF10() + C_SBF11() sys.exit(0) if StateCount == 23 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4202,7 +4196,7 @@ if StateCount == 23 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF1() + C_SBF1() StateW = 0 StateA = 0 StateB = 0 @@ -4214,16 +4208,16 @@ if StateCount == 23 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF2() - SBF3() - SBF4() - SBF5() - SBF6() - SBF7() - SBF8() - SBF9() - SBF10() - SBF11() + C_SBF2() + C_SBF3() + C_SBF4() + C_SBF5() + C_SBF6() + C_SBF7() + C_SBF8() + C_SBF9() + C_SBF10() + C_SBF11() sys.exit(0) elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4238,7 +4232,7 @@ elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF2() + C_SBF2() StateW = 0 StateA = 0 StateB = 0 @@ -4250,15 +4244,15 @@ elif StateCount == 24 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF3() - SBF4() - SBF5() - SBF6() - SBF7() - SBF8() - SBF9() - SBF10() - SBF11() + C_SBF3() + C_SBF4() + C_SBF5() + C_SBF6() + C_SBF7() + C_SBF8() + C_SBF9() + C_SBF10() + C_SBF11() sys.exit(0) elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4273,7 +4267,7 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF3() + C_SBF3() StateW = 0 StateA = 0 StateB = 0 @@ -4285,14 +4279,14 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF4() - SBF5() - SBF6() - SBF7() - SBF8() - SBF9() - SBF10() - SBF11() + C_SBF4() + C_SBF5() + C_SBF6() + C_SBF7() + C_SBF8() + C_SBF9() + C_SBF10() + C_SBF11() sys.exit(0) elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4307,7 +4301,7 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF4() + C_SBF4() StateW = 0 StateA = 0 StateB = 0 @@ -4319,13 +4313,13 @@ elif StateCount == 25 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF5() - SBF6() - SBF7() - SBF8() - SBF9() - SBF10() - SBF11() + C_SBF5() + C_SBF6() + C_SBF7() + C_SBF8() + C_SBF9() + C_SBF10() + C_SBF11() sys.exit(0) elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4340,7 +4334,7 @@ elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF5() + C_SBF5() StateW = 0 StateA = 0 StateB = 0 @@ -4352,12 +4346,12 @@ elif StateCount == 27 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF6() - SBF7() - SBF8() - SBF9() - SBF10() - SBF11() + C_SBF6() + C_SBF7() + C_SBF8() + C_SBF9() + C_SBF10() + C_SBF11() sys.exit(0) elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4372,7 +4366,7 @@ elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF6() + C_SBF6() StateW = 0 StateA = 0 StateB = 0 @@ -4384,11 +4378,11 @@ elif StateCount == 28 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF7() - SBF8() - SBF9() - SBF10() - SBF11() + C_SBF7() + C_SBF8() + C_SBF9() + C_SBF10() + C_SBF11() sys.exit(0) elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4403,7 +4397,7 @@ elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF7() + C_SBF7() StateW = 0 StateA = 0 StateB = 0 @@ -4415,10 +4409,10 @@ elif StateCount == 29 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF8() - SBF9() - SBF10() - SBF11() + C_SBF8() + C_SBF9() + C_SBF10() + C_SBF11() sys.exit(0) elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4433,7 +4427,7 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF8() + C_SBF8() StateW = 0 StateA = 0 StateB = 0 @@ -4445,9 +4439,9 @@ elif StateCount == 30 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF9() - SBF10() - SBF11() + C_SBF9() + C_SBF10() + C_SBF11() sys.exit(0) elif StateCount == 31 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4462,7 +4456,7 @@ elif StateCount == 31 and RestoreSwitch is True and StdoutSwitch is True: StateH = int(State[31]) StateI = 0 StateJ = 0 - SBF9() + C_SBF9() StateW = 0 StateA = 0 StateB = 0 @@ -4474,8 +4468,8 @@ elif StateCount == 31 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF10() - SBF11() + C_SBF10() + C_SBF11() sys.exit(0) elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4490,7 +4484,7 @@ elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is True: StateH = int(State[31]) StateI = int(State[32]) StateJ = 0 - SBF10() + C_SBF10() StateW = 0 StateA = 0 StateB = 0 @@ -4502,7 +4496,7 @@ elif StateCount == 32 and RestoreSwitch is True and StdoutSwitch is True: StateH = 0 StateI = 0 StateJ = 0 - SBF11() + C_SBF11() sys.exit(0) elif StateCount == 33 and RestoreSwitch is True and StdoutSwitch is True: StateU = int(State[22]) @@ -4517,7 +4511,7 @@ elif StateCount == 33 and RestoreSwitch is True and StdoutSwitch is True: StateH = int(State[31]) StateI = int(State[32]) StateJ = int(State[33]) - SBF11() + C_SBF11() sys.exit(0) sys.exit(SpliceX + " unknown error: please report bug to author") -- cgit v1.2.3 From dfd03060484c8ad77f7fa8a713e046237ecc37e9 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sun, 30 Oct 2011 08:01:22 -0400 Subject: SpliceX fixed, old coding trim down with patch for --time option --- contrib/splicex/CHANGES | 11 +++++++ contrib/splicex/configure | 6 ++++ contrib/splicex/src/splicex.pyx | 68 ++++++++++++++++++++--------------------- 3 files changed, 51 insertions(+), 34 deletions(-) diff --git a/contrib/splicex/CHANGES b/contrib/splicex/CHANGES index f550f6d..f6befee 100644 --- a/contrib/splicex/CHANGES +++ b/contrib/splicex/CHANGES @@ -48,3 +48,14 @@ CHANGES: SpliceX now detects invalid arguments and prints with error message. + + d3v11 - Sat Oct 29 2011: + + Old timing bug is now fixed. --time now + how a consistant tracking of how many + passwords and how much time has elapsed + among each brute force algorithm. This + new patch also simplified the code and + makes the functions faster. Much code + has been trimmed from splicex without + removing any options or functionality. diff --git a/contrib/splicex/configure b/contrib/splicex/configure index 933b51d..a01825c 100755 --- a/contrib/splicex/configure +++ b/contrib/splicex/configure @@ -17,6 +17,7 @@ if which `which "$1"` >/dev/null; then echo else echo -ne ' FAILED' + echo exit 1 fi @@ -26,6 +27,7 @@ if which man >/dev/null; then echo else echo -ne ' FAILED' + echo exit 1 fi @@ -36,6 +38,7 @@ if [ -z "$2" ]; then echo else echo -ne ' FAILED' + echo exit 1 fi fi @@ -47,6 +50,7 @@ if [ -z "$2" ]; then echo else echo -ne ' FAILED' + echo exit 1 fi fi @@ -65,6 +69,8 @@ if [ -z "$2" ]; then echo -e " compiler flags == gcc -I /usr/local/include/$1" else echo -e " Python.h and structmember.h could not be found... FAILED" + echo + exit 1 fi fi echo diff --git a/contrib/splicex/src/splicex.pyx b/contrib/splicex/src/splicex.pyx index d5d23c8..26c7898 100644 --- a/contrib/splicex/src/splicex.pyx +++ b/contrib/splicex/src/splicex.pyx @@ -1822,7 +1822,7 @@ def BF1(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -1878,7 +1878,7 @@ def BF2(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -1897,7 +1897,7 @@ def BF2(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -1955,7 +1955,7 @@ def BF3(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -1974,7 +1974,7 @@ def BF3(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -1992,7 +1992,7 @@ def BF3(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2052,7 +2052,7 @@ def BF4(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2071,7 +2071,7 @@ def BF4(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2089,7 +2089,7 @@ def BF4(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2107,7 +2107,7 @@ def BF4(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2169,7 +2169,7 @@ def BF5(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2188,7 +2188,7 @@ def BF5(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2206,7 +2206,7 @@ def BF5(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2270,7 +2270,7 @@ def BF6(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2289,7 +2289,7 @@ def BF6(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2307,7 +2307,7 @@ def BF6(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2325,7 +2325,7 @@ def BF6(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2391,7 +2391,7 @@ def BF7(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2410,7 +2410,7 @@ def BF7(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2428,7 +2428,7 @@ def BF7(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2496,7 +2496,7 @@ def BF8(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2515,7 +2515,7 @@ def BF8(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2533,7 +2533,7 @@ def BF8(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2551,7 +2551,7 @@ def BF8(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2621,7 +2621,7 @@ def BF9(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2640,7 +2640,7 @@ def BF9(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2658,7 +2658,7 @@ def BF9(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2730,7 +2730,7 @@ def BF10(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2749,7 +2749,7 @@ def BF10(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2767,7 +2767,7 @@ def BF10(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2785,7 +2785,7 @@ def BF10(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2859,7 +2859,7 @@ def BF11(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) cmd = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace('USERNAME', User[u].replace(" ", ""))) if test == None: print(output) @@ -2878,7 +2878,7 @@ def BF11(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) @@ -2896,7 +2896,7 @@ def BF11(): if timeup == sleep_now: time.sleep(sleep_for) timeup = 0 - print(SpliceX + str(Speed) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) + print(SpliceX + str(int(round(float(Speed)))) + "/s " + User[u].replace(" ", "") + " " + NewShowWord.replace(" ", "")) output = os.popen(cmd.replace("PASSWORD", NewPassWd.replace(" ", "")).replace("USERNAME", User[u].replace(" ", ""))).read() if test == None: print(output) -- cgit v1.2.3 From fc5f4ecbc35a9d6bd39f73ecca9f4239d3e84512 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sun, 30 Oct 2011 08:28:45 -0400 Subject: Splicex --no-char bug fixed --- contrib/splicex/src/splicex.pyx | 82 ++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/contrib/splicex/src/splicex.pyx b/contrib/splicex/src/splicex.pyx index 26c7898..740d7ce 100644 --- a/contrib/splicex/src/splicex.pyx +++ b/contrib/splicex/src/splicex.pyx @@ -1833,8 +1833,6 @@ def BF1(): def BF2(): global timeup, PassAmount - if NoChar is True: - sys.exit(SpliceX + 'unable to find password') for u in range(StateU, UserCount): for a in range(StateA, EndCount): for x in range(StateW, WordCount): @@ -1908,8 +1906,6 @@ def BF2(): def BF3(): global timeup, PassAmount - if NoChar is True: - sys.exit(SpliceX + 'unable to find password') for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -2003,8 +1999,6 @@ def BF3(): def BF4(): global timeup, PassAmount - if NoChar is True: - sys.exit(SpliceX + 'unable to find password') for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -2118,8 +2112,6 @@ def BF4(): def BF5(): global timeup, PassAmount - if NoChar is True: - sys.exit(SpliceX + 'unable to find password') for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -2217,8 +2209,6 @@ def BF5(): def BF6(): global timeup, PassAmount - if NoChar is True: - sys.exit(SpliceX + 'unable to find password') for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -2336,8 +2326,6 @@ def BF6(): def BF7(): global timeup, PassAmount - if NoChar is True: - sys.exit(SpliceX + 'unable to find password') for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -2439,8 +2427,6 @@ def BF7(): def BF8(): global timeup, PassAmount - if NoChar is True: - sys.exit(SpliceX + 'unable to find password') for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -2562,8 +2548,6 @@ def BF8(): def BF9(): global timeup, PassAmount - if NoChar is True: - sys.exit(SpliceX + 'unable to find password') for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -2669,8 +2653,6 @@ def BF9(): def BF10(): global timeup, PassAmount - if NoChar is True: - sys.exit(SpliceX + 'unable to find password') for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -2796,8 +2778,6 @@ def BF10(): def BF11(): global timeup, PassAmount - if NoChar is True: - sys.exit(SpliceX + 'unable to find password') for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -2942,8 +2922,6 @@ def SBF1(): print(NewShowWord.replace(" ", "")) def SBF2(): - if NoChar is True: - sys.exit(0) for u in range(StateU, UserCount): for a in range(StateA, EndCount): for x in range(StateW, WordCount): @@ -2986,8 +2964,6 @@ def SBF2(): print(NewShowWord.replace(" ", "")) def SBF3(): - if NoChar is True: - sys.exit(0) for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -3035,8 +3011,6 @@ def SBF3(): print(NewShowWord.replace(" ", "")) def SBF4(): - if NoChar is True: - sys.exit(0) for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -3089,8 +3063,6 @@ def SBF4(): print(NewShowWord.replace(" ", "")) def SBF5(): - if NoChar is True: - sys.exit(0) for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -3142,8 +3114,6 @@ def SBF5(): print(NewShowWord.replace(" ", "")) def SBF6(): - if NoChar is True: - sys.exit(0) for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -3200,8 +3170,6 @@ def SBF6(): print(NewShowWord.replace(" ", "")) def SBF7(): - if NoChar is True: - sys.exit(0) for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -3257,8 +3225,6 @@ def SBF7(): print(NewShowWord.replace(" ", "")) def SBF8(): - if NoChar is True: - sys.exit(0) for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -3319,8 +3285,6 @@ def SBF8(): print(NewShowWord.replace(" ", "")) def SBF9(): - if NoChar is True: - sys.exit(0) for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -3380,8 +3344,6 @@ def SBF9(): print(NewShowWord.replace(" ", "")) def SBF10(): - if NoChar is True: - sys.exit(0) for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -3446,8 +3408,6 @@ def SBF10(): print(NewShowWord.replace(" ", "")) def SBF11(): - if NoChar is True: - sys.exit(0) for u in range(StateU, UserCount): for a in range(StateA, EndCount): for b in range(StateB, EndCount): @@ -3554,7 +3514,7 @@ def C_BF1(): pass elif length_end < 0: sys.exit(SpliceX + 'unable to find password') - elif StdoutSwitch is True: + else: BF1() def C_BF2(): @@ -3562,6 +3522,8 @@ def C_BF2(): pass elif length_end < 1: sys.exit(SpliceX + 'unable to find password') + elif NoChar is True: + sys.exit(SpliceX + 'unable to find password') else: BF2() @@ -3570,6 +3532,8 @@ def C_BF3(): pass elif length_end < 2: sys.exit(SpliceX + 'unable to find password') + elif NoChar is True: + sys.exit(SpliceX + 'unable to find password') else: BF3() @@ -3578,6 +3542,8 @@ def C_BF4(): pass elif length_end < 3: sys.exit(SpliceX + 'unable to find password') + elif NoChar is True: + sys.exit(SpliceX + 'unable to find password') else: BF4() @@ -3586,6 +3552,8 @@ def C_BF5(): pass elif length_end < 4: sys.exit(SpliceX + 'unable to find password') + elif NoChar is True: + sys.exit(SpliceX + 'unable to find password') else: BF5() @@ -3594,6 +3562,8 @@ def C_BF6(): pass elif length_end < 5: sys.exit(SpliceX + 'unable to find password') + elif NoChar is True: + sys.exit(SpliceX + 'unable to find password') else: BF6() @@ -3602,6 +3572,8 @@ def C_BF7(): pass elif length_end < 6: sys.exit(SpliceX + 'unable to find password') + elif NoChar is True: + sys.exit(SpliceX + 'unable to find password') else: BF7() @@ -3610,6 +3582,8 @@ def C_BF8(): pass elif length_end < 7: sys.exit(SpliceX + 'unable to find password') + elif NoChar is True: + sys.exit(SpliceX + 'unable to find password') else: BF8() @@ -3618,6 +3592,8 @@ def C_BF9(): pass elif length_end < 8: sys.exit(SpliceX + 'unable to find password') + elif NoChar is True: + sys.exit(SpliceX + 'unable to find password') else: BF9() @@ -3626,6 +3602,8 @@ def C_BF10(): pass elif length_end < 9: sys.exit(SpliceX + 'unable to find password') + elif NoChar is True: + sys.exit(SpliceX + 'unable to find password') else: BF10() @@ -3634,6 +3612,8 @@ def C_BF11(): pass elif length_end < 10: sys.exit(SpliceX + 'unable to find password') + elif NoChar is True: + sys.exit(SpliceX + 'unable to find password') else: BF11() @@ -3650,6 +3630,8 @@ def C_SBF2(): pass elif length_end < 1: sys.exit(0) + elif NoChar is True: + sys.exit(0) else: SBF2() @@ -3658,6 +3640,8 @@ def C_SBF3(): pass elif length_end < 2: sys.exit(0) + elif NoChar is True: + sys.exit(0) else: SBF3() @@ -3666,6 +3650,8 @@ def C_SBF4(): pass elif length_end < 3: sys.exit(0) + elif NoChar is True: + sys.exit(0) else: SBF4() @@ -3674,6 +3660,8 @@ def C_SBF5(): pass elif length_end < 4: sys.exit(0) + elif NoChar is True: + sys.exit(0) else: SBF5() @@ -3682,6 +3670,8 @@ def C_SBF6(): pass elif length_end < 5: sys.exit(0) + elif NoChar is True: + sys.exit(0) else: SBF6() @@ -3690,6 +3680,8 @@ def C_SBF7(): pass elif length_end < 6: sys.exit(0) + elif NoChar is True: + sys.exit(0) else: SBF7() @@ -3698,6 +3690,8 @@ def C_SBF8(): pass elif length_end < 7: sys.exit(0) + elif NoChar is True: + sys.exit(0) else: SBF8() @@ -3706,6 +3700,8 @@ def C_SBF9(): pass elif length_end < 8: sys.exit(0) + elif NoChar is True: + sys.exit(0) else: SBF9() @@ -3714,6 +3710,8 @@ def C_SBF10(): pass elif length_end < 9: sys.exit(0) + elif NoChar is True: + sys.exit(0) else: SBF10() @@ -3722,6 +3720,8 @@ def C_SBF11(): pass elif length_end < 10: sys.exit(0) + elif NoChar is True: + sys.exit(0) else: SBF11() -- cgit v1.2.3 From a246e58ccf508b251fba138cd1a329d4a125324e Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sun, 30 Oct 2011 08:29:58 -0400 Subject: update changes for splicex --- contrib/splicex/CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/splicex/CHANGES b/contrib/splicex/CHANGES index f6befee..aefb866 100644 --- a/contrib/splicex/CHANGES +++ b/contrib/splicex/CHANGES @@ -59,3 +59,5 @@ CHANGES: makes the functions faster. Much code has been trimmed from splicex without removing any options or functionality. + + --no-char bug fixed -- cgit v1.2.3 From 257e78ffed5ba14eb952fcf517ef69b7e9e32a2f Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sun, 30 Oct 2011 08:31:15 -0400 Subject: Splicex Update from --no-char fix --- contrib/splicex/src/splicex.pyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/splicex/src/splicex.pyx b/contrib/splicex/src/splicex.pyx index 740d7ce..5834618 100644 --- a/contrib/splicex/src/splicex.pyx +++ b/contrib/splicex/src/splicex.pyx @@ -3622,7 +3622,7 @@ def C_SBF1(): pass elif length_end < 0: sys.exit(0) - elif StdoutSwitch is True: + else: SBF1() def C_SBF2(): -- cgit v1.2.3 From 927170ecad08b8659c088d806ca566f09bef94ae Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sun, 30 Oct 2011 08:47:33 -0400 Subject: Splicex update regarding 'PassAmount' --- contrib/splicex/src/splicex.pyx | 68 ++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/contrib/splicex/src/splicex.pyx b/contrib/splicex/src/splicex.pyx index 5834618..206cee6 100644 --- a/contrib/splicex/src/splicex.pyx +++ b/contrib/splicex/src/splicex.pyx @@ -1813,7 +1813,6 @@ def BF1(): for WriteStates in WriteSave: FILE.write(WriteStates + "\n") FILE.close() - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = ShowWord[x] @@ -1830,6 +1829,7 @@ def BF1(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 def BF2(): global timeup, PassAmount @@ -1867,7 +1867,6 @@ def BF2(): for WriteStates in WriteSave: FILE.write(WriteStates + "\n") FILE.close() - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[a] + ShowWord[x] @@ -1884,9 +1883,9 @@ def BF2(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 if ExhSwitch is False: - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = ShowWord[x] + Char1[a] @@ -1903,6 +1902,7 @@ def BF2(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 def BF3(): global timeup, PassAmount @@ -1942,7 +1942,6 @@ def BF3(): for WriteStates in WriteSave: FILE.write(WriteStates + "\n") FILE.close() - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[a] + ShowWord[x] + Char1[b] @@ -1959,9 +1958,9 @@ def BF3(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 if ExhSwitch is False: - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[a] + Char1[b] + ShowWord[x] @@ -1978,8 +1977,8 @@ def BF3(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = ShowWord[x] + Char1[b] + Char1[a] @@ -1996,6 +1995,7 @@ def BF3(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 def BF4(): global timeup, PassAmount @@ -2037,7 +2037,6 @@ def BF4(): for WriteStates in WriteSave: FILE.write(WriteStates + "\n") FILE.close() - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[c] + Char1[a] + ShowWord[x] + Char1[b] @@ -2054,9 +2053,9 @@ def BF4(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 if ExhSwitch is False: - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[b] + ShowWord[x] + Char1[a] + Char1[c] @@ -2073,8 +2072,8 @@ def BF4(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[c] + Char1[a] + Char1[b] + ShowWord[x] @@ -2091,8 +2090,8 @@ def BF4(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = ShowWord[x] + Char1[b] + Char1[a] + Char1[c] @@ -2109,6 +2108,7 @@ def BF4(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 def BF5(): global timeup, PassAmount @@ -2152,7 +2152,6 @@ def BF5(): for WriteStates in WriteSave: FILE.write(WriteStates + "\n") FILE.close() - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[c] + Char1[a] + ShowWord[x] + Char1[b] + Char1[d] @@ -2169,9 +2168,9 @@ def BF5(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 if ExhSwitch is False: - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[c] + Char1[a] + Char1[b] + Char1[d] + ShowWord[x] @@ -2188,8 +2187,8 @@ def BF5(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = ShowWord[x] + Char1[d] + Char1[b] + Char1[a] + Char1[c] @@ -2206,6 +2205,7 @@ def BF5(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 def BF6(): global timeup, PassAmount @@ -2251,7 +2251,6 @@ def BF6(): for WriteStates in WriteSave: FILE.write(WriteStates + "\n") FILE.close() - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[e] + Char1[c] + Char1[a] + ShowWord[x] + Char1[b] + Char1[d] @@ -2268,9 +2267,9 @@ def BF6(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 if ExhSwitch is False: - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[d] + Char1[b] + ShowWord[x] + Char1[a] + Char1[c] + Char1[e] @@ -2287,8 +2286,8 @@ def BF6(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[e] + Char1[c] + Char1[a] + Char1[b] + Char1[d] + ShowWord[x] @@ -2305,8 +2304,8 @@ def BF6(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = ShowWord[x] + Char1[d] + Char1[b] + Char1[a] + Char1[c] + Char1[e] @@ -2323,6 +2322,7 @@ def BF6(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 def BF7(): global timeup, PassAmount @@ -2370,7 +2370,6 @@ def BF7(): for WriteStates in WriteSave: FILE.write(WriteStates + "\n") FILE.close() - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[e] + Char1[c] + Char1[a] + ShowWord[x] + Char1[b] + Char1[d] + Char1[f] @@ -2387,9 +2386,9 @@ def BF7(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 if ExhSwitch is False: - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[e] + Char1[c] + Char1[a] + Char1[b] + Char1[d] + Char1[f] + ShowWord[x] @@ -2406,8 +2405,8 @@ def BF7(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = ShowWord[x] + Char1[f] + Char1[d] + Char1[b] + Char1[a] + Char1[c] + Char1[e] @@ -2424,6 +2423,7 @@ def BF7(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 def BF8(): global timeup, PassAmount @@ -2473,7 +2473,6 @@ def BF8(): for WriteStates in WriteSave: FILE.write(WriteStates + "\n") FILE.close() - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[g] + Char1[e] + Char1[c] + Char1[a] + ShowWord[x] + Char1[b] + Char1[d] + Char1[f] @@ -2490,9 +2489,9 @@ def BF8(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 if ExhSwitch is False: - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[f] + Char1[d] + Char1[b] + ShowWord[x] + Char1[a] + Char1[c] + Char1[e] + Char1[g] @@ -2509,8 +2508,8 @@ def BF8(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[g] + Char1[e] + Char1[c] + Char1[a] + Char1[b] + Char1[d] + Char1[f] + ShowWord[x] @@ -2527,8 +2526,8 @@ def BF8(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = ShowWord[x] + Char1[f] + Char1[d] + Char1[b] + Char1[a] + Char1[c] + Char1[e] + Char1[g] @@ -2545,6 +2544,7 @@ def BF8(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 def BF9(): global timeup, PassAmount @@ -2596,7 +2596,6 @@ def BF9(): for WriteStates in WriteSave: FILE.write(WriteStates + "\n") FILE.close() - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[g] + Char1[e] + Char1[c] + Char1[a] + ShowWord[x] + Char1[b] + Char1[d] + Char1[f] + Char1[h] @@ -2613,9 +2612,9 @@ def BF9(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 if ExhSwitch is False: - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[g] + Char1[e] + Char1[c] + Char1[a] +Char1[b] + Char1[d] + Char1[f] + Char1[h] + ShowWord[x] @@ -2632,8 +2631,8 @@ def BF9(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = ShowWord[x] + Char1[h] + Char1[f] + Char1[d] + Char1[b] + Char1[a] + Char1[c] + Char1[e] + Char1[g] @@ -2650,6 +2649,7 @@ def BF9(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 def BF10(): global timeup, PassAmount @@ -2703,7 +2703,6 @@ def BF10(): for WriteStates in WriteSave: FILE.write(WriteStates + "\n") FILE.close() - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[i] + Char1[g] + Char1[e] + Char1[c] + Char1[a] + ShowWord[x] + Char1[b] + Char1[d] + Char1[f] + Char1[h] @@ -2720,9 +2719,9 @@ def BF10(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 if ExhSwitch is False: - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[h] + Char1[f] + Char1[d] + Char1[b] + ShowWord[x] + Char1[a] + Char1[c] + Char1[e] + Char1[g] + Char1[i] @@ -2739,8 +2738,8 @@ def BF10(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[i] + Char1[g] + Char1[e] + Char1[c] + Char1[a] + ShowWord[x] + Char1[b] + Char1[d] + Char1[f] + Char1[h] + ShowWord[x] @@ -2757,8 +2756,8 @@ def BF10(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = ShowWord[x] + Char1[h] + Char1[f] + Char1[d] + Char1[b] + Char1[a] + Char1[c] + Char1[e] + Char1[g] + Char1[i] @@ -2775,6 +2774,7 @@ def BF10(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 def BF11(): global timeup, PassAmount @@ -2830,7 +2830,6 @@ def BF11(): for WriteStates in WriteSave: FILE.write(WriteStates + "\n") FILE.close() - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[i] + Char1[g] + Char1[e] + Char1[c] + Char1[a] + ShowWord[x] + Char1[b] + Char1[d] + Char1[f] + Char1[h] + Char1[j] @@ -2847,9 +2846,9 @@ def BF11(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 if ExhSwitch is False: - PassAmount += 1 Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = Char1[i] + Char1[g] + Char1[e] + Char1[c] + Char1[a] + Char1[b] + Char1[d] + Char1[f] + Char1[h] + Char1[j] + ShowWord[x] @@ -2866,8 +2865,8 @@ def BF11(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) - PassAmount += 1 + Timer = int(round(float(time.time() - StartTime))) Speed = PassAmount / Timer NewShowWord = ShowWord[x] + Char1[j] + Char1[h] + Char1[f] + Char1[d] + Char1[b] + Char1[a] + Char1[c] + Char1[e] + Char1[g] + Char1[i] @@ -2884,6 +2883,7 @@ def BF11(): sys.exit(Red + "[PASSWORD FOUND]: " + Green + NewShowWord + DefColour) else: print(output) + PassAmount += 1 def SBF1(): for u in range(StateU, UserCount): -- cgit v1.2.3 From 7524c24e37492467c93f5f47427994fa2281daf3 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sun, 30 Oct 2011 16:35:17 -0400 Subject: Removed torlinks from a2.0 --- doc/www.anonet2.org/public_pod/index.pod | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod index a59d1d7..85edb59 100644 --- a/doc/www.anonet2.org/public_pod/index.pod +++ b/doc/www.anonet2.org/public_pod/index.pod @@ -61,8 +61,6 @@ Z<> --> - - -- cgit v1.2.3
IRCZ<>LL (Hidden IP, visible username and realname)
IRCZ<>LL (Visible IP, username and realname (warning!))
IRCZ<>LL (Hidden IP, username and realname, custom nickname)
IRCZ<>LL (Hidden IP, username and realname, custom nickname)