TeaSpeak
/
TeaSpeakLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed openssl build issue

This commit is contained in:
WolverinDEV 2020-03-02 19:01:30 +01:00
parent 8cdcf31450
commit 3bf41c3537
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ssl/SSLManager.cpp
View File

@ -340,11 +340,11 @@ std::shared_ptr<SSLContext> SSLManager::loadContext(std::string &rawKey, std::st
#ifdef CRYPTO_BORINGSSL
if(!BIO_mem_contents(&*bio_private_key, &mem_ptr, &length)) SSL_ERROR("Failed to get mem contents: ");
#else
BUF_MEM memory{};
if(!BIO_get_mem_ptr(&*bio_private_key, &memory)) SSL_ERROR("Failed to get mem contents: ");
BUF_MEM* memory{nullptr};
if(!BIO_get_mem_ptr(&*bio_private_key, &memory) || !memory) SSL_ERROR("Failed to get mem contents: ");
mem_ptr = (uint8_t*) memory.data;
length = memory.length;
mem_ptr = (uint8_t*) memory->data;
length = memory->length;
#endif
if(!mem_ptr || length < 0) SSL_ERROR("Could not get private key mem pointer/invalid length: ");
rawKey.reserve(length);
@ -365,11 +365,11 @@ std::shared_ptr<SSLContext> SSLManager::loadContext(std::string &rawKey, std::st
#ifdef CRYPTO_BORINGSSL
if(!BIO_mem_contents(&*bio_private_key, &mem_ptr, &length)) SSL_ERROR("Failed to get mem contents: ");
#else
BUF_MEM memory{};
if(!BIO_get_mem_ptr(&*bio_private_key, &memory)) SSL_ERROR("Failed to get mem contents: ");
BUF_MEM* memory{nullptr};
if(!BIO_get_mem_ptr(&*bio_private_key, &memory) || !memory) SSL_ERROR("Failed to get mem contents: ");
mem_ptr = (uint8_t*) memory.data;
length = memory.length;
mem_ptr = (uint8_t*) memory->data;
length = memory->length;
#endif
if(!mem_ptr || length < 0) SSL_ERROR("Could not get cert bio mem pointer/invalid length: ");
rawCert.reserve(length);