improved splice3 code - d3v11

3 files changed, 55 insertions, 8 deletions

diff --git a/contrib/splice3/CHANGES b/contrib/splice3/CHANGES
index dffac62..dff9d7d 100644
--- a/contrib/splice3/CHANGES
+++ b/contrib/splice3/CHANGES
@@ -71,3 +71,13 @@ CHANGES:
               
               fixed setup-deb bug with dependency
               checks.
+
+        Sun Oct 10 2011
+        d3v11 updated --se-create to allow module
+              stacking. see --rtfm for details.
+
+              Manual page updated.
+
+              splice3 will now give an error and
+              quit if a compiled wordlist returns
+              null.
diff --git a/contrib/splice3/LINUX/manual b/contrib/splice3/LINUX/manual
index 2be74fb..649a224 100644
--- a/contrib/splice3/LINUX/manual
+++ b/contrib/splice3/LINUX/manual
@@ -491,7 +491,18 @@ these two modules strip 5 or 13 character
 .br
 words from the selected dictionary and produce
 .br
-WEP compatible hex passwords.
+WEP compatible hex passwords. If your dictionary
+.br
+does not contain 5 or 13 character words then
+.br
+splice3 will likely give an error.
+
+
+--se-create Social Engineering Module:
+.br
+see the social engineering section below for
+.br
+details.
 
 .SH
 CHARACTERS 
@@ -595,6 +606,23 @@ a}password0Yz
 ...
 
 .SH
+SOCIAL ENGINEERING
+
+--se-create Social Engineering Module:
+.br
+splice3 is equipped with a social engineering module to create
+.br
+concatenated words from the selected dictionary. This module
+.br
+allows for "Module Stacking". IE, if you select other other
+.br
+modules when setting this flag then compiled words will also
+.br
+be incorporated into the algorithm as if they appeared on the
+.br
+the selected dictionary itself.
+
+.SH
 DESHADOW
 
 splice3 comes with its own small program to compare a created hash
diff --git a/contrib/splice3/LINUX/splice3.py b/contrib/splice3/LINUX/splice3.py
index affcf72..5953f6c 100755
--- a/contrib/splice3/LINUX/splice3.py
+++ b/contrib/splice3/LINUX/splice3.py
@@ -1549,12 +1549,20 @@ def WEP13():
 
 
 def SOCEN():
+    socen = []
+    socen_a = []
+    socen_words = []
+
+    try:
+        for i in Word:
+         socen_words.append(i.replace('\n', ''))
+    except:
+        pass
+
     ReadDictionary = open(dictionary, 'r')
     for line in ReadDictionary:
      socen_words.append(line.replace('\n', ''))
 
-    socen = []
-    socen_a = []
     for i in socen_words:
      for let in i:
       try:
@@ -1592,10 +1600,6 @@ def SOCEN():
         Word.append(a + b + c)    
 
     
-
-if SESwitch is True:
- socen_words = []
- SOCEN()
 if RegularSwitch is True:
  REGULAR()
 if BWSwitch is True:
@@ -1610,7 +1614,8 @@ if wep5 is True:
  WEP5()
 if wep13 is True:
  WEP13()
-
+if SESwitch is True:
+ SOCEN()
 
 DoMix = False
 if AlphaSwitch is True:
@@ -1635,6 +1640,10 @@ else:
  User.append("")
  UserCount = 1
 
+if not Word:
+ print "splice3: error: compiled empty wordlist"
+ sys.exit(1)
+
 Word = list(set(Word)) 
 WordCount = 0
 ShowWord = []