Add new keys.json.

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"
+      }
     }
   }
-}
+}

umskt/__init__.py

@@ -1,13 +1,12 @@
 import hashlib
-import random
 import secrets
 import json
 import sys
 
 KCHARS = "BCDFGHJKMPQRTVWXY2346789"
 
 def int_to_bytes(n, l=None):
-    n = int(n)
+    n = n
 
     if not l:
         l = (n.bit_length() + 7) // 8