1
0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-16 17:42:04 +00:00

Rule dupe removal and simplification removing s cycles and s dupes, and extra : commands

This commit is contained in:
jfoug 2016-04-22 15:10:48 -05:00
parent cc2158217f
commit ca260167a0
2 changed files with 29 additions and 45 deletions

View File

@ -7,7 +7,6 @@
}}}}}'5 }}}}}'5
}}}}'4 }}}}'4
}}}} }}}}
}}}:
}}} }}}
}}D1{ }}D1{
}} }}
@ -57,7 +56,6 @@ x31
x23p1 x23p1
x23d x23d
x23 x23
x21:
x21 x21
x14p2 x14p2
x14dp2'6 x14dp2'6
@ -71,7 +69,7 @@ x03d
x03 x03
x02{ x02{
x02d x02d
x02+2: x02+2
x02 x02
u$~$!$@$#$$ u$~$!$@$#$$
u$z u$z
@ -124,7 +122,7 @@ u
tt tt
t t
ss5sa@se3si1so0 ss5sa@se3si1so0
ss5sa@sa4se3sl7si1si|so0 ss5sa@se3sl7si1so0
ss5sa4sl7si|so0 ss5sa4sl7si|so0
ss5 ss5
so0se3 so0se3
@ -8377,7 +8375,6 @@ i0!
i0 i0
f'4y4 f'4y4
dx27f'4y4 dx27f'4y4
d:
d$~$!$@$#$$ d$~$!$@$#$$
d$z d$z
d$y d$y
@ -9656,7 +9653,7 @@ c$2$"
c$2$! c$2$!
c$2$ c$2$
c$2 c$2
c$1: c$1
c$1$~ c$1$~
c$1$} c$1$}
c$1$| c$1$|
@ -10457,7 +10454,7 @@ c
^e^n^o^t^s ^e^n^o^t^s
^e^n^i^l ^e^n^i^l
^e^l^e^t ^e^l^e^t
^e^h^t: ^e^h^t
^e^h^t ^e^h^t
^e^e^r^f ^e^e^r^f
^e^e^n^k ^e^e^n^k
@ -10736,7 +10733,6 @@ c
[^i [^i
[^h [^h
[^g [^g
[^f:
[^f [^f
[^d [^d
[^c [^c
@ -10795,19 +10791,16 @@ T1
T0] T0]
T0 T0
Kx32p2*A5'4 Kx32p2*A5'4
K:
K*54x31'4 K*54x31'4
K K
E$sT0 E$sT0
E E
D5:
D5 D5
D4 D4
D3D2 D3D2
D3:
D3 D3
D2] D2]
D2D4: D2D4
D2D3 D2D3
D2D2z3x13 D2D2z3x13
D2D1 D2D1
@ -10969,8 +10962,7 @@ C$a$c$l$e
C$a$b$l$e C$a$b$l$e
C$a C$a
C$S C$S
:x03l x03l
:so0
: :
.3$J'4y4 .3$J'4y4
.2 .2
@ -11608,7 +11600,7 @@ $1$6
$1$5 $1$5
$1$4 $1$4
$1$3 $1$3
$1$2: $1$2
$1$2$3z3x13 $1$2$3z3x13
$1$2$3$4$5$6$7$8$9$0 $1$2$3$4$5$6$7$8$9$0
$1$2$3$4$5$6$7$8$9 $1$2$3$4$5$6$7$8$9
@ -11629,11 +11621,10 @@ $1$1$1$1$1$1
$1$1$1$1 $1$1$1$1
$1$1$1 $1$1$1
$1$1 $1$1
$1$0:
$1$0 $1$0
$1 $1
$0Z1 $0Z1
$0Y1: $0Y1
$0*44 $0*44
$0$9 $0$9
$0$8 $0$8

View File

@ -1173,7 +1173,7 @@ x81i9T
ss5 se3 ss5 se3
[ [ [ [ [ [
KT0 KT0
R0se5s5& R0se&
i54 i54
} $e } $e
T0 T7 T1 T0 T7 T1
@ -6734,7 +6734,7 @@ xA9x64.6
$1 $5 $7 $1 $5 $7
l $5 $9 l $5 $9
c$1$2$3$* c$1$2$3$*
s\3s\F[ s\3[
$b $i $t $b $i $t
K.2 K.2
^nx82x75 ^nx82x75
@ -10310,7 +10310,7 @@ i7as$S
ls10 ls10
$l Z1 $l Z1
^X $X $x ^x ^X $X $x ^x
s.hx13sh< s.<x13
^X ^x $X $x ^X ^x $X $x
i6v i6v
s1! s1!
@ -11776,7 +11776,7 @@ s0o c
i2M i2M
p4 o9e p4 o9e
x61 $8 x61 $8
slOsOZ slZ
$! ^1 $! ^1
^0 ^1 ^8 ^0 ^1 ^8
i62 i70 i81 i92 i62 i70 i81 i92
@ -13244,7 +13244,7 @@ u k
*13 *04 *13 *04
x23^K x23^K
$2 x61 $2 x61
sk@s@{oB8 sk{oB8
^8 ^1 ^3 ^8 ^1 ^3
o0r c o0r c
[ o2z [ o2z
@ -14957,7 +14957,7 @@ z2x37
^1 ^3 ^8 ^1 ^3 ^8
i64 i72 i80 i64 i72 i80
s{D*58r s{D*58r
+8sPMsMW +8sPW
$t $h $t $h
x37sFp x37sFp
^8 ^3 ^9 ^8 ^3 ^9
@ -21447,7 +21447,7 @@ o4O
i01 i19 i28 i37 i01 i19 i28 i37
+3 +3 +4 +3 +3 +4
sKMx0A sKMx0A
sYfsfut sYut
$1 ^1 $1 ^1
-0 o1j -0 o1j
x71 T1 x71 T1
@ -25888,7 +25888,7 @@ o8>
D0 r D0 r
+1 l +1 l
o48 K o48 K
sTDo5OsT* sTDo5O
t ,3 t ,3
o1b o0r o1b o0r
x54 p3 x54 p3
@ -25932,12 +25932,11 @@ $]$[
*B0 x07 *B0 x07
-4 +2 $A -4 +2 $A
x02 +6 x02 +6
so! $= s!= so=$=
i74 i5a i74 i5a
o0k *46 o0k *46
i7* x62 +3 i7* x62 +3
i13 i34 i13 i34
so! s!= $=
$v $i $m $v $i $m
^. *10 ^. *10
x08 z1 x08 z1
@ -31692,7 +31691,7 @@ i6k i7a i81
$5 *56 $5 *56
i3a i76 i3a i76
i51 $2 i51 $2
oA[s2dsdX oA[s2X
o7ns8w$x o7ns8w$x
si1 T5 si1 T5
x53 i4l x53 i4l
@ -36687,7 +36686,6 @@ i5a i53
+3 } +3 }
u ^X ^x $X $x u ^X ^x $X $x
$&$= $&$=
s9Cs9W
.4xB8R4 .4xB8R4
x63 i4s x63 i4s
o4) o4)
@ -37265,7 +37263,7 @@ D3 D6
k i6c k i6c
]sKG$a ]sKG$a
d o6y d o6y
sDJ*7AsD@ sDJ*7A
$A o00 $A o00
x32 *46 x32 *46
'9 i2l '9 i2l
@ -44062,7 +44060,7 @@ p4 *32
$9 $6 $! $! $9 $6 $! $!
x82 +7 x82 +7
y4 x46 y4 x46
s7ys7) s7y
ssZy2 ssZy2
i67 i72 i67 i72
o9e K o9e K
@ -45216,7 +45214,7 @@ i14 i7a
*A8 [ *A8 [
x16 i2n x16 i2n
i37 i73 i37 i73
sDk*20sDF sDk*20
c ^f ^a c ^f ^a
x56*34 x56*34
o1G o1G
@ -52036,7 +52034,7 @@ $Ay1
i70 i5b i70 i5b
[ $z [ $z
*A7q *A7q
: x03 l x03 l
x28*BAZ4 x28*BAZ4
i5e i1d i5e i1d
i3- r } i3- r }
@ -52209,7 +52207,7 @@ o6t ^u
] ] *13 ] ] *13
Y2 y2 Y2 y2
*05 *32 *05 *32
s^6s6I s^I
D2 smP D2 smP
T4 'A T4 'A
scE scE
@ -57273,7 +57271,6 @@ Z2 $*
i2h } i2h }
+D -B -C +D -B -C
c T4 sa@ c T4 sa@
siN sNk
+4 +8 +5 +4 +8 +5
+E -C -C +E -C -C
i4k D5 i4k D5
@ -63995,7 +63992,7 @@ c $7 $0 $0 $!
*31 x29 *31 x29
*57R6o1k *57R6o1k
i0b Z1 i0b Z1
sOusOG sOu
lsz<sLP lsz<sLP
$0 $1 $# $# $0 $1 $# $#
^bx39 ^bx39
@ -64359,7 +64356,6 @@ $| K
x57oBS x57oBS
*4Bx73 *4Bx73
x13 $h ^9 x13 $h ^9
D5 :
*91 *37 *91 *37
z2i9E z2i9E
,6i5d ,6i5d
@ -64418,7 +64414,6 @@ x24s^V
i16*85 i16*85
i7v i8e i91 i7v i8e i91
i79 i35 i79 i35
D2 D4 :
R4 $9 R4 $9
c $1 $4 $@ $@ c $1 $4 $@ $@
i64 *65 i64 *65
@ -72164,7 +72159,7 @@ s0PZ3*06
l *50 l *50
i7v x68 *67 i7v x68 *67
[ [ $2 [ [ $2
sfu sue sfe
o6L *75 t o6L *75 t
i5r i60 i70 i5r i60 i70
^R spm ^R spm
@ -73325,7 +73320,6 @@ i3o i4b
$3 u x42 $3 u x42
*30 x35 sl$ *30 x35 sl$
x05'7 x05'7
sZEsEd
c ^1 ^- c ^1 ^-
c ^1 ^$ c ^1 ^$
*30 $t x32 *30 $t x32
@ -80374,7 +80368,7 @@ s.i y3
x53 D1 *15 x53 D1 *15
s'Y s'Y
oA) oA)
sXcs^Us^` sXcs^U
-C -C -E -C -C -E
D1 L3 D1 L3
i7f L6 i7f L6
@ -82557,7 +82551,7 @@ sU&x85sd&
+B *78 +B *78
z4 $? z4 $?
'A o3D 'A o3D
y2s|asaR y2s|R
.Ai4Z .Ai4Z
x86x0A x86x0A
x8A*1A x8A*1A
@ -88749,7 +88743,7 @@ i11 R0 R4
o59 o31 o59 o31
p3$d p3$d
i7s y3 i7s y3
sVusV*o1{ sVuo1{
L6]sH& L6]sH&
o2k -5 o2k -5
Y5 Y2 x39 Y5 Y2 x39
@ -94269,7 +94263,6 @@ x26 x12
z5 x31 ^K z5 x31 ^K
o1c ^p o1c ^p
.5 r i5c .5 r i5c
syMsyP
$^ Z2 $^ Z2
d Y1 Z1 d Y1 Z1
x3A f x3A f
@ -106200,7 +106193,7 @@ Y4s42
sY5 *52 sY5 *52
i8# u i8# u
sy! [ sy! [
saG sGE saE
x13 x47 x13 x47
$I-9C $I-9C
^d $4 ^g $u ^d $4 ^g $u