phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-03 08:03:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix SRP authentication producing wrong proofs

Browse source 
Two bugs that caused the server to always reject our login proof:
- N was hashed as 256 bytes (2048 bits) instead of 32 bytes (256 bits),
  producing completely wrong H(N)^H(g) and therefore wrong M1
- Session key computation B-k*g^x could go negative; OpenSSL's
  BN_mod_exp doesn't handle negative bases. Add k*N before subtracting
  (standard TrinityCore approach) to keep the value positive
This commit is contained in:
Kelsi 2026-02-05 12:46:53 -08:00
parent 5ef11fdc7d
commit 430a213063
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/auth/srp.cpp
View file

@ -127,21 +127,20 @@ void SRP::computeSessionKey() {
// Compute session key: S = (B - kg^x)^(a + ux) mod N // Compute session key: S = (B - kg^x)^(a + ux) mod N
// Step 1: kg^x // Step 1: kg^x mod N
BigNum gx = g.modPow(x, N); BigNum gx = g.modPow(x, N);
BigNum kgx = k.multiply(gx); BigNum kgx = k.multiply(gx);
// Step 2: B - kg^x // Step 2: B - kg^x (add k*N first to prevent negative result)
BigNum B_minus_kgx = B.subtract(kgx); BigNum kN = k.multiply(N);
BigNum diff = B.add(kN).subtract(kgx);
// Step 3: ux // Step 3: a + ux
BigNum ux = u.multiply(x); BigNum ux = u.multiply(x);
// Step 4: a + ux
BigNum aux = a.add(ux); BigNum aux = a.add(ux);
// Step 5: (B - kg^x)^(a + ux) mod N // Step 4: (B + kN - kg^x)^(a + ux) mod N
S = B_minus_kgx.modPow(aux, N); S = diff.modPow(aux, N);
LOG_DEBUG("Session key S calculated"); LOG_DEBUG("Session key S calculated");
@ -178,7 +177,7 @@ void SRP::computeProofs(const std::string& username) {
std::transform(upperUser.begin(), upperUser.end(), upperUser.begin(), ::toupper); std::transform(upperUser.begin(), upperUser.end(), upperUser.begin(), ::toupper);
// Compute H(N) and H(g) // Compute H(N) and H(g)
std::vector<uint8_t> N_bytes = N.toArray(true, 256); // Full 256 bytes std::vector<uint8_t> N_bytes = N.toArray(true, 32); // 32 bytes (256-bit prime)
std::vector<uint8_t> g_bytes = g.toArray(true); std::vector<uint8_t> g_bytes = g.toArray(true);
std::vector<uint8_t> N_hash = Crypto::sha1(N_bytes); std::vector<uint8_t> N_hash = Crypto::sha1(N_bytes);