mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-10-30 22:56:22 +00:00
Try OpenSSL 3.0
This commit is contained in:
parent
db4b737243
commit
8c4ae2253a
@ -102,16 +102,40 @@ target_link_libraries(core_libs
|
|||||||
Pugixml::pugixml
|
Pugixml::pugixml
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(core_libs
|
if(OPENSSL_FOUND)
|
||||||
PRIVATE
|
if(TARGET OpenSSL::SSL)
|
||||||
${GNUTLS_LIBRARIES}
|
target_link_libraries(core_libs
|
||||||
${GNUTLS_OPENSSL_LIBRARY}
|
PRIVATE
|
||||||
)
|
OpenSSL::SSL
|
||||||
|
)
|
||||||
target_include_directories(core_libs
|
else()
|
||||||
PRIVATE
|
target_link_libraries(core_libs
|
||||||
|
PRIVATE
|
||||||
|
${OPENSSL_LIBRARIES}
|
||||||
|
)
|
||||||
|
target_include_directories(core_libs
|
||||||
|
PRIVATE
|
||||||
|
${OPENSSL_INCLUDE_DIR}
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if(OPENSSL_VERSION)
|
||||||
|
if(OPENSSL_VERSION VERSION_GREATER "3.0.0")
|
||||||
|
target_compile_definitions(core_libs PRIVATE -DUSE_OPENSSL_3=1)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
target_link_libraries(core_libs
|
||||||
|
PRIVATE
|
||||||
|
${GNUTLS_LIBRARIES}
|
||||||
|
${GNUTLS_OPENSSL_LIBRARY}
|
||||||
|
)
|
||||||
|
target_include_directories(core_libs
|
||||||
|
PRIVATE
|
||||||
${GNUTLS_INCLUDE_DIR}
|
${GNUTLS_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(OPENSSL_FOUND)
|
if(OPENSSL_FOUND)
|
||||||
target_compile_definitions(core_libs PRIVATE -DUSE_OPENSSL_FALLBACK=1)
|
target_compile_definitions(core_libs PRIVATE -DUSE_OPENSSL_FALLBACK=1)
|
||||||
|
@ -108,7 +108,7 @@ void osnma_msg_receiver::msg_handler_osnma(const pmt::pmt_t& msg)
|
|||||||
auto osnma_data_ptr = std::make_shared<OSNMA_data>(d_osnma_data);
|
auto osnma_data_ptr = std::make_shared<OSNMA_data>(d_osnma_data);
|
||||||
this->message_port_pub(pmt::mp("OSNMA_to_PVT"), pmt::make_any(osnma_data_ptr));
|
this->message_port_pub(pmt::mp("OSNMA_to_PVT"), pmt::make_any(osnma_data_ptr));
|
||||||
d_new_data = false;
|
d_new_data = false;
|
||||||
d_osnma_data = OSNMA_data();
|
// d_osnma_data = OSNMA_data();
|
||||||
DLOG(INFO) << "NMA info sent to the PVT block through the OSNMA_to_PVT async message port";
|
DLOG(INFO) << "NMA info sent to the PVT block through the OSNMA_to_PVT async message port";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -382,7 +382,7 @@ void osnma_msg_receiver::process_dsm_message(const std::vector<uint8_t>& dsm_msg
|
|||||||
{
|
{
|
||||||
// Reserved message?
|
// Reserved message?
|
||||||
LOG(WARNING) << "OSNMA Reserved message received";
|
LOG(WARNING) << "OSNMA Reserved message received";
|
||||||
d_osnma_data = OSNMA_data();
|
// d_osnma_data = OSNMA_data();
|
||||||
}
|
}
|
||||||
d_number_of_blocks[d_osnma_data.d_dsm_header.dsm_id] = 0;
|
d_number_of_blocks[d_osnma_data.d_dsm_header.dsm_id] = 0;
|
||||||
}
|
}
|
||||||
@ -441,10 +441,37 @@ std::vector<uint8_t> osnma_msg_receiver::computeSHA256(const std::vector<uint8_t
|
|||||||
{
|
{
|
||||||
std::vector<uint8_t> output(32); // SHA256 hash size
|
std::vector<uint8_t> output(32); // SHA256 hash size
|
||||||
#if USE_OPENSSL_FALLBACK
|
#if USE_OPENSSL_FALLBACK
|
||||||
|
#if USE_OPENSSL_3
|
||||||
|
// unsigned char mdVal[EVP_MAX_MD_SIZE];
|
||||||
|
// unsigned char* md;
|
||||||
|
unsigned int mdLen;
|
||||||
|
EVP_MD_CTX* mdCtx = EVP_MD_CTX_new();
|
||||||
|
if (!EVP_DigestInit_ex(mdCtx, EVP_sha256(), OPENSSL_ENGINE))
|
||||||
|
{
|
||||||
|
// printf("Message digest initialization failed.\n");
|
||||||
|
// EVP_MD_CTX_free(mdCtx);
|
||||||
|
// exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
if (!EVP_DigestUpdate(mdCtx, input.data(), input.size()))
|
||||||
|
{
|
||||||
|
// printf("Message digest update failed.\n");
|
||||||
|
// EVP_MD_CTX_free(mdCtx);
|
||||||
|
// exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
if (!EVP_DigestFinal_ex(mdCtx, output.data(), &mdLen))
|
||||||
|
{
|
||||||
|
printf("Message digest finalization failed.\n");
|
||||||
|
EVP_MD_CTX_free(mdCtx);
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
EVP_MD_CTX_free(mdCtx);
|
||||||
|
// md = mdVal;
|
||||||
|
#else
|
||||||
SHA256_CTX sha256Context;
|
SHA256_CTX sha256Context;
|
||||||
SHA256_Init(&sha256Context);
|
SHA256_Init(&sha256Context);
|
||||||
SHA256_Update(&sha256Context, input.data(), input.size());
|
SHA256_Update(&sha256Context, input.data(), input.size());
|
||||||
SHA256_Final(output.data(), &sha256Context);
|
SHA256_Final(output.data(), &sha256Context);
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
gnutls_hash_hd_t hashHandle;
|
gnutls_hash_hd_t hashHandle;
|
||||||
gnutls_hash_init(&hashHandle, GNUTLS_DIG_SHA256);
|
gnutls_hash_init(&hashHandle, GNUTLS_DIG_SHA256);
|
||||||
@ -455,7 +482,7 @@ std::vector<uint8_t> osnma_msg_receiver::computeSHA256(const std::vector<uint8_t
|
|||||||
return output;
|
return output;
|
||||||
}
|
}
|
||||||
|
|
||||||
// bool signature(const std::vector<uint8_t>& publicKey, const std::vector<uint8_t>& publicKey)
|
// bool signature(const std::vector<uint8_t>& publicKey, const std::vector<uint8_t>& digest, const std::vector<uint8_t>& signature)
|
||||||
// {
|
// {
|
||||||
// bool success = false;
|
// bool success = false;
|
||||||
// #if USE_OPENSSL_FALLBACK
|
// #if USE_OPENSSL_FALLBACK
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
/** \addtogroup Core
|
/** \addtogroup Core
|
||||||
* \{ */
|
* \{ */
|
||||||
|
Loading…
Reference in New Issue
Block a user