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

Fixed TeaSpeak for openssl

Browse Source
This commit is contained in:
WolverinDEV 2020-03-02 18:45:52 +01:00
parent 3661056d2a
commit 8cdcf31450
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ssl/SSLManager.cpp
View File

@ -337,7 +337,15 @@ std::shared_ptr<SSLContext> SSLManager::loadContext(std::string &rawKey, std::st
const uint8_t* mem_ptr{nullptr}; const uint8_t* mem_ptr{nullptr};
size_t length{0}; size_t length{0};
#ifdef CRYPTO_BORINGSSL
if(!BIO_mem_contents(&*bio_private_key, &mem_ptr, &length)) SSL_ERROR("Failed to get mem contents: "); 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: ");
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: "); if(!mem_ptr || length < 0) SSL_ERROR("Could not get private key mem pointer/invalid length: ");
rawKey.reserve(length); rawKey.reserve(length);
memcpy(rawKey.data(), mem_ptr, length); memcpy(rawKey.data(), mem_ptr, length);
@ -354,7 +362,15 @@ std::shared_ptr<SSLContext> SSLManager::loadContext(std::string &rawKey, std::st
const uint8_t* mem_ptr{nullptr}; const uint8_t* mem_ptr{nullptr};
size_t length{0}; size_t length{0};
#ifdef CRYPTO_BORINGSSL
if(!BIO_mem_contents(&*bio_private_key, &mem_ptr, &length)) SSL_ERROR("Failed to get mem contents: "); 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: ");
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: "); if(!mem_ptr || length < 0) SSL_ERROR("Could not get cert bio mem pointer/invalid length: ");
rawCert.reserve(length); rawCert.reserve(length);
memcpy(rawCert.data(), mem_ptr, length); memcpy(rawCert.data(), mem_ptr, length);