arti/WindowsXPKg
1
0
Fork 0
mirror of https://github.com/Neo-Desktop/WindowsXPKg synced 2024-12-22 04:20:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Abstract FIRSTNBITS(), fix logic

Browse Source
This commit is contained in:
Andrew 2023-06-04 15:06:51 +03:00
parent 08ec7cb9bb
commit 9302ebd751
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/header.h
View File

@ -39,6 +39,8 @@
#define FIELD_BITS_2003 512
#define FIELD_BYTES_2003 64
#define FIRSTNBITS(field, n) ((field) & ((1ULL << (n)) - 1))
// Confirmation ID generator constants
#define SUCCESS 0
#define ERR_TOO_SHORT 1

14
src/xp.cpp
View File

@ -24,21 +24,21 @@ void unpackXP(DWORD (&pRaw)[4], DWORD &pSerial, DWORD &pHash, DWORD (&pSignature
// log2(24^25) = 114.
// Serial = Bits [0..30] -> 31 bits
pSerial = pRaw[0] & 0x7fffffff;
pSerial = FIRSTNBITS(pRaw[0], 31);
// Hash (e) = Bits [31..58] -> 28 bits
pHash = ((pRaw[0] >> 31) | (pRaw[1] << 1)) & 0xfffffff;
pHash = FIRSTNBITS(pRaw[1] << 1 | pRaw[0] >> 31, 28);
// Signature (s) = Bits [59..113] -> 55 bits
pSignature[0] = (pRaw[1] >> 27) | (pRaw[2] << 5);
pSignature[1] = (pRaw[2] >> 27) | (pRaw[3] << 5);
pSignature[0] = pRaw[2] << 5 | pRaw[1] >> 27;
pSignature[1] = pRaw[3] << 5 | pRaw[2] >> 27;
}
/* Packs the Windows XP Product Key. */
void packXP(DWORD (&pRaw)[4], DWORD pSerial, DWORD pHash, DWORD (&pSignature)[2]) {
pRaw[0] = pSerial | ((pHash & 1) << 31);
pRaw[1] = (pHash >> 1) | ((pSignature[0] & 0x1f) << 27);
pRaw[2] = (pSignature[0] >> 5) | (pSignature[1] << 27);
pRaw[0] = pSerial | FIRSTNBITS(pHash, 1) << 31;
pRaw[1] = FIRSTNBITS(pSignature[0], 5) << 27 | pHash >> 1;
pRaw[2] = pSignature[1] << 27 | pSignature[0] >> 5;
pRaw[3] = pSignature[1] >> 5;
}