kotofyt/funnygame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some improvements i think

Browse Source
This commit is contained in:
kotofyt
2026-01-14 20:15:49 +02:00
parent 6604c67ec5
commit 49adb21b81
14 changed files with 420 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

264
appleauth/auth.cpp
View File

@@ -7,6 +7,23 @@
#include "tier0/rand.h"
IHTTPClientManager *g_pHttpClientMgr = NULL;
static int base64_decode(const char *b64, unsigned char *pOut) {
int len = strlen(b64);
if (pOut == NULL)
return (len*3)/4;
int out_len = EVP_DecodeBlock(pOut,
(const unsigned char *)b64,
len);
if (out_len < 0)
return -1;
while (len > 0 && b64[len - 1] == '=') {
out_len--;
len--;
}
return out_len;
}
// autogenerated
#define APPLE_LOCAL_USER "e2e70285da39596ef06153b9c4e1e5dc8d2f983bc5cd63f5b1e292207060d931"
@@ -43,6 +60,7 @@ public:
virtual EAppleAuthStatus SubmitLoginData( const char *szEmail, const char *szPassword ) override;
virtual EAppleAuthStatus Submit2FA( const char *szCode ) override;
virtual CUtlString EncryptPassword( const char *szPassword, CUtlString szSalt, uint32_t uIters, EPasswordType eType );
void ComputeM1( unsigned char M1[SHA256_DIGEST_LENGTH], const BIGNUM *N, const BIGNUM *g, const char *username, const char *password, const unsigned char *salt, size_t salt_len, const BIGNUM *A, const BIGNUM *B, const BIGNUM *a );
CUtlString FetchADIPB();
void FetchHeaders( CUtlString szAdiPb );
@@ -261,23 +279,20 @@ EAppleAuthStatus CAppleAuth::SubmitLoginData( const char *szEmail, const char *s
BIGNUM* pA = BN_new();
BN_CTX *pbnCtx = BN_CTX_new();
/*
CUtlBuffer<unsigned char> bN;
CUtlBuffer<unsigned char> bG;
*/
SHA256_CTX pSha;
unsigned char szHash[SHA256_DIGEST_LENGTH];
unsigned char pK[SHA256_DIGEST_LENGTH];
BN_hex2bn(&pN, N2048);
BN_hex2bn(&pG, G2048);
/*
CUtlBuffer<unsigned char> bN;
CUtlBuffer<unsigned char> bG;
bN = CUtlBuffer<unsigned char>(BN_num_bytes(pN));
bG = CUtlBuffer<unsigned char>(BN_num_bytes(pG));
BN_bn2bin(pN, bN.GetMemory());
SHA256_Init(&pSha);
SHA256_Update(&pSha, bN.GetMemory(), bN.GetSize());
SHA256_Update(&pSha, bG.GetMemory(), bG.GetSize());
SHA256_Final(szHash, &pSha);
*/
SHA256_Final(pK, &pSha);
BN_rand(pa, 256, 0, 0);
BN_set_flags(pa, BN_FLG_CONSTTIME);
BN_mod_exp(pA, pG, pa, pN, pbnCtx);
@@ -368,39 +383,230 @@ EAppleAuthStatus CAppleAuth::SubmitLoginData( const char *szEmail, const char *s
m_pGrandSlamClient->Post("/grandslam/GsService2", &header, plist.GetLenght(), plist);
HTTPResponse_t stResponse = m_pGrandSlamClient->GetResponse();
V_printf("%i %i\n", stResponse.m_uCode, stResponse.m_bIsComplete);
if (stResponse.m_uCode == 200)
if (stResponse.m_uCode != 200)
return APPLE_AUTH_FAILURE;
V_printf("%s\n",stResponse.m_message.GetMemory());
IJSONObject *pObject = PropertyListManager()->ReadString(stResponse.m_message);
IJSONObject *pResponse = pObject->GetValue("Response")->GetObject();
CUtlString szEncryptedPassword = EncryptPassword(szPassword, pResponse->GetValue("s")->GetStringValue(), pResponse->GetValue("i")->GetNumberValue(), PASSWORD_TYPE_S2K);
const char *szSalt = pResponse->GetValue("s")->GetStringValue();
const char *szB = pResponse->GetValue("B")->GetStringValue();
unsigned char salt[32];
int iSaltLen = base64_decode(szSalt, salt);
int iBLen = base64_decode(szB, NULL);
CUtlBuffer<unsigned char> BBuffer = CUtlBuffer<unsigned char>(iBLen);
iBLen = base64_decode(szB, BBuffer.GetMemory());
BIGNUM *pB = BN_bin2bn(BBuffer.GetMemory(), BBuffer.GetSize(), NULL);
unsigned char M1[SHA256_DIGEST_LENGTH];
ComputeM1(M1, pN, pG, szEmail, szPassword, salt, iSaltLen, pA, pB, pa);
CUtlString szM1 = {};
for ( int i = 0; i < SHA256_DIGEST_LENGTH; i++ )
{
V_printf("%s\n",stResponse.m_message.GetMemory());
IJSONObject *pObject = PropertyListManager()->ReadString(stResponse.m_message);
IJSONObject *pResponse = pObject->GetValue("Response")->GetObject();
EncryptPassword(szPassword, pResponse->GetValue("s")->GetStringValue(), pResponse->GetValue("i")->GetNumberValue(), PASSWORD_TYPE_S2K);
szM1.AppendTail(CUtlString("%02x", M1[i]));
}
plist = CUtlString(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" "
"\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
"<plist version=\"1.0\">\n"
"<dict>\n"
"\t<key>Header</key>\n"
"\t<dict>\n"
"\t<key>Version</key>\n"
"\t<string>1.0.1</string>\n"
"\t</dict>\n"
"\t<key>Request</key>\n"
"\t<dict>\n"
"\t<key>M1</key>\n"
"\t<data>%s</data>\n"
"\t<key>c</key>\n"
"\t<string>%s</string>\n"
"\t<key>ps</key>\n"
"\t<array><string>s2k</string><string>s2k_fo</string></array>\n"
"\t<key>u</key>\n"
"\t<string>%s</string>\n"
"\t<key>o</key>\n"
"\t<string>complete</string>\n"
"\t<key>cpd</key>\n"
"\t<dict>\n"
"\t<key>X-Apple-I-Client-Time</key>\n"
"\t<string>2026-1-9T12:00:00Z</string>\n"
"\t<key>X-Apple-I-MD</key>\n"
"\t<string>%s</string>\n"
"\t<key>X-Apple-I-MD-LU</key>\n"
"\t<string>" APPLE_LOCAL_USER "</string>\n"
"\t<key>X-Apple-I-MD-M</key>\n"
"\t<string>%s</string>\n"
"\t<key>X-Apple-I-MD-RINFO</key>\n"
"\t<string>%s</string>\n"
"\t<key>X-Mme-Client-Info</key>\n"
"\t<string>&lt;MacBookPro13,2&gt; &lt;macOS;13.1;22C65&gt; &lt;com.apple.AuthKit/1 (com.apple.dt.Xcode/3594.4.19)&gt;</string>\n"
"\t<key>X-Apple-I-SRL-NO</key>\n"
"\t<string>0</string>\n"
"\t<key>bootstrap</key>\n"
"\t<trur/>\n"
"\t<key>icscrec</key>\n"
"\t<true/>\n"
"\t<key>pbe</key>\n"
"\t<false/>\n"
"\t<key>prkgen</key>\n"
"\t<true/>\n"
"\t<key>svct</key>\n"
"\t<string>iCloud</string>\n"
"\t<key>loc</key>\n"
"\t<string>en_US</string>\n"
"\t</dict>\n"
"\t</dict>\n"
"</dict>\n"
"</plist>\n", szM1.GetString(), pResponse->GetValue("c")->GetStringValue(), szEmail, m_szAppleIMD.GetString(), m_szAppleIMDM.GetString(), m_szAppleIMDRINFO.GetString());
V_printf("%s\n", plist.GetString());
m_pGrandSlamClient->Post("/grandslam/GsService2", &header, plist.GetLenght(), plist);
stResponse = m_pGrandSlamClient->GetResponse();
V_printf("%i %i\n", stResponse.m_uCode, stResponse.m_bIsComplete);
if (stResponse.m_uCode != 200)
return APPLE_AUTH_FAILURE;
V_printf("%s\n", stResponse.m_message.GetMemory());
g_pHttpClientMgr->Disconnect(m_pGrandSlamClient);
OPENSSL_free(pszA);
return APPLE_AUTH_SUCCESS;
}
static void hash_bn_pad(unsigned char out[SHA256_DIGEST_LENGTH], const BIGNUM *bn)
{
unsigned char buf[256];
memset(buf, 0, sizeof(buf));
int len = BN_num_bytes(bn);
BN_bn2bin(bn, buf + (256 - len));
SHA256(buf, 256, out);
}
void CAppleAuth::ComputeM1(
unsigned char M1[SHA256_DIGEST_LENGTH],
const BIGNUM *N,
const BIGNUM *g,
const char *username,
const char *password,
const unsigned char *salt, size_t salt_len,
const BIGNUM *A,
const BIGNUM *B,
const BIGNUM *a
)
{
SHA256_CTX ctx;
unsigned char HN[SHA256_DIGEST_LENGTH], Hg[SHA256_DIGEST_LENGTH], HNxorg[SHA256_DIGEST_LENGTH];
unsigned char HI[SHA256_DIGEST_LENGTH];
/* H(N) xor H(g) */
hash_bn_pad(HN, N);
hash_bn_pad(Hg, g);
for (int i = 0; i < SHA256_DIGEST_LENGTH; i++)
HNxorg[i] = HN[i] ^ Hg[i];
/* H(I) */
SHA256((const unsigned char *)username, strlen(username), HI);
/* x = H(s || H(I ":" P)) */
unsigned char inner_hash[SHA256_DIGEST_LENGTH];
SHA256_Init(&ctx);
SHA256_Update(&ctx, (const unsigned char *)username, strlen(username));
SHA256_Update(&ctx, (const unsigned char *)":", 1);
SHA256_Update(&ctx, (const unsigned char *)password, strlen(password));
SHA256_Final(inner_hash, &ctx);
unsigned char x_hash[SHA256_DIGEST_LENGTH];
SHA256_Init(&ctx);
SHA256_Update(&ctx, salt, salt_len);
SHA256_Update(&ctx, inner_hash, SHA256_DIGEST_LENGTH);
SHA256_Final(x_hash, &ctx);
BIGNUM *x = BN_bin2bn(x_hash, SHA256_DIGEST_LENGTH, NULL);
/* k = H(N || g) */
unsigned char k_hash[SHA256_DIGEST_LENGTH];
SHA256_Init(&ctx);
unsigned char bufN[256], bufg[256];
memset(bufN, 0, 256); BN_bn2bin(N, bufN + (256 - BN_num_bytes(N)));
memset(bufg, 0, 256); BN_bn2bin(g, bufg + (256 - BN_num_bytes(g)));
SHA256_Update(&ctx, bufN, 256);
SHA256_Update(&ctx, bufg, 256);
SHA256_Final(k_hash, &ctx);
BIGNUM *k = BN_bin2bn(k_hash, SHA256_DIGEST_LENGTH, NULL);
/* u = H(A || B) */
unsigned char bufA[256], bufB[256], u_hash[SHA256_DIGEST_LENGTH];
memset(bufA, 0, 256); BN_bn2bin(A, bufA + (256 - BN_num_bytes(A)));
memset(bufB, 0, 256); BN_bn2bin(B, bufB + (256 - BN_num_bytes(B)));
SHA256_Init(&ctx);
SHA256_Update(&ctx, bufA, 256);
SHA256_Update(&ctx, bufB, 256);
SHA256_Final(u_hash, &ctx);
BIGNUM *u = BN_bin2bn(u_hash, SHA256_DIGEST_LENGTH, NULL);
/* S = (B - k * g^x)^(a + u * x) mod N */
BN_CTX *bn_ctx = BN_CTX_new();
BIGNUM *gx = BN_new(), *kgx = BN_new(), *B_sub = BN_new();
BIGNUM *ux = BN_new(), *exp = BN_new(), *S = BN_new();
BN_mod_exp(gx, g, x, N, bn_ctx); /* g^x mod N */
BN_mod_mul(kgx, k, gx, N, bn_ctx); /* k * g^x mod N */
BN_mod_sub(B_sub, B, kgx, N, bn_ctx); /* B - k*g^x mod N */
BN_mul(ux, u, x, bn_ctx); /* u*x */
BN_add(exp, a, ux); /* a + u*x */
BN_mod_exp(S, B_sub, exp, N, bn_ctx); /* S */
/* K = H(S) */
unsigned char S_bytes[256];
memset(S_bytes, 0, 256);
BN_bn2bin(S, S_bytes + (256 - BN_num_bytes(S)));
unsigned char K[SHA256_DIGEST_LENGTH];
SHA256(S_bytes, 256, K);
/* Compute M1 */
SHA256_Init(&ctx);
SHA256_Update(&ctx, HNxorg, SHA256_DIGEST_LENGTH);
SHA256_Update(&ctx, HI, SHA256_DIGEST_LENGTH);
SHA256_Update(&ctx, salt, salt_len);
SHA256_Update(&ctx, bufA, 256);
SHA256_Update(&ctx, bufB, 256);
SHA256_Update(&ctx, K, SHA256_DIGEST_LENGTH);
SHA256_Final(M1, &ctx);
/* Cleanup */
BN_free(x); BN_free(k); BN_free(u);
BN_free(gx); BN_free(kgx); BN_free(B_sub); BN_free(ux); BN_free(exp); BN_free(S);
BN_CTX_free(bn_ctx);
}
EAppleAuthStatus CAppleAuth::Submit2FA( const char *szCode )
{
}
int base64_decode(const char *b64, unsigned char *out) {
int len = strlen(b64);
int out_len = EVP_DecodeBlock(out,
(const unsigned char *)b64,
len);
if (out_len < 0)
return -1;
while (len > 0 && b64[len - 1] == '=') {
out_len--;
len--;
}
return out_len;
}
CUtlString CAppleAuth::EncryptPassword( const char *szPassword, CUtlString szSalt, uint32_t uIters, EPasswordType eType )
{