From d5ee84bd6111ee68260e9d5ee053450e2460f2d4 Mon Sep 17 00:00:00 2001
From: ross <taylorr10@coventry.com>
Date: Mon, 25 Oct 2021 13:27:50 +0100
Subject: [PATCH] working version early tests removed

---
 src/1000kversion         | Bin 0 -> 1803 bytes
 src/rainbow_generator.py |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 src/1000kversion

diff --git a/src/1000kversion b/src/1000kversion
new file mode 100644
index 0000000000000000000000000000000000000000..b4f3cf0a265e7a0d666af5fe4d9b60e6cf089750
GIT binary patch
literal 1803
zcmXw4S#XnO6fL)avIz*t=EhECY0~V1XnWfvP5&lolD0`fOVcK8(j?8v-U!mNh=7Q=
zAjl4a0*bOI3W8EaRB#*}d~kfxaT#><$r(pq9Di^1@tisLocrDTegEHA+TPk4Z;K>a
zTSt0)-b`C2G!i9c{TQ+uG~Yk0q@*O%7L0{Zx*9|0Gp#XWn7>qItF#6TXBzzlZt)LS
zu_@*=^muVAlXnM3NMWw3+Zx44rr~;wlA^Yv6Qh~-dND?DI_tr0OiK=7tbeF#5;LT=
z7{@eq3C4@Sk+<S@ra~(wh@~;Wy;e+Qn(!MYNr_wUE#eN<vmBE}qO>@g7*m*5?8a0v
z@pbfI8q@Zbm@cg<`G%Ho3U@MXn}NH8@>zO4Ne}L3TDJ)Ih;c{Etl(az%O@~nu*_+3
z*d3V3)P57QL{r^lOk*}vaR76KNM;Ig%w-y7#XQMQc#}}acJXtRiAiHk%;HSrKBiNL
zu|Oo@-U=*aTHwYak@VOdrjQwnne>xUE|Q|P7aFF9PH06^+m<xOD^bBTkDwDtrk$Z@
zx^@zV!MQkmH83)5od%N-(KH+|Gi8#n$e^<6WPJhmGadL6OGJ_lxJ+2ew6h!!NKW3G
z^y!0G#&qyH9+Vurt_}||ZLC10V7;ReRZQb&fu$s*i_~QbsAgJu9yNol6>_ku`<M-z
zU`?nFc6BCR)Jkkqr(F*RlkN)YL{O~_Kv9o>2K9n<(JnZdmad0OI*;}=2Abez`pbm|
zVZyNrq~T$zya}(EcGcz;_?Y_tK%)@3h{22|^#<=kv$!hW0Q^kfO+-Khp`g0~Eh-Vm
zayg1K<uqxHSi!XX03Mc{lqRK7@CehK>1Y)fk41}>OgA>6O<ZiTSQtU3N&C<)f+|lD
z9qR7P2#G}|=ki7nX0qkbDU1tNyA54TTSg!v$sU)+9c)6BY2g662SxgZnmWXo{{9hh
zF|KvlkYF0vj~>Aqg^^?mj02>?XHc>cq?mqMfwb5LJr-TF0U4&y*T@Q0wD#C7dE}VB
zzmB|6N+M8`j-#M1AdFtIvNY>j94In1NAajIhPcV)$10``C$U=M^-2McF?o()jo^mv
zX7s5``vLtj7@x0LjkQciCS#ot#X>xU^-N`D*dU(aeAG~h$C>)hVWUXu3r0PjVA}jM
zHVF|3J3ZLUWbeZkNpYo8c#`Rxqu44Qg=CAr8c#7DUx;mToQiILXGDvq)s;-ac5$)V
zEPg!0^h+zA6{0tnG~qd>J!U*Fww`zsb})Ul7cU65>D<_<&gfU{k{G+EJK?~K>dlyd
z-J&pC73^V(`>|JW-kZWcrrn#cU)tz!*-V`sIG}!qj^dz5>MaTmF^%~ahoy^@FP*|m
zOlMc&$e>5F9!Hrjl;dT=N%f7t!ZhRtjtN#8H8`%0d_GP{SHY}R-;P(AF7@FxNljIE
z=TVK5s%bY~mm;g%h&PzVp2jIjZH#tlaGL4ZG@Owdt3{ts8gZ6s?K-?E#<8f|>&074
zSLfoKFiu^zxq!EsKKmW-NLdbXXKfqKt6#P;xFD1+<jvQ+@GjHLE?oTY2u55|U*&YX
zClYU!p;Md2`%KHO<FZJ!$pi+}S(oDjX;9nH6Tye-#o3N4lC5(p5gR^I*Yzi^ic27(
z30i#kIO`v!{zclm)c=_hN_1wr@Jap6QvV2*Ol0H2r}3%te}exNrg2TxWP^+U0U8SM
A0RR91

literal 0
HcmV?d00001

diff --git a/src/rainbow_generator.py b/src/rainbow_generator.py
index 3c1bc03..60c0c14 100644
--- a/src/rainbow_generator.py
+++ b/src/rainbow_generator.py
@@ -80,11 +80,12 @@ def queryTable(hashValue,table, chainLength, hashFunc=targetHashFunction, guessF
         h=hashValue
         g=None
         out=""
-        for j in range(i,chainLength):
+        for j in range(i,chainLength-1): # the -1 has been added to stop the proccess from hashing pasrt the end of the chain, so now the final hash is the real one 
             g=guessFunc(h,j, minLen=minLen, maxLen=maxLen, charset=charset)
             h=hashFunc(g)
             if debug: out+=f"({g}->{h}) "
         if debug: print(out)
+        print(h)
         if h in table:
             if debug: print(f"Found hash in chain at position {i}, beginning with {table[h]}")
             attempt= rebuildChain(table[h],hashValue, hashFunc, guessFunc, chainLength,minLen, maxLen, charset, debug=True)