Fixed openssl build issue
This commit is contained in:
parent
8cdcf31450
commit
3bf41c3537
|
@ -340,11 +340,11 @@ std::shared_ptr<SSLContext> SSLManager::loadContext(std::string &rawKey, std::st
|
||||||
#ifdef CRYPTO_BORINGSSL
|
#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
|
#else
|
||||||
BUF_MEM memory{};
|
BUF_MEM* memory{nullptr};
|
||||||
if(!BIO_get_mem_ptr(&*bio_private_key, &memory)) SSL_ERROR("Failed to get mem contents: ");
|
if(!BIO_get_mem_ptr(&*bio_private_key, &memory) || !memory) SSL_ERROR("Failed to get mem contents: ");
|
||||||
|
|
||||||
mem_ptr = (uint8_t*) memory.data;
|
mem_ptr = (uint8_t*) memory->data;
|
||||||
length = memory.length;
|
length = memory->length;
|
||||||
#endif
|
#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);
|
||||||
|
@ -365,11 +365,11 @@ std::shared_ptr<SSLContext> SSLManager::loadContext(std::string &rawKey, std::st
|
||||||
#ifdef CRYPTO_BORINGSSL
|
#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
|
#else
|
||||||
BUF_MEM memory{};
|
BUF_MEM* memory{nullptr};
|
||||||
if(!BIO_get_mem_ptr(&*bio_private_key, &memory)) SSL_ERROR("Failed to get mem contents: ");
|
if(!BIO_get_mem_ptr(&*bio_private_key, &memory) || !memory) SSL_ERROR("Failed to get mem contents: ");
|
||||||
|
|
||||||
mem_ptr = (uint8_t*) memory.data;
|
mem_ptr = (uint8_t*) memory->data;
|
||||||
length = memory.length;
|
length = memory->length;
|
||||||
#endif
|
#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);
|
||||||
|
|
Loading…
Reference in New Issue