From 9cb64ba2151b213f5544b2e53c6668061f197b9c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 21 Jun 2015 13:43:01 +0000 Subject: MS_UTILS_GETRANDOM -> mir_core::Utils_GetRandom git-svn-id: http://svn.miranda-ng.org/main/trunk@14299 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_auth.cpp | 5 ++--- protocols/MSN/src/msn_std.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'protocols/MSN/src') diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp index c866135156..ce01104a1e 100644 --- a/protocols/MSN/src/msn_auth.cpp +++ b/protocols/MSN/src/msn_auth.cpp @@ -405,7 +405,7 @@ char* CMsnProto::GenerateLoginBlob(char* challenge) p += sizeof(MsgrUsrKeyHdr); unsigned char iv[8]; - CallService(MS_UTILS_GETRANDOM, sizeof(iv), (LPARAM)iv); + Utils_GetRandom(iv, sizeof(iv)); memcpy(p, iv, sizeof(iv)); p += sizeof(iv); @@ -423,11 +423,10 @@ char* CMsnProto::GenerateLoginBlob(char* challenge) return mir_base64_encode(userKey, (unsigned)pktsz); } - CMStringA CMsnProto::HotmailLogin(const char* url) { unsigned char nonce[24]; - CallService(MS_UTILS_GETRANDOM, sizeof(nonce), (LPARAM)nonce); + Utils_GetRandom(nonce, sizeof(nonce)); unsigned key1len; BYTE *key1 = (BYTE*)mir_base64_decode(hotSecretToken, &key1len); diff --git a/protocols/MSN/src/msn_std.cpp b/protocols/MSN/src/msn_std.cpp index c609a54391..a29db7b667 100644 --- a/protocols/MSN/src/msn_std.cpp +++ b/protocols/MSN/src/msn_std.cpp @@ -63,6 +63,6 @@ TCHAR* CMsnProto::GetContactNameT(MCONTACT hContact) unsigned MSN_GenRandom(void) { unsigned rndnum; - CallService(MS_UTILS_GETRANDOM, sizeof(rndnum), (LPARAM)&rndnum); + Utils_GetRandom(&rndnum, sizeof(rndnum)); return rndnum & 0x7FFFFFFF; } -- cgit v1.2.3