From 8779a50c4c787a5bf5b2eb2014ced30aac85a74d Mon Sep 17 00:00:00 2001 From: techguy16 <88870951+techguy16@users.noreply.github.com> Date: Fri, 26 Jan 2024 07:27:29 +1300 Subject: [PATCH] Add new keys.json. --- keys.json | 169 +++++++++++++++++++-- umskt/__init__.py | 3 +- umskt/__pycache__/__init__.cpython-310.pyc | Bin 5890 -> 0 bytes umskt/__pycache__/mod7.cpython-310.pyc | Bin 5202 -> 0 bytes 4 files changed, 156 insertions(+), 16 deletions(-) delete mode 100644 umskt/__pycache__/__init__.cpython-310.pyc delete mode 100644 umskt/__pycache__/mod7.cpython-310.pyc diff --git a/keys.json b/keys.json index 09f13d1..a8df8da 100644 --- a/keys.json +++ b/keys.json @@ -93,6 +93,9 @@ "Plus! Digital Media Edition for Windows XP": { "BINK": ["52", "53"] }, + "Rise of Nations - Rise of Legends": { + "BINK": ["52", "53"] + }, "Windows Longhorn (6.0.4033.0)": { "BINK": ["54", "55"] }, @@ -1531,7 +1534,12 @@ } }, "Activation": { - "Windowws XP": { + "Windows XP": { + "flags": { + "XPBrand": true, + "Office": false, + "version": 0 + }, "p": "102011604035381881", "x": { "0": "0", @@ -1543,23 +1551,115 @@ }, "mul": "65537", "priv": "1315384396487572637498562978064321", - "iid_key": "1791516372" + "iid_key": "6AC85ED4", + "non_residue": "43", + "mod_constants": { + "0": "0x604FA6A1C6346A87", + "1": "0x2D351C6D04F8B", + "2": "0x604FA6A1C6346A87", + "3": "0x2D351C6D04F8B" + }, + "verification": { + "low": "351874082296375233", + "hi": "71307131016268" + } + }, + "Whistler": { + "flags": { + "XPBrand": false, + "Office": false, + "version": 1 + }, + "p": "102413083413401507", + "x": { + "0": "0", + "1": "62766224015201615", + "2": "45663410017725669", + "3": "38799131826419821", + "4": "57597400967455908", + "5": "1" + }, + "mul": "", + "priv": "", + "iid_key": "6AC85ED4", + "non_residue": "2", + "mod_constants": { + "0": "", + "1": "", + "2": "", + "3": "" + }, + "verification": { + "low": "", + "hi": "" + } }, - "Windows XP Plus! Digital Media Edition": { - "p": "101996933280717187", + "Office XP": { + "flags": { + "XPBrand": true, + "Office": true, + "version": 1 + }, + "p": "103099955908255721", "x": { - "0": "14442243999705614", - "1": "88154401999011195", - "2": "86996763276881336", - "3": "95455813375647760", - "4": "6252462837094107", + "0": "0", + "1": "64728167274549202", + "2": "4488766805843809", + "3": "70698430483539942", + "4": "64728167274549202", "5": "1" }, "mul": "65537", - "priv": "2752030625102368166730185283969067", - "iid_key": "1791516372" + "priv": "10294349293510589382098112327865153", + "iid_key": "5A30B9F3", + "non_residue": "3", + "mod_constants": { + "0": "0x4FA8E4A40CDAE44A", + "1": "0x2CBAF12A59BBE", + "2": "0x4FA8E4A40CDAE44A", + "3": "0x2CBAF12A59BBE" + }, + "verification": { + "low": "17284868327322833729", + "hi": "558057793417439" + } + }, + "Office 2003": { + "flags": { + "XPBrand": false, + "Office": true, + "version": 3 + }, + "p": "103099955908255721", + "x": { + "0": "0", + "1": "64728167274549202", + "2": "4488766805843809", + "3": "70698430483539942", + "4": "64728167274549202", + "5": "1" + }, + "mul": "65537", + "priv": "10294349293510589382098112327865153", + "iid_key": "5A30B9F3", + "non_residue": "3", + "mod_constants": { + "0": "0x4FA8E4A40CDAE44A", + "1": "0x2CBAF12A59BBE", + "2": "0x4FA8E4A40CDAE44A", + "3": "0x2CBAF12A59BBE" + }, + "verification": { + "low": "17284868327322833729", + "hi": "558057793417439" + } }, - "Office XP / Office 2003": { + "Office 2007": { + "flags": { + "XPBrand": false, + "Office": true, + "version": 4 + }, "p": "103099955908255721", "x": { "0": "0", @@ -1571,7 +1671,48 @@ }, "mul": "65537", "priv": "10294349293510589382098112327865153", - "iid_key": "1513142771" + "iid_key": "5A30B9F3", + "non_residue": "3", + "mod_constants": { + "0": "0x4FA8E4A40CDAE44A", + "1": "0x2CBAF12A59BBE", + "2": "0x4FA8E4A40CDAE44A", + "3": "0x2CBAF12A59BBE" + }, + "verification": { + "low": "17284868327322833729", + "hi": "558057793417439" + } + }, + "Plus! Digital Media Edition for Windows XP": { + "flags": { + "XPBrand": true, + "Office": false, + "version": 4 + }, + "p": "101996933280717187", + "x": { + "0": "14442243999705614", + "1": "88154401999011195", + "2": "86996763276881336", + "3": "95455813375647760", + "4": "6252462837094107", + "5": "1" + }, + "mul": "65537", + "priv": "2752030625102368166730185283969067", + "iid_key": "6AC85ED4", + "non_residue": "2", + "mod_constants": { + "0": "0x2C5C4D3654A594F0", + "1": "0x2D36C691A4EA5", + "2": "0x2C5C4D3654A594F0", + "3": "0x2D36C691A4EA5" + }, + "verification": { + "low": "8953812210935468417", + "hi": "499255905936912" + } } } -} +} \ No newline at end of file diff --git a/umskt/__init__.py b/umskt/__init__.py index 9d5521d..26a69a4 100644 --- a/umskt/__init__.py +++ b/umskt/__init__.py @@ -1,5 +1,4 @@ import hashlib -import random import secrets import json import sys @@ -7,7 +6,7 @@ KCHARS = "BCDFGHJKMPQRTVWXY2346789" def int_to_bytes(n, l=None): - n = int(n) + n = n if not l: l = (n.bit_length() + 7) // 8 diff --git a/umskt/__pycache__/__init__.cpython-310.pyc b/umskt/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 91239a18561b1e41ea8fc72109c7bb8ed70528ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5890 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 diff --git a/umskt/__pycache__/mod7.cpython-310.pyc b/umskt/__pycache__/mod7.cpython-310.pyc deleted file mode 100644 index 01e4bb90345cee10900cde60440b32197bc2d945..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5202 zcmb7INpBp-74E9)ZB|jV%tf&++7M(7WNjoRih&|4mLkP5L;)6K7@cJ>nQBrK4rj#b zrc5$Dfe|{1bITzxa-?z-a>*g5{DS<3zUGnvau1*&Qoi?UIONb$kPK1VtEKC`_r0aq ztyGE*eh*6j(0`nAoWIfF@Xy8ICQ9-tD(z^|b|PwJTdd1S3g@n)m3F^yv>VG^6)Ej$ z{|hH_b)ZAEo-XJjT3?rR8Ev2|x{5Z`$MhK5f))>)+VMV4ca~}*SKt2NR+9#Ye+q+} zD9LqHu@edHL^4)dX!(V+DD7!Ol12!$*=LGEKkP6X1;t)nE?GrChNH} z@%jNTOud|*l(oys@}RtTQkelJJ)!*!hbm{yG4E*)^?U~i?)W;eD<-Xieazg@;Q>t- zdNNgeZYG}yUF0t-^NYckOSqBDr1tHNlE$E4UX#Oq1vlOP|JEmsqhCxu1jVB}^Z@pr zoBEJPF;i2{uDtF1$nSX>tPUV`H-4MBxV_vJGy-(1lTPMNI)LgitJc=vfslR|0?wVj zM#Fl}#id+cx@1W3eNuMo^RIsI^hv$_0;*@?d@aa*)9C2#dLB^Q>ZG|!Qey~lrbHF3 z%sou5#x*~ZTbCnm>oS()a%(pC+i_<#eVBV&vqTcDqcAF%IBm4rYw`A*I42?OmStJs z?}dfZ6#5~GE5=curt)I^dC{eD5u>u$nHT}t@W2s((JhAn`|%NgrE*VY4g@WWF(Ep#;C-;tiF}cG0;0`^(yi`Vb@tGHYV<+>$i^sh9gKt)G z#{e=2dEc>-eIf4)H@?b3>MzMaS&QJKR9L)YsTrM*HHDzW3={uC7eFFtR3(C z{qNj6Z%&|J3(f0j%mh{ZK~la!xO2=Ts@!ir?6#UQ!x#5Zy1Q*oVgk{ryA7DOI;-Xl z8VCEMY1;b@BFU{e;CqftVCd(qL-f1xI$-=wtV(84m1U7ZOCYVHcND<;@ZAUUl-PM~ z1jzQhrCOMW^?IkV9@p!6v0g{y*lbh3T(56zHrj)ka*{UER&za0A9ghxr8Q47EAtLj z2lwS3nK_Gx-%@b9*2600;!8Y=1s%+c;46E6Ny6w z{9ORExsY;@o~GKL#^>y6fD!;jG{E=)E}}!Mz5U9yg@d)PS_8V+6$k5T#et6v-UTel z#~1>5pBQ5sU|-uOUzv-`Pd&!q0Yc$Af4Z5#tHQM+i>R!$Op?}qq>96tR@xoM|wg8PbSd1Yo0m%>N%{zNmk0xKin$z z0}(wqVnn_WF-`#uF1sMLF$*W8RtQ?bKojqizaTGR{RR0D)`>ZXUd@Y&No#A6xI~qN zq?kUm1$U|MWF?5eb!2Mo+cRBV@JnBqttv=VES=P{~zc}V#@*f^YGGj^QrE6si`3%c;vEB*=k&?lEz=7KT=Ok!ZmuAUsMPFs;J(20 zW^Arum06_fAP}*>i#B5;>3xamgmM7N`5*$YPC*pR6MG}f(;-9V|BS&1^DqmoEW@B9 zo#Q?*pppG^A3lU*!Kb=lQNk|;Vb1E}nlPVqlyLMh2&QBOHke(| zHL*Yw>>mnN9pNCVC*}gCqG}RDKYAGJOX}y%T<5AkYk%3gv@=IV7N2( z3AyT-kNJ5z^HIFbdf%y7G7OSvJCk;}v^;lm-6*G$qGq9eW(uW-uGYtqAkMOEU z*^9Bgu<#H}$V_wb*xW*U)GwBx+1AQ7CHxD2#e71SW49>Ia!eRFNp_X|M1Enuhb6Tl zXP3EZ{G@3(3nis+#ANSq