From 3735ccd2a4c43cbfe53d310753ff5c2bd44143b3 Mon Sep 17 00:00:00 2001 From: yho4 <zyyho97@gmail.com> Date: Fri, 24 May 2019 23:18:25 +1000 Subject: [PATCH] bug fix: fixed 2-argument version of crack --- crack | Bin 14244 -> 14292 bytes crack.c | 26 ++------------------------ 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/crack b/crack index 8fc77e5d077623d23e4cdc5e1cff70c1d4d64ef2..1d51ed1e8cbe7019d842b57a11cb99ddc07bf952 100755 GIT binary patch delta 1706 zcmZ3Ie<gpy1wjE$1_nk328MPK1~3qq_|RT(hAc!d1T4hBFk`YIqrKo8sOTK1=$pxn zjP`;ZauBu3P|=Rf7a6@78Tls5GW#<MOwMICW-OSzkXf2haPnSeYsM>+e==JuUSMEg z5HMt5s9<1VU}9ikkYHe7m|@7kV9CJ1u*8&s!C-PIi#(&i<VIF$Rt-}I2KkAB!jo69 zXb8B?jSpL&WS_k-aeH!_p5F1v4_GW14@{P1^%v?eWMB|rU|`S$nGH5?b0h0C=E(+} ze2niV+jFX`+lewTc=Vb&i83&}NDyIQ@aSy4arys$k6v3th>QkE#%*#hXPfv@VFm_| z<{u3FE!P+s7<RBQFfeo;e{pcK7T04Ye!j{4+!Fq!d?4et3j6~Zv3J4W|NmbI@goV< zUf8Js(st^_d?5w~kXfyY3=9k&-CI{&{{O#w>Jf<De!>h48yH?RPA=nKD!x|`W^EP| z1H%qBkpAN@c5XJ}ab<K}%FV#A6D)MfqkC%wSo>Z9kiFbIV0#<>f}H{uT7fK7y8-4D z)5&{yWjLM)fbA5Y{D612oHoeO-Fq)w{{O$TmF4pP|1Tu@85lZS87}|-|MK4CoqRHk zuP0yQD`s4{*^A$jk;8!xtT|_Lw}2_*gUJU4W~rJnF)%dmeR28!e`fwx6(*1;TOWYj z*Igmt(Q9hT%fRp=cyfcFw6HVCS>1abz?S{E^#A`0^U3Q3C8fnd;>lZWK$;FdWANzw z-r4#EB+bP$`H`TS;RSAxp<sO;ovklGGONKty%2jUIXrqzn|MI(egcx5HQ7=~PNo#3 z1QhZuYK))|+WX=1|Nr~A7#J8{bWJW6GI1$ogA03fZ<PSq-nsP#$N)!>*517gzyJUD z=mraUbRK$f6s&%00Z0@g`66lZRUt3N-IEoBW%#nV!9g>Z3*?R~lf8u18Fx%B5>_>; z2YIiX)1y1|hll0G&ejW;{{QE1<!4}E=mxVr8jl$0GBCs*e({)-fq|c!Uw-m=VR=Tq z$?t{bnfQ1%3y2soGgfVO7GKWDXtepY#D12^w`66U|EsnzF);jBZ3B}XV6qEL_JGMg zFgXECP6Crtm>3v*dSykK7#JLb|EsbxO=gvAWzX2pz`*b_WpcZm=H_*Ba*Vv7V!?!g zfdPbPOui{^pZf=z``P3m`CR}?OF?NBD6I#jEugd$l=gwrVNf~&N@qdo5-42<qBl1x zRP%EQDoMnFN)<te$&6;glVuGa@fS5P3Od9WmlWls<}plQnEcNmwtj*T12e+`bp~dJ z4<Mq!h=G}*!I*)WVS@<+!vvuXq6QPV8W=Z#N;w7wCPoH^6p*1%?19D)U}RuOV`gMv zeg8ZLqy(f(kCA}^6d)k>1V#o16(l|*gE<3(3IhYf22iSEfP{@7BPt(czyV>1++3&u z2PO*|nR}r-XEB;{*5Gi?2dHUpp{9Kho;=A&Pmn<pV#$A~FvH}FM*4ycP*ENxh}#<` z3mWSS8c0FZN<&2rCI=d;Gipw*G?r)7nLN{2JrL$(83qOhenticm<}x{A7-05ln)Cd z7bqX*$S^3sVX~mfcgByCf10>6T1>VzwP!S+Txt4-9U7mLQ_N<t8k!pzrc7ouk6=wo MwoFQz9B1wZ05ww9bN~PV delta 1650 zcmcbTza)Rc1wjK&1_nk328MDG1~4#~_|RT(g)BtS4=lvMuwt?yqrKn{sOTi9=#R;b zjP`<EauBu3P|>c<7a6@78F?qmGW#>~PtIjFX3UtpkXf2hVDesOYsMv$e==Ju9snse zWMHUZU|?WkU|^77U|{GlWMHshU|^^*Wnj>l9Lgfk$UnJ}RhpH<lz~BZVxaKk6)YM8 zGIxH>PFiF-d)9vyA7AEzzR3?*EEq3LmSpu8sxV|=5MW?n&}4wn9fq4HDr{q(EWpXf zcy6*hr@Fd=C<B8>uc?YC1H+2|5e5d2&ej{3|Nr;swH1cQaDimZCg*atiEkBVVDM=E z!NA{gjgf(22MYrOL+9}q8z*ydJ!bmPJNZ4Agnud@$hfTn|3F6UUGVq+{})XBNJ6z2 zb}E3hoqEwP#J~VDt5uPKfx)AD>x#?&|94M40<qgbn1Nvf!;8YnVcbi_*9yX{&0=C; z*ue(UfBePD%|bk`jIL9;85nkgU2@8!dus()`(6Q%y}!A^_BQ+lI|VE>g9k~db_2{Q zs*~sN%5WSL0Ncqv`2g>3IcboiyZ2tW{QrMvE6e5o|6g$OGca_vGF<-u|K*9vGx=l~ zZ%^LFSIjtZvlhQ4BZm?nSaZzeYynfoQ<E18%u-cgVqj?A`{MHd|IGZYd`uuuwmty4 zue(CPqt{fNmx1Ah^W+3UX<=iKv%2>>fGzuR>Hq&1>XZ8fC8gOx;>lZWK$;FdWANzw z-r4#EB>jtf@*zPr!vi26LiBlbw!Q$#%mxefLhPyJ@aQ#7;Q_h(2}rVQvZRolOe#nT zDCAoN7(v0Y_rvA?|Mzh*FfhERnj9=-qL<2s9HbH;+k5vi{Qm#{#c4K>hOGs^!9fZZ z%9wmw$V>Ym7jk6wZUq_HJyis()i#M695#!&Kn{5@*+E#H@!aGLVO5J#kpH?lJ-S1G zcvxQSY`t^o|9}2geg+1HZZO-U@rZ#g14HcL7cV&(82Gu<_~lzbnPl>QVR=To$@hij znf`Ha5;0<C%-U=$zMPR!Y4dG~{VaN*Wb$7%hlzpVziJ+sEC7>5V6p^EmVwC%CI*Jd zGi2rX85n$eWjUD`7#xHDtNvu1{8P4da)+GS<_&T(jJ%-oz=VN;0fbjfzA0~?$N|mZ zLQq-;N~=L>11N0;rCp%3AC!)O(n(M{2TGSg>4wdX3ibRG6F67|l_X*(vl#rI%x@S| zzd?wBnc;#u12aQ|1_Lw01S1e(%)rcWz=VNegU|v|g9%&>j2l2@7X!mD1_p){P;f!9 z10yQmgOPzDjhT_5_w@4^kP?tCJw^rwkZ(ck4n_tB6(l|*gE<3(3IhYf0#I6EfRu24 zjHrB&0T+ZJa#NuOT$rqAWbTFToY`p3S%Skk3?dNIo<dDy5ShHlNKa5e5+eK^Dl9Ph zp^?7e1gIzr6U6NkCMz223pz+a)CxmI9VRClt1~K2?lhKXRGGZeSUnKtWElnq27X2c z2AB>lC?95<Ig}3zBNr$i=EyK8f5K!%lkbx?Of4p-nA%KUV)}CORI}-<$%aPBW|Ixg QBUsatla0+M_nEr^0LxIrApigX diff --git a/crack.c b/crack.c index c3af534..192d7dd 100644 --- a/crack.c +++ b/crack.c @@ -22,28 +22,6 @@ int sha256_test(int argc, char *argv[]) FILE *sha_file_6_ptr = fopen("pwd6sha256", "r"); BYTE hash6[SHA256_BLOCK_SIZE]; - /********** Below is code for getting ASCII values for numbers, lowercase, and uppercase **********/ - // ASCII values for numbers, lowercase letters (97 - 122), and uppercase letters (65-90) - // int num_ascii[10] = {48, 49, 50, 51, 52, 53, 54, 55, 56, 57}; - // int lowercase_ascii[26]; - // int uppercase_ascii[26]; - // int current_lower_ascii = 97; - // int current_upper_ascii = 65; - // for (int i = 0; i < 26; i++) - // { - // lowercase_ascii[i] = current_lower_ascii; - // uppercase_ascii[i] = current_upper_ascii; - // current_lower_ascii++; - // current_upper_ascii++; - // } - - // // Put all wanted ASCII values together - // int* all_ascii = malloc(62 * sizeof(int)); - // memcpy(all_ascii, num_ascii, 10 * sizeof(int)); - // memcpy(all_ascii + 10, lowercase_ascii, 26 * sizeof(int)); - // memcpy(all_ascii + 36, uppercase_ascii, 26 * sizeof(int)); - - /********** Below is code for all relevant ASCII characters **********/ int all_ascii[95]; int current_ascii = 32; for (int i = 0; i < 95; i++) @@ -139,7 +117,7 @@ int sha256_test(int argc, char *argv[]) BYTE *byte_guess = (BYTE *)guess; sha256_init(&ctx6); - sha256_update(&ctx6, byte_guess, 4); + sha256_update(&ctx6, byte_guess, 6); sha256_final(&ctx6, buf6); // Print when we find passwords matching hashes @@ -245,7 +223,7 @@ int sha256_test(int argc, char *argv[]) BYTE *byte_pwd = (BYTE *)buf; sha256_init(&ctx); - sha256_update(&ctx, byte_pwd, 4); + sha256_update(&ctx, byte_pwd, strlen(buf)); sha256_final(&ctx, hash); int hash_number = 1; -- GitLab