mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-10-18 21:42:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix-openssl4' into fix-gss6450

Browse Source
This commit is contained in:
Carles Fernandez
2026-06-20 13:03:56 +02:00
parent f7dcd2b118 e9077a6e11
commit 9aa9ca72e4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/libs/osnma_msg_receiver.cc
+4 -4
View File
@@ -680,7 +680,7 @@ bool osnma_msg_receiver::pkid_from_certificate_subject_cn(const std::string& crt
}
#endif // OpenSSL
const X509_NAME* subject = X509_get_subject_name(cert);
auto* subject = X509_get_subject_name(cert);
if (subject == nullptr)
{
LOG(WARNING) << "OpenSSL: certificate has no Subject: "
@@ -698,13 +698,13 @@ bool osnma_msg_receiver::pkid_from_certificate_subject_cn(const std::string& crt
NID_commonName,
index)) >= 0)
{
const X509_NAME_ENTRY* entry = X509_NAME_get_entry(subject, index);
auto* entry = X509_NAME_get_entry(subject, index);
if (entry == nullptr)
{
continue;
}
const ASN1_STRING* asn1 = X509_NAME_ENTRY_get_data(entry);
auto* asn1 = X509_NAME_ENTRY_get_data(entry);
if (asn1 == nullptr)
{
continue;
@@ -3225,7 +3225,7 @@ std::vector<uint8_t> osnma_msg_receiver::build_message(Tag& tag) const
}
bool osnma_msg_receiver::verify_tesla_key(std::vector<uint8_t>& key, uint32_t key_gst)
bool osnma_msg_receiver::verify_tesla_key(const std::vector<uint8_t>& key, uint32_t key_gst)
{
uint32_t num_of_hashes_needed{};
uint32_t GST_SFi = gst_with_offset(d_helper->get_WN(d_GST_Sf), d_helper->get_TOW(d_GST_Sf), -30); // GST of target key is to be used.
src/core/libs/osnma_msg_receiver.h
+1 -1
View File
@@ -104,7 +104,7 @@ private:
bool read_mack_body();
bool process_mack_block(const std::shared_ptr<OSNMA_msg>& osnma_msg, const std::vector<uint8_t>& allowed_adkds, uint8_t nmas);
bool set_gst_sf_for_mack(uint32_t WN, uint32_t TOW);
bool verify_tesla_key(std::vector<uint8_t>& key, uint32_t key_gst);
bool verify_tesla_key(const std::vector<uint8_t>& key, uint32_t key_gst);
bool verify_tag(Tag& tag) const;
bool tag_has_nav_data_available(const Tag& t) const;
bool tag_has_key_available(const Tag& t) const;