From b47b50dc8afbd6c737d2918293d4b67272e3a124 Mon Sep 17 00:00:00 2001 From: Dom Date: Mon, 9 Apr 2018 15:15:50 +0100 Subject: [PATCH] Updated number of sectors for 2k cards. --- .DS_Store | Bin 0 -> 12292 bytes client/scripts/mifarePlus.lua | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ecae787283f908888f99eb9d6fa860cbb5da7cff GIT binary patch literal 12292 zcmeHN3s6+o89pDP-d(S9AqdOLvWtL-A}uD5c~m+v<}s7DX`0DQlT6ZdVyDyo=bXFC-USow zXm#w~nS0MY=iGDep2Pp2@B98A#uys!Y(--jt1L5`FP?*YYEiJqwIN0J2 z2G)kWyuZ^O^!N7$!rfZB+vRun`&|+5GQYpwx5rCuX<>IL==ZM;hJE}s8@eLiT@l_l zrmJgXI2ejFikEe3T7TGkm6zV-8}K&K8^c{b`XnEy!E|I=c5Z&robu|r`o@toEj>fc zRI@qjasW{t)|Waxw5ixvARS_N2#gH z9qjF;-yN3CPHTgrJ*!;Jzuo2vN7nRt1N3=5i>5rQbpvl-=J9wvilP)a@7pIVvB1f9 zemV+d!I-JQS)t!6%*Lu%6Ki8zS%?j>+t@*NgdJta*<Z#2|)oJ#NHJ*oV7t z0Ecil9>BNp9XyKf;YmD;-{S;E@CUq(x9}d`m%lHC+b%y=%OZNkX?^ar8p?>(l9OS} zx3wrr+zP~I8=JrQlbbXU(%IN7R?D2MgKc9$c0Jq24%4KcU_WKQVJFxt><#t~`-uI6 zoo4?8gNde_gM7?EDdwRJ3(Od1=%;hTD5BvNfyX)wRNhhrIK!t zy-Vt;cM>TC+1t=ay^Jdu(|MryobCRR=sjn-lZe`1L9{*}#l&(KVkwpp&s|PTcMb8} zc64AJaow$Op@+CGC-y;)b?w-N0Zp!S}QB!^?Dq|J1 zVxDT=(oRaXJ>rV=hZ|g>O}w_&71`0F-**Iq{@A^%XFX}zZY{Gh7>Kxh0dGhQChbU% zZ0;me2o5#``vab^cu%|RP!yA5>eehnLzQ*arH-nqs=cL-q1xK{rH%#FReSfElG3F=PVGa{>79&Dk5sy4MY_59Ja}nLkDr73 zR;OF-1+#_gjZ78pXg0^G>@#_c@UC?D$-McftZa+LsJ^vnX;aO)mb|g*oA+39Ei)6; zw-``lDIQhdqGgV`bX0wdq2=bvIQ1=>s?9Y9^(`9f%!?D$w`i`nILA}pd=?G47E7G= z?;6)EoL*$eDNQr&-IZ?eCz zw@7)v&$TxIGdZX#9CRiMQABc->+TwI)hmUYHj@HhgDz|k`de!6od}U2y$Ltt7JMFG zB_Yb)k?Zc`cuZPc%mrIw7AS7;6cxIg#YxQ0@$AsHJkz}L;@IKKsx&^rg1my_xfKf* zEj`ajKqgANyV-VjNWh=AJ8U)`33%01Xfq2W;FZ~h)W?y4S4!tmk3<4qt*kQJbR^)_ znuTVwjs(2A_)6-PNRX3l$uci9H&Q6eZ_?N~ncMvo;CY-(?F2i?UMDkqhfM5a_HRt2 zC`UHMIdWk`9$`QU=8AYn4Qf$`MQ9X8wi0V8z{9a%Jq37Na8r=SD}p>Bgb^Vu_$&o_ zZqVZ&`|%~*iLc;Zd|et>%-EV`J$l8%qsEr7)2C95rjKoBuFG|=k4-Rcw|^w+Wn*Hp z&1Gt9EDCzj;;`fTdMvDX;X<=K)M?AJss>Uge2e$Yq#$TK!y_*fap4Oan&n?!>aJ}LkM*UKQ!f0%YQy9_xd6dt5V)UF7m$%tRlqQ%= zX@U$`$u?(`ZC0b6?6MiHB0;bookUVLQj&mMri`6)>l`5K=HLR+;;a?6nawAHDL4GK&=SFbt~6d3I>c(5(CkFBiOi_U2*+=!pL0y8`5{09#1lqZ! z2B58|Gyv^_8UxTST5JH?rOp`8Mge_=iQrs0Q|kIGp!e_WG==ge3h+I9=;gq>n?iXU zdO10~RY30niWeLd(EAX+NufLry~lXm08im(I$h+UyjLY=#-v>$MSLw0e-Z%L@P8?n zB{p3o{ZH%8v7e6FJpaG^%>Vx<9!g%4E0A1)%X0;g+SK0EKy!;G9TKO>bL|c~x6;WE z{@k!E#Spsa>3Gp6Qt{MQL63-o?w$OG%3)d39UcGke*&N!jUkbj#Q#s1-bwtwunE13 Hg#Z5m#5c2R literal 0 HcmV?d00001 diff --git a/client/scripts/mifarePlus.lua b/client/scripts/mifarePlus.lua index 85815093..d84a7387 100644 --- a/client/scripts/mifarePlus.lua +++ b/client/scripts/mifarePlus.lua @@ -73,8 +73,10 @@ function writePerso() cardsize = 4 --need to set to 4 for 4k or 2 for 2k if(cardsize == 4) then numblocks = 255 + numsectors = 39 elseif(cardsize == 2) then numblocks = 127 + numsectors = 31 else oops("Invalid card size") end @@ -88,7 +90,7 @@ function writePerso() print("Setting AES Sector keys") -- Next, write to the AES sector keys - for i=0,39 do --for each sector number + for i=0,numsectors do --for each sector number local keyA_block = "40" .. string.format("%02x", i * 2) local keyB_block = "40" .. string.format("%02x", (i * 2) + 1) --Can also calculate the keys fancily to make them unique, if desired