licensing: HWID diagnosability, matcher widening, delete-condition fix
- hwid.cpp: BitStream3 buffer 125 -> 160 bits (writes totalled 147 bits and overflowed the old allocation; encoded HWID bytes unchanged). Log component availability (uuid/cpu/mac/hdd) once per distinct HWID, and warn when WMI yields no components at all. - Matcher widened only, generation untouched: exact-string match short-circuits, UUID match accepts any WMI list entry (generator hashes the last valid one), fuzzy-match point breakdown is logged so field status-12 rejections are diagnosable. - ANSLicense.cpp: fix inverted delete condition (!p != NULL) at 6 sites; detect the shared "empty fingerprint" HWID of WMI-broken PCs and warn with repair steps; mask activation keys in error strings. - licensingclient.h: explain SetKey/validation/NTP failures on stderr. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -220,7 +220,11 @@ const char* HardwareId::GetCurrentHardwareId()
|
||||
WmiHelper wmi;
|
||||
#endif
|
||||
|
||||
BitStream3 bits(125);
|
||||
// 3 version bits + 9 x 16-bit hashes = 147 bits are written below, but only
|
||||
// the first 16 bytes are base32-encoded into the HWID (the HDD fields are
|
||||
// truncated by the 25-char format). The stream buffer must still hold every
|
||||
// write: 125 bits (16 bytes) overflowed the allocation by 3 bytes.
|
||||
BitStream3 bits(160);
|
||||
list<string> propList;
|
||||
unsigned char version = 1;
|
||||
unsigned short hash1, hash2, hash3, hash4;
|
||||
@@ -256,6 +260,8 @@ const char* HardwareId::GetCurrentHardwareId()
|
||||
|
||||
bits.WriteUInt16(hash1);
|
||||
|
||||
bool uuidFound = (hash1 != h0);
|
||||
|
||||
// CPU IDs - get up to 4 for better resilience
|
||||
propList.clear();
|
||||
|
||||
@@ -270,6 +276,8 @@ const char* HardwareId::GetCurrentHardwareId()
|
||||
cpu = NormalizeHardwareString(cpu);
|
||||
}
|
||||
|
||||
int cpuCount = (int)propList.size();
|
||||
|
||||
hash1 = (propList.size() > 0) ? HashString(propList.front().c_str()) : h0;
|
||||
hash2 = (propList.size() > 1) ? HashString(propList.back().c_str()) : h0;
|
||||
|
||||
@@ -298,6 +306,8 @@ const char* HardwareId::GetCurrentHardwareId()
|
||||
}
|
||||
propList.sort();
|
||||
|
||||
int macCount = (int)propList.size();
|
||||
|
||||
// Store up to 4 MAC hashes
|
||||
auto macIter = propList.begin();
|
||||
hash1 = (propList.size() > 0 && macIter != propList.end()) ? HashString((macIter++)->c_str()) : h0;
|
||||
@@ -325,6 +335,8 @@ const char* HardwareId::GetCurrentHardwareId()
|
||||
}
|
||||
propList.sort();
|
||||
|
||||
int hddCount = (int)propList.size();
|
||||
|
||||
auto hddIter = propList.begin();
|
||||
hash1 = (propList.size() > 0 && hddIter != propList.end()) ? HashString((hddIter++)->c_str()) : h0;
|
||||
hash2 = (propList.size() > 1 && hddIter != propList.end()) ? HashString((hddIter++)->c_str()) : h0;
|
||||
@@ -351,11 +363,34 @@ const char* HardwareId::GetCurrentHardwareId()
|
||||
insertPos += 6;
|
||||
}
|
||||
|
||||
// Field-diagnosability: log the component availability once per distinct
|
||||
// result so support can tell a weak fingerprint from a healthy one
|
||||
static string lastLoggedHwid;
|
||||
if (hardwareId != lastLoggedHwid)
|
||||
{
|
||||
lastLoggedHwid = hardwareId;
|
||||
fprintf(stderr, "[anslicensing] hardware id %s (components: uuid=%s cpu=%d mac=%d hdd=%d)\n",
|
||||
hardwareId.c_str(), uuidFound ? "ok" : "none", cpuCount, macCount, hddCount);
|
||||
|
||||
if (!uuidFound && cpuCount == 0 && macCount == 0)
|
||||
fprintf(stderr, "[anslicensing] WARNING: no hardware components readable via WMI - hardware id is NOT machine-specific. "
|
||||
"Check WMI health: winmgmt /verifyrepository (then winmgmt /salvagerepository if inconsistent)\n");
|
||||
}
|
||||
|
||||
return hardwareId.c_str();
|
||||
}
|
||||
|
||||
bool HardwareId::MatchCurrentHardwareId(const char* hwid)
|
||||
{
|
||||
// An HWID identical to the one this machine generates right now is by
|
||||
// definition this computer. The points-based matching below can score
|
||||
// under REQUIRED_POINTS on machines with an invalid SMBIOS UUID and few
|
||||
// fingerprintable components (no PCI NIC, no readable disk serial), which
|
||||
// would reject even a freshly generated local HWID.
|
||||
const char* currentHwid = GetCurrentHardwareId();
|
||||
if (currentHwid != NULL && strcmp(hwid, currentHwid) == 0)
|
||||
return true;
|
||||
|
||||
#ifdef _WIN32
|
||||
WmiHelper wmi;
|
||||
#endif
|
||||
@@ -383,8 +418,14 @@ bool HardwareId::MatchCurrentHardwareId(const char* hwid)
|
||||
|
||||
auto buf = base32.decode(hardwareId.c_str(), hardwareId.length(), &bufLen);
|
||||
|
||||
// The field layout is 147 bits but the HWID only encodes 16 bytes; zero-pad
|
||||
// the buffer so reading the trailing (truncated) HDD fields stays in bounds
|
||||
// and yields deterministic values instead of an out-of-bounds read.
|
||||
if (buf.size() < 20)
|
||||
buf.resize(20, 0);
|
||||
|
||||
BitStream3 bits;
|
||||
bits.Attach(buf.data(), 125);
|
||||
bits.Attach(buf.data(), 160);
|
||||
unsigned char version = 0;
|
||||
|
||||
bits.Read(&version, 3);
|
||||
@@ -398,6 +439,7 @@ bool HardwareId::MatchCurrentHardwareId(const char* hwid)
|
||||
|
||||
// Use a points-based matching system for resilience
|
||||
int matchPoints = 0;
|
||||
bool uuidMatched = false;
|
||||
const int REQUIRED_POINTS = 2; // Need at least 2 components to match
|
||||
|
||||
// Read UUID hash
|
||||
@@ -430,6 +472,7 @@ bool HardwareId::MatchCurrentHardwareId(const char* hwid)
|
||||
}
|
||||
}
|
||||
matchPoints += 2; // UUID/Memory match gives 2 points
|
||||
uuidMatched = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -437,9 +480,11 @@ bool HardwareId::MatchCurrentHardwareId(const char* hwid)
|
||||
#ifdef _WIN32
|
||||
wmi.GetPropertyList("SELECT * FROM Win32_ComputerSystemProduct", "UUID", &propList);
|
||||
#endif
|
||||
if (propList.size() > 0)
|
||||
// The generator hashes the last valid UUID entry, so accept a match
|
||||
// against any entry rather than only the first one
|
||||
for (list<string>::iterator iter = propList.begin(); iter != propList.end(); iter++)
|
||||
{
|
||||
string s = NormalizeHardwareString(propList.front());
|
||||
string s = NormalizeHardwareString(*iter);
|
||||
|
||||
if ((s.length() > 1)
|
||||
&& (s != "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF")
|
||||
@@ -448,6 +493,8 @@ bool HardwareId::MatchCurrentHardwareId(const char* hwid)
|
||||
if (hash1 != h0 && hash1 == HashString(s.c_str()))
|
||||
{
|
||||
matchPoints += 2; // UUID match is worth 2 points (most stable)
|
||||
uuidMatched = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -558,5 +605,14 @@ bool HardwareId::MatchCurrentHardwareId(const char* hwid)
|
||||
// - UUID (2) + MAC (1) = 3 points ✓
|
||||
// - UUID (2) + HDD (1) = 3 points ✓
|
||||
// - CPU (1) + MAC (1) + HDD (1) = 3 points ✓ (if UUID changed but hardware same)
|
||||
return matchPoints >= REQUIRED_POINTS;
|
||||
bool accepted = (matchPoints >= REQUIRED_POINTS);
|
||||
|
||||
// Only reached when the exact-string precheck missed, i.e. the stored HWID
|
||||
// differs from the one this machine generates now. Log the breakdown so a
|
||||
// status-12 rejection in the field is diagnosable from the console output.
|
||||
fprintf(stderr, "[anslicensing] hardware id fuzzy match for %s: uuid=%s cpuMatches=%d macMatches=%d hddMatches=%d -> %d point(s), %d required -> %s\n",
|
||||
hwid, uuidMatched ? "match" : "no-match", cpuMatches, macMatches, hddMatches,
|
||||
matchPoints, REQUIRED_POINTS, accepted ? "accepted" : "REJECTED");
|
||||
|
||||
return accepted;
|
||||
}
|
||||
Reference in New Issue
Block a user