From 03f6a3c0791f1f3211d89f7837d86904da7402b7 Mon Sep 17 00:00:00 2001
From: i3visio <contacto@i3visio.com>
Date: Sun, 17 Jan 2016 18:47:49 +0100
Subject: [PATCH] Added a new way of performing need transformations, as well
 as new characters and year 2000 and 2016 to the default configuration.

---
 .gitignore |  3 +++
 README.md  |  4 ++++
 cupp.cfg   | 23 +++++++++++++++++------
 cupp.py    | 51 ++++++++++++++++++++++++---------------------------
 4 files changed, 48 insertions(+), 33 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb8c420
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*~
+*pyc
+*txt
diff --git a/README.md b/README.md
index fa3821f..9a44cb4 100644
--- a/README.md
+++ b/README.md
@@ -80,3 +80,7 @@
   bole_loser@hotmail.com
   http://www.offensive-security.com
   http://www.bolexxx.net
+
+  Yaiza Rubio aka yrubiosec
+  Félix Brezo aka febrezo
+  http://i3visio.com
diff --git a/cupp.cfg b/cupp.cfg
index e3735da..3fc2dce 100644
--- a/cupp.cfg
+++ b/cupp.cfg
@@ -14,27 +14,38 @@
 
 [leet]
 a=4
-i=1
+b=6
+c=(
 e=3
-t=7
+g=9
+i=1
 o=0
 s=5
-g=9
+t=7
 z=2
 
-
+A=4
+B=8
+C=(
+E=3
+G=6
+I=1
+O=0
+S=5
+T=7
+Z=2
 
 # [ Special chars ] for adding some pwnsauce! Remove or add as necessary, separated by comma...
 
 [specialchars]
-chars=!,@,#,$,%,&,*
+chars=!,@,#,$,%,&,*,?,-,/,(,),[,],{,},.
 
 
 
 # [ Random years ] take it as much as you need!
 
 [years]
-years = 2008,2009,2010,2011,2012,2013,2014,2015
+years = 2000,2008,2009,2010,2011,2012,2013,2014,2015,2016
 
 
 
diff --git a/cupp.py b/cupp.py
index 59d2033..fec87a9 100755
--- a/cupp.py
+++ b/cupp.py
@@ -59,16 +59,23 @@
 threshold = config.getint('nums','threshold')
 
 # 1337 mode configs, well you can add more lines if you add it to config file too.
-# You will need to add more lines in two places in cupp.py code as well...
-a = config.get('leet','a')
-i = config.get('leet','i')
-e = config.get('leet','e')
-t = config.get('leet','t')
-o = config.get('leet','o')
-s = config.get('leet','s')
-g = config.get('leet','g')
-z = config.get('leet','z')
+# Add the target letter as defined in the .cfg file here
+# Adding lower case letters
+targetLetters = ['a', 'b', 'c', 'e', 'g', 'i', 'o', 's', 't', 'z']
+# Adding upper case letters
+targetLetters += ['A', 'B', 'C', 'E', 'G', 'I', 'O', 'S', 'T', 'Z']
 
+# This variable will store the changes to be performed
+leetChanges = []
+
+# Iterating through the target letters
+for l in targetLetters:
+    newChange = {}
+    newChange["from"] = l
+    newChange["to"] = config.get('leet', l)
+    
+    # Adding the change
+    leetChanges.append(newChange)
 
 # for concatenations...
 
@@ -204,15 +211,10 @@ def komb(seq, start):
 	unique_lista = dict.fromkeys(uniqlist).keys()
 	unique_leet = []
 	if leetmode == "y":
-		for x in unique_lista: # if you want to add more leet chars, you will need to add more lines in cupp.cfg too...
-			x = x.replace('a',a)
-			x = x.replace('i',i)
-			x = x.replace('e',e)
-			x = x.replace('t',t)
-			x = x.replace('o',o)
-			x = x.replace('s',s)
-			x = x.replace('g',g)
-			x = x.replace('z',z)
+		for x in unique_lista: 
+			# Iterating through the changes added before
+			for change in leetChanges:
+				x = x.replace(change["from"],change["to"])
 			unique_leet.append(x)
 	
 	unique_list = unique_lista + unique_leet
@@ -533,16 +535,11 @@ def komb(seq, start):
 	unique_leet = []
 	if leetmode == "y":
 		for x in unique_lista: # if you want to add more leet chars, you will need to add more lines in cupp.cfg too...
-			x = x.replace('a',a)
-			x = x.replace('i',i)
-			x = x.replace('e',e)
-			x = x.replace('t',t)
-			x = x.replace('o',o)
-			x = x.replace('s',s)
-			x = x.replace('g',g)
-			x = x.replace('z',z)
+			# Iterating through the changes added before
+			for change in leetChanges:
+				x = x.replace(change["from"],change["to"])
 			unique_leet.append(x)
-	
+
 	unique_list = unique_lista + unique_leet
 	
 	unique_list_finished = []