From d930648230d035ff00f3a84dc49a9a947f41cfb6 Mon Sep 17 00:00:00 2001 From: WitherOrNot Date: Fri, 2 Jun 2023 03:14:53 -0400 Subject: [PATCH 1/2] Add new keys --- keys.json | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/keys.json b/keys.json index 6c7e0b7..4980617 100644 --- a/keys.json +++ b/keys.json @@ -2,10 +2,12 @@ "Products": { "Windows 98 SE (OEM)": ["02","03"], "Office 2000": ["04","05"], + "Windows Embedded POSReady 2009": ["0D", "0D"], "Windows 2000 Retail": ["12","13"], "Windows ME Retail": ["1C","1D"], "Windows XP Pro Retail": ["2C","2D"], "Windows XP Pro VLK": ["2E","2F"], + "Windows XP Starter Edition": ["32", "33"], "Halo: Combat Evolved": ["50","51"], "Visual Studio 2005": ["52", "53"], "Windows XP Pro 64 Bit Edition VLK": ["64","65"], @@ -162,6 +164,21 @@ "y": "19710761542152200618172612283139324015316083022563473705358032993141026289202915973780473937312193485361804450068338" } }, + "0D": { + "a": "1", + "b": "0", + "g": { + "x": "6645465708298979297645218319744955265667580573078366866240130998337156417559279947807138605379710836345182353956566", + "y": "9122261325743960629676061760923709333528687205500940401556553622283598790250115820669732772373561034819836006012285" + }, + "n": "54718482591717193", + "p": "21262683770905544338571543505453061536845396135304775106786244478927459953699178453429809049886663583535515332608417", + "priv": "47335405173668092", + "pub": { + "x": "17901813509704147483830835266370702882674023911261162322131513567769351494873007879644402037648391915282581963897955", + "y": "3627746470775852993311378053985025489205823505060996524650056711113522565534673713290725146394961076678997021207516" + } + }, "12": { "a": "1", "b": "0", @@ -342,6 +359,36 @@ "y": "9292360790888709163192008500642345429180999836863864477254342335185874973743595440806854122467192796977299364198680" } }, + "32": { + "a": "1", + "b": "0", + "g": { + "x": "12726461294499926560068151670755648381327270933570408046980855499993821725946986709210217963523130634525797609551100", + "y": "19727466362747241639614430182283134406657859985308135285523481410218197736089464247591813328077488945200498871246573" + }, + "n": "65794461159063457", + "p": "21055788153165092719902120162764441840863916414168155711589396355396184787671893056148679610453574714946317283911601", + "priv": "36261933107303189", + "pub": { + "x": "20951918253348273252420340105342001337430637214876028091851180291652873950025505424806224449373381285608077226552471", + "y": "9574918363679101910324218403815091089131481132701762206865487974994855351639447295943340460718678168318117194195752" + }, + }, + "33": { + "a": "1", + "b": "0", + "g": { + "x": "1794865730835385436163427753723234719911851797686636255721756602521630801773080869578590362010786910928772822065072", + "y": "30644486003529828103888328722673972171730735334350555137971150233266085818806168194592552532099145733381090086026739" + }, + "n": "39030245206593181", + "p": "32570677563636890576365869186469870364879811420628282404959348810134494363087895710691433232743794272463480085754961", + "priv": "34481221421628229", + "pub": { + "x": "907296736569259468480041782855281364952562359519792244665824534285751872123373034165077452334975888459663148242736", + "y": "16927761660112078837951464089861279221188811999337390492625539371026015626584250804363204864186060157462161862017016" + } + }, "50": { "a": "1", "b": "0", From 6b85db12c9417b07a1d78272fac178ce7eaa10b2 Mon Sep 17 00:00:00 2001 From: Neo <321592+Neo-Desktop@users.noreply.github.com> Date: Fri, 2 Jun 2023 07:09:40 -0700 Subject: [PATCH 2/2] disable static building for now (causing more headaches than it should) update keys.json with new info --- CMakeLists.txt | 7 ++++--- keys.json | 11 ++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d9df2c..d600916 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.9) PROJECT(WindowsXPKg) SET(CMAKE_CXX_STANDARD 17) -SET(OPENSSL_USE_STATIC_LIBS TRUE) +# TODO: commenting out static builds for now +#SET(OPENSSL_USE_STATIC_LIBS TRUE) FIND_PACKAGE(OpenSSL REQUIRED) IF(!OPENSSL_FOUND) @@ -20,8 +21,8 @@ CPMAddPackage( CONFIGURE_FILE(keys.json keys.json COPYONLY) -SET(BUILD_SHARED_LIBS OFF) -SET(CMAKE_EXE_LINKER_FLAGS "-static") +#SET(BUILD_SHARED_LIBS OFF) +#SET(CMAKE_EXE_LINKER_FLAGS "-static") ADD_EXECUTABLE(xpkey src/main.cpp src/xp.cpp src/key.cpp src/util.cpp src/cli.cpp) TARGET_INCLUDE_DIRECTORIES(xpkey PUBLIC crypto) TARGET_LINK_LIBRARIES(xpkey PUBLIC OpenSSL::Crypto nlohmann_json::nlohmann_json) diff --git a/keys.json b/keys.json index 4980617..c44746b 100644 --- a/keys.json +++ b/keys.json @@ -1,17 +1,18 @@ { "Products": { - "Windows 98 SE (OEM)": ["02","03"], + "Windows 98": ["02","03"], "Office 2000": ["04","05"], "Windows Embedded POSReady 2009": ["0D", "0D"], - "Windows 2000 Retail": ["12","13"], - "Windows ME Retail": ["1C","1D"], - "Windows XP Pro Retail": ["2C","2D"], + "Windows 2000": ["12","13"], + "Windows ME": ["1C","1D"], + "Windows XP Home": ["2A", "2B"], + "Windows XP Pro": ["2C","2D"], "Windows XP Pro VLK": ["2E","2F"], "Windows XP Starter Edition": ["32", "33"], "Halo: Combat Evolved": ["50","51"], "Visual Studio 2005": ["52", "53"], "Windows XP Pro 64 Bit Edition VLK": ["64","65"], - "Windows XP Pro 64 Bit Edition Retail": ["66","67"] + "Windows XP Pro 64 Bit Edition": ["66","67"] }, "BINK": { "00": {