diff options
| author | George Hazan <ghazan@miranda.im> | 2022-11-15 12:49:25 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-11-15 12:49:25 +0300 |
| commit | f708f2a55a467092b70a537c2b97c9210440a420 (patch) | |
| tree | bec7d1200a546bfdac30ec64278673217d6e6365 /protocols/WhatsApp/src/noise.cpp | |
| parent | 85bcf4d780a31fd88508ae42ba825394a0911a5d (diff) | |
fixes #3245 (WhatsApp: crash on login) + code cleaning
Diffstat (limited to 'protocols/WhatsApp/src/noise.cpp')
| -rw-r--r-- | protocols/WhatsApp/src/noise.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/WhatsApp/src/noise.cpp b/protocols/WhatsApp/src/noise.cpp index a8d5b1f377..004b71cdef 100644 --- a/protocols/WhatsApp/src/noise.cpp +++ b/protocols/WhatsApp/src/noise.cpp @@ -81,7 +81,7 @@ void WANoise::deriveKey(const void *pData, size_t cbLen, MBinBuffer &write, MBin { size_t outlen = 64; uint8_t out[64]; - HKDF(EVP_sha256(), (BYTE *)salt.data(), (int)salt.length(), (BYTE *)pData, (int)cbLen, (BYTE *)"", 0, out, outlen); + HKDF(EVP_sha256(), salt.data(), (int)salt.length(), (BYTE *)pData, (int)cbLen, (BYTE *)"", 0, out, outlen); write.assign(out, 32); read.assign(out + 32, 32); @@ -104,9 +104,9 @@ MBinBuffer WANoise::decrypt(const void *pData, size_t cbLen) MBinBuffer res; if (!bInitFinished) - res = aesDecrypt(EVP_aes_256_gcm(), (BYTE *)decKey.data(), iv, pData, cbLen, hash, sizeof(hash)); + res = aesDecrypt(EVP_aes_256_gcm(), decKey.data(), iv, pData, cbLen, hash, sizeof(hash)); else - res = aesDecrypt(EVP_aes_256_gcm(), (BYTE *)decKey.data(), iv, pData, cbLen); + res = aesDecrypt(EVP_aes_256_gcm(), decKey.data(), iv, pData, cbLen); updateHash(pData, cbLen); return res; @@ -164,7 +164,7 @@ MBinBuffer WANoise::encrypt(const void *pData, size_t cbLen) int enc_len = 0, final_len = 0; EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); - EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, (BYTE *)encKey.data(), iv); + EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, encKey.data(), iv); if (!bInitFinished) EVP_EncryptUpdate(ctx, NULL, &enc_len, hash, sizeof(hash)); |