Skip to content

Commit

Permalink
Fixed build against OpenSSL 1.1. Patch backported from grishka/libtgv…
Browse files Browse the repository at this point in the history
…oip#31 pull request.

Original patch by: Nicholas Guriev <[email protected]>
  • Loading branch information
xvitaly committed Dec 21, 2017
1 parent 3c309a5 commit 4674886
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Telegram/ThirdParty/libtgvoip/VoIPController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,12 @@ bool VoIPController::didInitWin32TimeScale = false;
#define SHA256_LENGTH 32

#ifndef TGVOIP_USE_CUSTOM_CRYPTO
extern "C" {
#include <openssl/sha.h>
#include <openssl/aes.h>
#include <openssl/modes.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){
AES_KEY akey;
Expand Down Expand Up @@ -134,7 +137,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){
AES_KEY 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={
Expand Down Expand Up @@ -1148,15 +1151,15 @@ simpleAudioBlock random_id:long random_bytes:string raw_data:string = DecryptedA
if(!micMuted){
audioInput->Start();
if(!audioInput->IsInitialized()){
LOGE("Erorr initializing audio capture");
LOGE("Error initializing audio capture");
lastError=TGVOIP_ERROR_AUDIO_IO;

SetState(STATE_FAILED);
return;
}
}
if(!audioOutput->IsInitialized()){
LOGE("Erorr initializing audio playback");
LOGE("Error initializing audio playback");
lastError=TGVOIP_ERROR_AUDIO_IO;

SetState(STATE_FAILED);
Expand Down

0 comments on commit 4674886

Please sign in to comment.