diff options
| author | George Hazan <ghazan@miranda.im> | 2021-12-26 16:39:04 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-12-26 16:39:04 +0300 |
| commit | 62a186697df33c96dc1a6dac0f4dfc38652fb96f (patch) | |
| tree | 1437d0906218fae8827aed384026f2b7e656f4ac /protocols/ICQ-WIM | |
| parent | fcbb395dc7ff3edab972b6d4b27dbbfb3305f5d7 (diff) | |
BYTE -> uint8_t
Diffstat (limited to 'protocols/ICQ-WIM')
| -rw-r--r-- | protocols/ICQ-WIM/src/proto.h | 8 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/server.cpp | 6 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/utils.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h index eec5793b6d..0c57effe4f 100644 --- a/protocols/ICQ-WIM/src/proto.h +++ b/protocols/ICQ-WIM/src/proto.h @@ -459,10 +459,10 @@ public: ~CIcqProto(); CMOption<wchar_t*> m_szOwnId; // our own aim id - CMOption<BYTE> m_bHideGroupchats; // don't pop up group chat windows on startup - CMOption<BYTE> m_bUseTrayIcon; // use tray icon notifications - CMOption<BYTE> m_bErrorPopups; // display popups with errors - CMOption<BYTE> m_bLaunchMailbox; // launch browser to view email + CMOption<uint8_t> m_bHideGroupchats; // don't pop up group chat windows on startup + CMOption<uint8_t> m_bUseTrayIcon; // use tray icon notifications + CMOption<uint8_t> m_bErrorPopups; // display popups with errors + CMOption<uint8_t> m_bLaunchMailbox; // launch browser to view email CMOption<DWORD> m_iTimeDiff1; // set this status to m_iStatus1 after this interval of secs CMOption<DWORD> m_iStatus1; CMOption<DWORD> m_iTimeDiff2; // set this status to m_iStatus2 after this interval of secs diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp index 2b41b5aee7..f30ec313eb 100644 --- a/protocols/ICQ-WIM/src/server.cpp +++ b/protocols/ICQ-WIM/src/server.cpp @@ -318,7 +318,7 @@ MCONTACT CIcqProto::ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact, boo if (wszCap.GetLength() != 32) continue; - BYTE cap[16]; + uint8_t cap[16]; hex2binW(wszCap, cap, sizeof(cap)); if (!memcmp(cap, "MiNG", 4)) { // Miranda int v[4]; @@ -819,8 +819,8 @@ void CIcqProto::OnCheckPassword(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest*) CMStringA szPassTemp = m_szPassword; unsigned int len; - BYTE hashOut[MIR_SHA256_HASH_SIZE]; - HMAC(EVP_sha256(), szPassTemp, szPassTemp.GetLength(), (BYTE*)szSessionSecret.c_str(), szSessionSecret.GetLength(), hashOut, &len); + uint8_t hashOut[MIR_SHA256_HASH_SIZE]; + HMAC(EVP_sha256(), szPassTemp, szPassTemp.GetLength(), (uint8_t*)szSessionSecret.c_str(), szSessionSecret.GetLength(), hashOut, &len); m_szSessionKey = ptrA(mir_base64_encode(hashOut, sizeof(hashOut))); setString(DB_KEY_SESSIONKEY, m_szSessionKey); diff --git a/protocols/ICQ-WIM/src/utils.cpp b/protocols/ICQ-WIM/src/utils.cpp index 4bd51e050c..73af43851a 100644 --- a/protocols/ICQ-WIM/src/utils.cpp +++ b/protocols/ICQ-WIM/src/utils.cpp @@ -110,8 +110,8 @@ void CIcqProto::CalcHash(AsyncHttpRequest *pReq) mir_urlEncode(pReq->m_szUrl).c_str(), mir_urlEncode(pReq->m_szParam).c_str()); unsigned int len; - BYTE hashOut[MIR_SHA256_HASH_SIZE]; - HMAC(EVP_sha256(), m_szSessionKey, m_szSessionKey.GetLength(), (BYTE*)hashData.c_str(), hashData.GetLength(), hashOut, &len); + uint8_t hashOut[MIR_SHA256_HASH_SIZE]; + HMAC(EVP_sha256(), m_szSessionKey, m_szSessionKey.GetLength(), (uint8_t*)hashData.c_str(), hashData.GetLength(), hashOut, &len); pReq << CHAR_PARAM("sig_sha256", ptrA(mir_base64_encode(hashOut, sizeof(hashOut)))); } |