danog/libtgvoip
1
0
Fork 0
mirror of https://github.com/danog/libtgvoip.git synced 2024-11-27 04:34:42 +01:00
Code Issues Projects Releases Wiki Activity

Remove deprecated call of AES_ctr128_encrypt

Browse Source 
* The AES_ctr128_encrypt function is not available in OpenSSL 1.1.0
   without a special compiler flag
 * Fix a small misspelling
This commit is contained in:
Nicholas Guriev 2017-07-06 23:19:12 +03:00
parent de33700312
commit f2e246c1bf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
VoIPController.cpp
View File

@ -102,6 +102,7 @@ bool VoIPController::didInitWin32TimeScale = false;
#ifndef TGVOIP_USE_CUSTOM_CRYPTO #ifndef TGVOIP_USE_CUSTOM_CRYPTO
#include <openssl/sha.h> #include <openssl/sha.h>
#include <openssl/aes.h> #include <openssl/aes.h>
#include <openssl/modes.h>
#include <openssl/rand.h> #include <openssl/rand.h>
void tgvoip_openssl_aes_ige_encrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv){ void tgvoip_openssl_aes_ige_encrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv){
@ -131,7 +132,7 @@ void tgvoip_openssl_sha256(uint8_t* msg, size_t len, uint8_t* output){
void tgvoip_openssl_aes_ctr_encrypt(uint8_t* inout, size_t length, uint8_t* key, uint8_t* iv, uint8_t* ecount, uint32_t* num){ void tgvoip_openssl_aes_ctr_encrypt(uint8_t* inout, size_t length, uint8_t* key, uint8_t* iv, uint8_t* ecount, uint32_t* num){
AES_KEY akey; AES_KEY akey;
AES_set_encrypt_key(key, 32*8, &akey); AES_set_encrypt_key(key, 32*8, &akey);
AES_ctr128_encrypt(inout, inout, length, &akey, iv, ecount, num); CRYPTO_ctr128_encrypt(inout, inout, length, &akey, iv, ecount, num, (block128_f) AES_encrypt);
} }
voip_crypto_functions_t VoIPController::crypto={ voip_crypto_functions_t VoIPController::crypto={
@ -1142,7 +1143,7 @@ simpleAudioBlock random_id:long random_bytes:string raw_data:string = DecryptedA
if(!micMuted){ if(!micMuted){
audioInput->Start(); audioInput->Start();
if(!audioInput->IsInitialized()){ if(!audioInput->IsInitialized()){
LOGE("Erorr initializing audio capture"); LOGE("Error initializing audio capture");
lastError=TGVOIP_ERROR_AUDIO_IO; lastError=TGVOIP_ERROR_AUDIO_IO;
SetState(STATE_FAILED); SetState(STATE_FAILED);
@ -1150,7 +1151,7 @@ simpleAudioBlock random_id:long random_bytes:string raw_data:string = DecryptedA
} }
} }
if(!audioOutput->IsInitialized()){ if(!audioOutput->IsInitialized()){
LOGE("Erorr initializing audio playback"); LOGE("Error initializing audio playback");
lastError=TGVOIP_ERROR_AUDIO_IO; lastError=TGVOIP_ERROR_AUDIO_IO;
SetState(STATE_FAILED); SetState(STATE_FAILED);