arti/WindowsXPKg
1
0
Fork 0
mirror of https://github.com/Neo-Desktop/WindowsXPKg synced 2024-11-21 21:31:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix PIDGEN3

Browse Source
This commit is contained in:
Neo-Desktop 2024-01-05 12:17:32 -08:00
parent 5e68e1c8e1
commit cb557c1ed8
6 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cli.cpp
View File

@ -402,7 +402,7 @@ BOOL CLI::BINK1998Generate()
if (isValid) if (isValid)
{ {
printKey(pKey); printKey(pKey);
if (i < total - 1 || options.verbose) if (i <= total - 1 || options.verbose)
{ {
fmt::print("\n"); fmt::print("\n");
} }
@ -414,7 +414,7 @@ BOOL CLI::BINK1998Generate()
{ {
printKey(pKey); printKey(pKey);
fmt::print(" [Invalid]"); fmt::print(" [Invalid]");
if (i < total - 1) if (i <= total - 1)
{ {
fmt::print("\n"); fmt::print("\n");
} }
@ -443,13 +443,11 @@ BOOL CLI::BINK2002Generate()
// generate a key // generate a key
for (int i = 0; i < total; i++) for (int i = 0; i < total; i++)
{ {
DWORD pAuthInfo; options.info.AuthInfo = UMSKT::getRandom<DWORD>() & BITMASK(10);
RAND_bytes((BYTE *)&pAuthInfo, 4);
pAuthInfo &= BITMASK(10);
if (options.verbose) if (options.verbose)
{ {
fmt::print("> AuthInfo: {}\n", pAuthInfo); fmt::print("> AuthInfo: {:#08x}\n", options.info.AuthInfo);
} }
bink2002.Generate(options.info, pKey); bink2002.Generate(options.info, pKey);
@ -458,7 +456,7 @@ BOOL CLI::BINK2002Generate()
if (isValid) if (isValid)
{ {
CLI::printKey(pKey); CLI::printKey(pKey);
if (i < total - 1 || options.verbose) if (i <= total - 1 || options.verbose)
{ // check if end of list or verbose { // check if end of list or verbose
fmt::print("\n"); fmt::print("\n");
} }
@ -470,7 +468,7 @@ BOOL CLI::BINK2002Generate()
{ {
CLI::printKey(pKey); // print the key CLI::printKey(pKey); // print the key
fmt::print(" [Invalid]"); // and add " [Invalid]" to the key fmt::print(" [Invalid]"); // and add " [Invalid]" to the key
if (i < this->total - 1) if (i <= total - 1)
{ // check if end of list { // check if end of list
fmt::print("\n"); fmt::print("\n");
} }

5
src/libumskt/libumskt.h
View File

@ -76,10 +76,7 @@ class UMSKT
template <typename T> static T getRandom() template <typename T> static T getRandom()
{ {
T retval; T retval;
BIGNUM *bnrand = BN_new(); RAND_bytes((BYTE *)&retval, sizeof(retval));
BN_rand(bnrand, sizeof(T) * 8, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY);
BN_bn2lebinpad(bnrand, (unsigned char *)&retval, sizeof(T));
BN_free(bnrand);
return retval; return retval;
} }
}; };

33
src/libumskt/pidgen3/BINK1998.cpp
View File

@ -98,10 +98,10 @@ BOOL BINK1998::Verify(std::string &pKey)
Unpack(info, pRaw); Unpack(info, pRaw);
fmt::print(UMSKT::debug, "Validation results:\n"); fmt::print(UMSKT::debug, "Validation results:\n");
fmt::print(UMSKT::debug, " Upgrade: 0x{:08x}\n", info.isUpgrade); fmt::print(UMSKT::debug, " Upgrade: {:#08x}\n", info.isUpgrade);
fmt::print(UMSKT::debug, " Serial: 0x{:08x}\n", info.Serial); fmt::print(UMSKT::debug, " Serial: {:#08x}\n", info.Serial);
fmt::print(UMSKT::debug, " Hash: 0x{:08x}\n", info.Hash); fmt::print(UMSKT::debug, " Hash: {:#08x}\n", info.Hash);
fmt::print(UMSKT::debug, " Signature: 0x{:08x}\n", info.Signature); fmt::print(UMSKT::debug, " Signature: {:#08x}\n", info.Signature);
fmt::print(UMSKT::debug, "\n"); fmt::print(UMSKT::debug, "\n");
DWORD pData = info.Serial << 1 | info.isUpgrade; DWORD pData = info.Serial << 1 | info.isUpgrade;
@ -122,7 +122,7 @@ BOOL BINK1998::Verify(std::string &pKey)
*/ */
BIGNUM *e = BN_lebin2bn((BYTE *)&info.Hash, sizeof(info.Hash), nullptr), BIGNUM *e = BN_lebin2bn((BYTE *)&info.Hash, sizeof(info.Hash), nullptr),
*s = BN_lebin2bn((BYTE *)&info.Hash, sizeof(info.Hash), nullptr); *s = BN_lebin2bn((BYTE *)&info.Signature, sizeof(info.Signature), nullptr);
BIGNUM *x = BN_CTX_get(numContext), *y = BN_CTX_get(numContext); BIGNUM *x = BN_CTX_get(numContext), *y = BN_CTX_get(numContext);
@ -130,10 +130,10 @@ BOOL BINK1998::Verify(std::string &pKey)
EC_POINT *t = EC_POINT_new(eCurve), *p = EC_POINT_new(eCurve); EC_POINT *t = EC_POINT_new(eCurve), *p = EC_POINT_new(eCurve);
// t = sG // t = sG
EC_POINT_mul(eCurve, t, nullptr, basePoint, s, numContext); EC_POINT_mul(eCurve, t, nullptr, genPoint, s, numContext);
// P = eK // P = eK
EC_POINT_mul(eCurve, p, nullptr, publicKey, e, numContext); EC_POINT_mul(eCurve, p, nullptr, pubPoint, e, numContext);
// P += t // P += t
EC_POINT_add(eCurve, p, t, p, numContext); EC_POINT_add(eCurve, p, t, p, numContext);
@ -185,11 +185,14 @@ BOOL BINK1998::Generate(KeyInfo &info, std::string &pKey)
BIGNUM *c = BN_CTX_get(numContext), *s = BN_CTX_get(numContext), *x = BN_CTX_get(numContext), BIGNUM *c = BN_CTX_get(numContext), *s = BN_CTX_get(numContext), *x = BN_CTX_get(numContext),
*y = BN_CTX_get(numContext); *y = BN_CTX_get(numContext);
QWORD pRaw[2]{}; QWORD pRaw[2];
// Data segment of the RPK. // Data segment of the RPK.
DWORD pData = info.Serial << 1 | info.isUpgrade; DWORD pData = info.Serial << 1 | info.isUpgrade;
// prepare the private key for generation
BN_sub(privateKey, genOrder, privateKey);
do do
{ {
EC_POINT *r = EC_POINT_new(eCurve); EC_POINT *r = EC_POINT_new(eCurve);
@ -199,14 +202,14 @@ BOOL BINK1998::Generate(KeyInfo &info, std::string &pKey)
// Pick a random derivative of the base point on the elliptic curve. // Pick a random derivative of the base point on the elliptic curve.
// R = cG; // R = cG;
EC_POINT_mul(eCurve, r, nullptr, basePoint, c, numContext); EC_POINT_mul(eCurve, r, nullptr, genPoint, c, numContext);
// Acquire its coordinates. // Acquire its coordinates.
// x = R.x; y = R.y; // x = R.x; y = R.y;
EC_POINT_get_affine_coordinates(eCurve, r, x, y, numContext); EC_POINT_get_affine_coordinates(eCurve, r, x, y, numContext);
BYTE msgDigest[SHA_DIGEST_LENGTH]{}, msgBuffer[SHA_MSG_LENGTH_XP]{}; BYTE msgDigest[SHA_DIGEST_LENGTH], msgBuffer[SHA_MSG_LENGTH_XP];
BYTE xBin[FIELD_BYTES]{}, yBin[FIELD_BYTES]{}; BYTE xBin[FIELD_BYTES], yBin[FIELD_BYTES];
// Convert coordinates to bytes. // Convert coordinates to bytes.
BN_bn2lebin(x, xBin, FIELD_BYTES); BN_bn2lebin(x, xBin, FIELD_BYTES);
@ -257,10 +260,10 @@ BOOL BINK1998::Generate(KeyInfo &info, std::string &pKey)
Pack(info, pRaw); Pack(info, pRaw);
fmt::print(UMSKT::debug, "Generation results:\n"); fmt::print(UMSKT::debug, "Generation results:\n");
fmt::print(UMSKT::debug, " Upgrade: 0x{:08x}\n", info.isUpgrade); fmt::print(UMSKT::debug, " Upgrade: {:#08x}\n", info.isUpgrade);
fmt::print(UMSKT::debug, " Serial: 0x{:08x}\n", info.Serial); fmt::print(UMSKT::debug, " Serial: {:#08x}\n", info.Serial);
fmt::print(UMSKT::debug, " Hash: 0x{:08x}\n", info.Hash); fmt::print(UMSKT::debug, " Hash: {:#08x}\n", info.Hash);
fmt::print(UMSKT::debug, " Signature: 0x{:08x}\n", info.Signature); fmt::print(UMSKT::debug, " Signature: {:#08x}\n", info.Signature);
fmt::print(UMSKT::debug, "\n"); fmt::print(UMSKT::debug, "\n");
EC_POINT_free(r); EC_POINT_free(r);

60
src/libumskt/pidgen3/BINK2002.cpp
View File

@ -86,7 +86,7 @@ BOOL BINK2002::Verify(std::string &pKey)
QWORD bKey[2]; QWORD bKey[2];
// Convert Base24 CD-key to bytecode. // Convert Base24 CD-key to bytecode.
unbase24((BYTE *)bKey, pKey.c_str()); unbase24((BYTE *)bKey, &pKey[0]);
// Extract product key segments from bytecode. // Extract product key segments from bytecode.
Unpack(info, bKey); Unpack(info, bKey);
@ -101,8 +101,7 @@ BOOL BINK2002::Verify(std::string &pKey)
fmt::print(UMSKT::debug, " AuthInfo: 0x{:08x}\n", info.AuthInfo); fmt::print(UMSKT::debug, " AuthInfo: 0x{:08x}\n", info.AuthInfo);
fmt::print(UMSKT::debug, "\n"); fmt::print(UMSKT::debug, "\n");
BYTE msgDigest[SHA_DIGEST_LENGTH]{}, msgBuffer[SHA_MSG_LENGTH_2003]{}, xBin[FIELD_BYTES_2003]{}, BYTE msgDigest[SHA_DIGEST_LENGTH], msgBuffer[SHA_MSG_LENGTH_2003], xBin[FIELD_BYTES_2003], yBin[FIELD_BYTES_2003];
yBin[FIELD_BYTES_2003]{};
// Assemble the first SHA message. // Assemble the first SHA message.
msgBuffer[0x00] = 0x5D; msgBuffer[0x00] = 0x5D;
@ -141,16 +140,17 @@ BOOL BINK2002::Verify(std::string &pKey)
*/ */
BIGNUM *e = BN_lebin2bn((BYTE *)&iSignature, sizeof(iSignature), nullptr), BIGNUM *e = BN_lebin2bn((BYTE *)&iSignature, sizeof(iSignature), nullptr),
*s = BN_lebin2bn((BYTE *)&info.Signature, sizeof(info.Signature), nullptr), *x = BN_new(), *y = BN_new(); *s = BN_lebin2bn((BYTE *)&info.Signature, sizeof(info.Signature), nullptr);
BIGNUM *x = BN_CTX_get(context), *y = BN_CTX_get(context);
// Create 2 points on the elliptic curve. // Create 2 points on the elliptic curve.
EC_POINT *p = EC_POINT_new(eCurve), *t = EC_POINT_new(eCurve); EC_POINT *p = EC_POINT_new(eCurve), *t = EC_POINT_new(eCurve);
// t = sG // t = sG
EC_POINT_mul(eCurve, t, nullptr, basePoint, s, context); EC_POINT_mul(eCurve, t, nullptr, genPoint, s, context);
// p = eK // p = eK
EC_POINT_mul(eCurve, p, nullptr, publicKey, e, context); EC_POINT_mul(eCurve, p, nullptr, pubPoint, e, context);
// p += t // p += t
EC_POINT_add(eCurve, p, t, p, context); EC_POINT_add(eCurve, p, t, p, context);
@ -182,14 +182,12 @@ BOOL BINK2002::Verify(std::string &pKey)
BN_free(s); BN_free(s);
BN_free(e); BN_free(e);
BN_free(x);
BN_free(y);
BN_CTX_free(context);
EC_POINT_free(p); EC_POINT_free(p);
EC_POINT_free(t); EC_POINT_free(t);
BN_CTX_free(context);
// If the computed hash checks out, the key is valid. // If the computed hash checks out, the key is valid.
return compHash == info.Hash; return compHash == info.Hash;
} }
@ -199,9 +197,10 @@ BOOL BINK2002::Generate(KeyInfo &info, std::string &pKey)
{ {
BN_CTX *numContext = BN_CTX_new(); BN_CTX *numContext = BN_CTX_new();
BIGNUM *c = BN_new(), *e = BN_new(), *s = BN_new(), *x = BN_new(), *y = BN_new(); BIGNUM *c = BN_CTX_get(numContext), *e = BN_CTX_get(numContext), *s = BN_CTX_get(numContext),
*x = BN_CTX_get(numContext), *y = BN_CTX_get(numContext);
QWORD pRaw[2]{}; QWORD pRaw[2];
// Data segment of the RPK. // Data segment of the RPK.
DWORD pData = info.ChannelID << 1 | info.isUpgrade; DWORD pData = info.ChannelID << 1 | info.isUpgrade;
@ -216,14 +215,14 @@ BOOL BINK2002::Generate(KeyInfo &info, std::string &pKey)
BN_rand(c, FIELD_BITS_2003, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY); BN_rand(c, FIELD_BITS_2003, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY);
// R = cG // R = cG
EC_POINT_mul(eCurve, r, nullptr, basePoint, c, numContext); EC_POINT_mul(eCurve, r, nullptr, genPoint, c, numContext);
// Acquire its coordinates. // Acquire its coordinates.
// x = R.x; y = R.y; // x = R.x; y = R.y;
EC_POINT_get_affine_coordinates(eCurve, r, x, y, numContext); EC_POINT_get_affine_coordinates(eCurve, r, x, y, numContext);
BYTE msgDigest[SHA_DIGEST_LENGTH]{}, msgBuffer[SHA_MSG_LENGTH_2003]{}, xBin[FIELD_BYTES_2003]{}, BYTE msgDigest[SHA_DIGEST_LENGTH], msgBuffer[SHA_MSG_LENGTH_2003], xBin[FIELD_BYTES_2003],
yBin[FIELD_BYTES_2003]{}; yBin[FIELD_BYTES_2003];
// Convert resulting point coordinates to bytes. // Convert resulting point coordinates to bytes.
BN_bn2lebin(x, xBin, FIELD_BYTES_2003); BN_bn2lebin(x, xBin, FIELD_BYTES_2003);
@ -234,24 +233,24 @@ BOOL BINK2002::Generate(KeyInfo &info, std::string &pKey)
msgBuffer[0x01] = (pData & 0x00FF); msgBuffer[0x01] = (pData & 0x00FF);
msgBuffer[0x02] = (pData & 0xFF00) >> 8; msgBuffer[0x02] = (pData & 0xFF00) >> 8;
memcpy((void *)&msgBuffer[3], (void *)xBin, FIELD_BYTES_2003); memcpy(&msgBuffer[3], xBin, FIELD_BYTES_2003);
memcpy((void *)&msgBuffer[3 + FIELD_BYTES_2003], (void *)yBin, FIELD_BYTES_2003); memcpy(&msgBuffer[3 + FIELD_BYTES_2003], yBin, FIELD_BYTES_2003);
// pHash = SHA1(79 || Channel ID || R.x || R.y) // pHash = SHA1(79 || Channel ID || R.x || R.y)
SHA1(msgBuffer, SHA_MSG_LENGTH_2003, msgDigest); SHA1(msgBuffer, SHA_MSG_LENGTH_2003, msgDigest);
// Translate the byte digest into a 32-bit integer - this is our computed hash. // Translate the byte digest into a 32-bit integer - this is our computed hash.
// Truncate the hash to 31 bits. // Truncate the hash to 31 bits.
DWORD pHash = BYDWORD(msgDigest) & BITMASK(31); info.Hash = BYDWORD(msgDigest) & BITMASK(31);
// Assemble the second SHA message. // Assemble the second SHA message.
msgBuffer[0x00] = 0x5D; msgBuffer[0x00] = 0x5D;
msgBuffer[0x01] = (pData & 0x00FF); msgBuffer[0x01] = (pData & 0x00FF);
msgBuffer[0x02] = (pData & 0xFF00) >> 8; msgBuffer[0x02] = (pData & 0xFF00) >> 8;
msgBuffer[0x03] = (pHash & 0x000000FF); msgBuffer[0x03] = (info.Hash & 0x000000FF);
msgBuffer[0x04] = (pHash & 0x0000FF00) >> 8; msgBuffer[0x04] = (info.Hash & 0x0000FF00) >> 8;
msgBuffer[0x05] = (pHash & 0x00FF0000) >> 16; msgBuffer[0x05] = (info.Hash & 0x00FF0000) >> 16;
msgBuffer[0x06] = (pHash & 0xFF000000) >> 24; msgBuffer[0x06] = (info.Hash & 0xFF000000) >> 24;
msgBuffer[0x07] = (info.AuthInfo & 0x00FF); msgBuffer[0x07] = (info.AuthInfo & 0x00FF);
msgBuffer[0x08] = (info.AuthInfo & 0xFF00) >> 8; msgBuffer[0x08] = (info.AuthInfo & 0xFF00) >> 8;
msgBuffer[0x09] = 0x00; msgBuffer[0x09] = 0x00;
@ -323,7 +322,6 @@ BOOL BINK2002::Generate(KeyInfo &info, std::string &pKey)
// The order is a prime, so it can't be even. // The order is a prime, so it can't be even.
if (BN_is_odd(s)) if (BN_is_odd(s))
{ {
// s = -ek + √((ek)² + 4c) + n // s = -ek + √((ek)² + 4c) + n
BN_add(s, s, genOrder); BN_add(s, s, genOrder);
} }
@ -338,11 +336,11 @@ BOOL BINK2002::Generate(KeyInfo &info, std::string &pKey)
Pack(info, pRaw); Pack(info, pRaw);
fmt::print(UMSKT::debug, "Generation results:\n"); fmt::print(UMSKT::debug, "Generation results:\n");
fmt::print(UMSKT::debug, " Upgrade: 0x{:08x}\n", info.isUpgrade); fmt::print(UMSKT::debug, " Upgrade: {:#08x}\n", info.isUpgrade);
fmt::print(UMSKT::debug, "Channel ID: 0x{:08x}\n", info.ChannelID); fmt::print(UMSKT::debug, "Channel ID: {:#08x}\n", info.ChannelID);
fmt::print(UMSKT::debug, " Hash: 0x{:08x}\n", info.Hash); fmt::print(UMSKT::debug, " Hash: {:#08x}\n", info.Hash);
fmt::print(UMSKT::debug, " Signature: 0x{:08x}\n", info.Signature); fmt::print(UMSKT::debug, " Signature: {:#08x}\n", info.Signature);
fmt::print(UMSKT::debug, " AuthInfo: 0x{:08x}\n", info.AuthInfo); fmt::print(UMSKT::debug, " AuthInfo: {:#08x}\n", info.AuthInfo);
fmt::print(UMSKT::debug, "\n"); fmt::print(UMSKT::debug, "\n");
EC_POINT_free(r); EC_POINT_free(r);
@ -354,12 +352,6 @@ BOOL BINK2002::Generate(KeyInfo &info, std::string &pKey)
// Convert bytecode to Base24 CD-key. // Convert bytecode to Base24 CD-key.
base24(pKey, (BYTE *)pRaw); base24(pKey, (BYTE *)pRaw);
BN_free(c);
BN_free(s);
BN_free(x);
BN_free(y);
BN_free(e);
BN_CTX_free(numContext); BN_CTX_free(numContext);
return true; return true;

13
src/libumskt/pidgen3/PIDGEN3.cpp
View File

@ -92,7 +92,6 @@ BOOL PIDGEN3::LoadEllipticCurve(const std::string pSel, const std::string aSel,
/* Computed Data */ /* Computed Data */
BN_dec2bn(&genOrder, &genOrderSel[0]); BN_dec2bn(&genOrder, &genOrderSel[0]);
BN_dec2bn(&privateKey, &privateKeySel[0]); BN_dec2bn(&privateKey, &privateKeySel[0]);
BN_sub(privateKey, genOrder, privateKey);
/* Elliptic Curve calculations. */ /* Elliptic Curve calculations. */
// The group is defined via Fp = all integers [0; p - 1], where p is prime. // The group is defined via Fp = all integers [0; p - 1], where p is prime.
@ -250,3 +249,15 @@ void PIDGEN3::unbase24(BYTE *byteSeq, std::string cdKey)
// Reverse the byte sequence. // Reverse the byte sequence.
endian(byteSeq, n); endian(byteSeq, n);
} }
BOOL PIDGEN3::getIsBINK1998()
{
BIGNUM *max = BN_new();
BN_hex2bn(&max, MAX_BINK1998);
int retval = BN_cmp(max, privateKey);
BN_free(max);
return retval == true;
}

10
src/libumskt/pidgen3/PIDGEN3.h
View File

@ -24,13 +24,16 @@
#define UMSKT_PIDGEN3_H #define UMSKT_PIDGEN3_H
#include "../libumskt.h" #include "../libumskt.h"
#define MAX_BINK1998 \
"0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
class PIDGEN3 class PIDGEN3
{ {
protected: protected:
BIGNUM *privateKey, *genOrder;
EC_POINT *genPoint, *pubPoint;
EC_GROUP *eCurve; EC_GROUP *eCurve;
EC_POINT *basePoint, *publicKey, *genPoint, *pubPoint; BOOL isBINK1998;
BIGNUM *genOrder, *privateKey;
public: public:
PIDGEN3() PIDGEN3()
@ -42,8 +45,6 @@ class PIDGEN3
EC_GROUP_free(eCurve); EC_GROUP_free(eCurve);
EC_POINT_free(genPoint); EC_POINT_free(genPoint);
EC_POINT_free(pubPoint); EC_POINT_free(pubPoint);
EC_POINT_free(basePoint);
EC_POINT_free(publicKey);
BN_free(genOrder); BN_free(genOrder);
BN_free(privateKey); BN_free(privateKey);
} }
@ -88,6 +89,7 @@ class PIDGEN3
void base24(std::string &cdKey, BYTE *byteSeq); void base24(std::string &cdKey, BYTE *byteSeq);
void unbase24(BYTE *byteSeq, std::string cdKey); void unbase24(BYTE *byteSeq, std::string cdKey);
BOOL getIsBINK1998();
}; };
#endif // UMSKT_PIDGEN3_H #endif // UMSKT_PIDGEN3_H