mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-10-30 22:56:22 +00:00
Merge branch 'osnma-cesare' of https://github.com/cesaaargm/osnma into osnma-cesare
This commit is contained in:
commit
ff2a9aacf0
@ -78,7 +78,7 @@ private:
|
|||||||
void readPublicKeyFromPEM(const std::string& pemFilePath);
|
void readPublicKeyFromPEM(const std::string& pemFilePath);
|
||||||
bool readPublicKeyFromCRT(const std::string& crtFilePath);
|
bool readPublicKeyFromCRT(const std::string& crtFilePath);
|
||||||
bool convert_raw_to_der_ecdsa(const std::vector<uint8_t>& raw_signature, std::vector<uint8_t>& der_signature) const;
|
bool convert_raw_to_der_ecdsa(const std::vector<uint8_t>& raw_signature, std::vector<uint8_t>& der_signature) const;
|
||||||
std::vector<uint8_t> convert_from_hex_str(const std::string& input) const;
|
std::vector<uint8_t> convert_from_hex_str(const std::string& input) const; // TODO - deprecate if OSNMA helper is to do this operation
|
||||||
#if USE_GNUTLS_FALLBACK
|
#if USE_GNUTLS_FALLBACK
|
||||||
void decompress_public_key_secp256r1(const std::vector<uint8_t>& compressed_key, std::vector<uint8_t>& x, std::vector<uint8_t>& y) const;
|
void decompress_public_key_secp256r1(const std::vector<uint8_t>& compressed_key, std::vector<uint8_t>& x, std::vector<uint8_t>& y) const;
|
||||||
void decompress_public_key_secp521r1(const std::vector<uint8_t>& compressed_key, std::vector<uint8_t>& x, std::vector<uint8_t>& y) const;
|
void decompress_public_key_secp521r1(const std::vector<uint8_t>& compressed_key, std::vector<uint8_t>& x, std::vector<uint8_t>& y) const;
|
||||||
|
@ -1067,7 +1067,18 @@ void osnma_msg_receiver::process_mack_message()
|
|||||||
// add tag0 first
|
// add tag0 first
|
||||||
Tag tag0(*mack);
|
Tag tag0(*mack);
|
||||||
d_tags_awaiting_verify.insert(std::pair<uint32_t, Tag>(mack->TOW, tag0));
|
d_tags_awaiting_verify.insert(std::pair<uint32_t, Tag>(mack->TOW, tag0));
|
||||||
// bool ret = verify_macseq(*mack);
|
LOG(INFO) << "Galileo OSNMA: Add Tag0 Id= "
|
||||||
|
<< tag0.tag_id
|
||||||
|
<< ", value=0x" << std::setfill('0') << std::setw(10) << std::hex << std::uppercase
|
||||||
|
<< tag0.received_tag << std::dec
|
||||||
|
<< ", TOW="
|
||||||
|
<< tag0.TOW
|
||||||
|
<< ", ADKD="
|
||||||
|
<< static_cast<unsigned>(tag0.ADKD)
|
||||||
|
<< ", PRNa="
|
||||||
|
<< static_cast<unsigned>(tag0.PRNa)
|
||||||
|
<< ", PRNd="
|
||||||
|
<< static_cast<unsigned>(tag0.PRN_d);
|
||||||
std::vector<MACK_tag_and_info> macseq_verified_tags = verify_macseq_new(*mack);
|
std::vector<MACK_tag_and_info> macseq_verified_tags = verify_macseq_new(*mack);
|
||||||
for (auto& tag_and_info : macseq_verified_tags)
|
for (auto& tag_and_info : macseq_verified_tags)
|
||||||
{
|
{
|
||||||
@ -1525,7 +1536,7 @@ void osnma_msg_receiver::remove_verified_tags()
|
|||||||
<< d_helper->verification_status_str(it->second.status);
|
<< d_helper->verification_status_str(it->second.status);
|
||||||
it = d_tags_awaiting_verify.erase(it);
|
it = d_tags_awaiting_verify.erase(it);
|
||||||
}
|
}
|
||||||
else if (it->second.skipped >= 20)
|
else if ((it->second.ADKD != 12 && !d_nav_data_manager->have_nav_data(it->second)) || (it->second.ADKD == 12 && (it->second.TOW + 30 * 11 < d_helper->get_TOW(d_last_verified_key_GST))))
|
||||||
{
|
{
|
||||||
LOG(INFO) << "Galileo OSNMA: Tag verification :: DELETE tag Id="
|
LOG(INFO) << "Galileo OSNMA: Tag verification :: DELETE tag Id="
|
||||||
<< it->second.tag_id
|
<< it->second.tag_id
|
||||||
@ -1540,7 +1551,8 @@ void osnma_msg_receiver::remove_verified_tags()
|
|||||||
<< ", PRNd="
|
<< ", PRNd="
|
||||||
<< static_cast<unsigned>(it->second.PRN_d)
|
<< static_cast<unsigned>(it->second.PRN_d)
|
||||||
<< ", status="
|
<< ", status="
|
||||||
<< d_helper->verification_status_str(it->second.status);
|
<< d_helper->verification_status_str(it->second.status)
|
||||||
|
<< ". SV out of sight / NavData unavailable.";
|
||||||
it = d_tags_awaiting_verify.erase(it);
|
it = d_tags_awaiting_verify.erase(it);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -2014,3 +2026,8 @@ std::pair<std::vector<uint8_t>, uint8_t> osnma_msg_receiver::parse_dsm_kroot() c
|
|||||||
|
|
||||||
return {dsm_msg, nma_header};
|
return {dsm_msg, nma_header};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void osnma_msg_receiver::set_merkle_root(const std::vector<uint8_t>& v)
|
||||||
|
{
|
||||||
|
d_crypto->set_merkle_root(v);
|
||||||
|
}
|
||||||
|
@ -64,6 +64,8 @@ public:
|
|||||||
~osnma_msg_receiver() = default; //!< Default destructor
|
~osnma_msg_receiver() = default; //!< Default destructor
|
||||||
void msg_handler_osnma(const pmt::pmt_t& msg); //!< For testing purposes
|
void msg_handler_osnma(const pmt::pmt_t& msg); //!< For testing purposes
|
||||||
void read_merkle_xml(const std::string& merklepath); //!< Public for testing purposes
|
void read_merkle_xml(const std::string& merklepath); //!< Public for testing purposes
|
||||||
|
bool verify_dsm_pkr(const DSM_PKR_message& message) const; //!< Public for benchmarking purposes
|
||||||
|
void set_merkle_root(const std::vector<uint8_t>& v); //!< Public for benchmarking purposes
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend osnma_msg_receiver_sptr osnma_msg_receiver_make(const std::string& pemFilePath, const std::string& merkleFilePath, bool strict_mode);
|
friend osnma_msg_receiver_sptr osnma_msg_receiver_make(const std::string& pemFilePath, const std::string& merkleFilePath, bool strict_mode);
|
||||||
@ -89,7 +91,7 @@ private:
|
|||||||
bool tag_has_nav_data_available(const Tag& t) const;
|
bool tag_has_nav_data_available(const Tag& t) const;
|
||||||
bool tag_has_key_available(const Tag& t) const;
|
bool tag_has_key_available(const Tag& t) const;
|
||||||
bool verify_macseq(const MACK_message& mack);
|
bool verify_macseq(const MACK_message& mack);
|
||||||
bool verify_dsm_pkr(const DSM_PKR_message& message) const;
|
|
||||||
bool store_dsm_kroot(const std::vector<uint8_t>& dsm, const uint8_t nma_header) const;
|
bool store_dsm_kroot(const std::vector<uint8_t>& dsm, const uint8_t nma_header) const;
|
||||||
|
|
||||||
std::pair<std::vector<uint8_t>, uint8_t> parse_dsm_kroot() const;
|
std::pair<std::vector<uint8_t>, uint8_t> parse_dsm_kroot() const;
|
||||||
|
@ -33,8 +33,9 @@ void OSNMA_NavDataManager::add_navigation_data(const std::string& nav_bits, uint
|
|||||||
if (not have_nav_data(nav_bits, PRNd, TOW))
|
if (not have_nav_data(nav_bits, PRNd, TOW))
|
||||||
{
|
{
|
||||||
d_satellite_nav_data[PRNd][TOW].add_nav_data(nav_bits);
|
d_satellite_nav_data[PRNd][TOW].add_nav_data(nav_bits);
|
||||||
d_satellite_nav_data[PRNd][TOW].PRNd = PRNd;
|
d_satellite_nav_data[PRNd][TOW].set_prn_d(PRNd);
|
||||||
d_satellite_nav_data[PRNd][TOW].set_tow_sf0(TOW);
|
d_satellite_nav_data[PRNd][TOW].set_tow_sf0(TOW);
|
||||||
|
d_satellite_nav_data[PRNd][TOW].set_last_received_TOW(TOW);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,7 +75,7 @@ void OSNMA_NavDataManager::update_nav_data(const std::multimap<uint32_t, Tag>& t
|
|||||||
// find associated OSNMA_NavData
|
// find associated OSNMA_NavData
|
||||||
if (tag.second.nav_data == nav_data)
|
if (tag.second.nav_data == nav_data)
|
||||||
{
|
{
|
||||||
d_satellite_nav_data[tag.second.PRN_d][tow_it.first].verified_bits += tag_size;
|
d_satellite_nav_data[tag.second.PRN_d][tow_it.first].set_update_verified_bits(tag_size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -89,10 +90,10 @@ std::vector<OSNMA_NavData> OSNMA_NavDataManager::get_verified_data()
|
|||||||
{
|
{
|
||||||
for (const auto& tow_navdata : prna.second)
|
for (const auto& tow_navdata : prna.second)
|
||||||
{
|
{
|
||||||
if (tow_navdata.second.verified_bits >= L_t_min)
|
if (tow_navdata.second.get_verified_bits() >= L_t_min)
|
||||||
{
|
{
|
||||||
result.push_back(tow_navdata.second);
|
result.push_back(tow_navdata.second);
|
||||||
d_satellite_nav_data[prna.first][tow_navdata.first].verified = true;
|
d_satellite_nav_data[prna.first][tow_navdata.first].set_verified_status(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -129,31 +130,62 @@ bool OSNMA_NavDataManager::have_nav_data(uint32_t PRNd, uint32_t TOW, uint8_t AD
|
|||||||
|
|
||||||
std::string OSNMA_NavDataManager::get_navigation_data(const Tag& tag) const
|
std::string OSNMA_NavDataManager::get_navigation_data(const Tag& tag) const
|
||||||
{
|
{
|
||||||
|
// Check if Dummy Tag, navData is all zeros
|
||||||
|
if (tag.cop == 0)
|
||||||
|
{
|
||||||
|
if (tag.ADKD == 0 || tag.ADKD == 12)
|
||||||
|
{
|
||||||
|
return std::string(549, '0');
|
||||||
|
}
|
||||||
|
else if (tag.ADKD == 4)
|
||||||
|
{
|
||||||
|
return std::string(141, '0');
|
||||||
|
}
|
||||||
|
}
|
||||||
auto prn_it = d_satellite_nav_data.find(tag.PRN_d);
|
auto prn_it = d_satellite_nav_data.find(tag.PRN_d);
|
||||||
if (prn_it == d_satellite_nav_data.end())
|
if (prn_it == d_satellite_nav_data.end())
|
||||||
{
|
{
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
// satellite was found, check if TOW exists in inner map
|
// satellite was found, check if TOW exists in inner map
|
||||||
std::map<uint32_t, OSNMA_NavData> tow_map = prn_it->second;
|
auto nav_data = prn_it->second.find(tag.TOW - 30);
|
||||||
for (auto& tow_it : tow_map) // note: starts with smallest (i.e. oldest) navigation dataset
|
if (nav_data != prn_it->second.end())
|
||||||
{
|
|
||||||
// Check if current key (TOW) fulfills condition
|
|
||||||
if ((tag.TOW - 30 * tag.cop) <= tow_it.first && tow_it.first <= tag.TOW - 30)
|
|
||||||
{
|
{
|
||||||
if (tag.ADKD == 0 || tag.ADKD == 12)
|
if (tag.ADKD == 0 || tag.ADKD == 12)
|
||||||
{
|
{
|
||||||
if (!tow_it.second.get_ephemeris_data().empty())
|
if (!nav_data->second.get_ephemeris_data().empty())
|
||||||
{
|
{
|
||||||
return tow_it.second.get_ephemeris_data();
|
return nav_data->second.get_ephemeris_data();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (tag.ADKD == 4)
|
else if (tag.ADKD == 4)
|
||||||
{
|
{
|
||||||
if (!tow_it.second.get_utc_data().empty())
|
if (!nav_data->second.get_utc_data().empty())
|
||||||
{
|
{
|
||||||
return tow_it.second.get_utc_data();
|
return nav_data->second.get_utc_data();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (auto rev_it = prn_it->second.rbegin(); rev_it != prn_it->second.rend(); ++rev_it) // note: starts with largest (i.e. newest) navigation dataset
|
||||||
|
{
|
||||||
|
// Check if current key (TOW) fulfills condition
|
||||||
|
if ((tag.TOW - 30 * tag.cop <= rev_it->first || tag.TOW - 30 * tag.cop <= rev_it->second.get_last_received_TOW()) && rev_it->first < tag.TOW)
|
||||||
|
{
|
||||||
|
if (tag.ADKD == 0 || tag.ADKD == 12)
|
||||||
|
{
|
||||||
|
if (!rev_it->second.get_ephemeris_data().empty())
|
||||||
|
{
|
||||||
|
return rev_it->second.get_ephemeris_data();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (tag.ADKD == 4)
|
||||||
|
{
|
||||||
|
if (!rev_it->second.get_utc_data().empty())
|
||||||
|
{
|
||||||
|
return rev_it->second.get_utc_data();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -179,7 +211,7 @@ bool OSNMA_NavDataManager::have_nav_data(const std::string& nav_bits, uint32_t P
|
|||||||
{
|
{
|
||||||
if (data_timestamp.second.get_ephemeris_data() == nav_bits)
|
if (data_timestamp.second.get_ephemeris_data() == nav_bits)
|
||||||
{
|
{
|
||||||
data_timestamp.second.update_last_received_timestamp(TOW);
|
data_timestamp.second.set_last_received_TOW(TOW);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -187,7 +219,7 @@ bool OSNMA_NavDataManager::have_nav_data(const std::string& nav_bits, uint32_t P
|
|||||||
{
|
{
|
||||||
if (data_timestamp.second.get_utc_data() == nav_bits)
|
if (data_timestamp.second.get_utc_data() == nav_bits)
|
||||||
{
|
{
|
||||||
data_timestamp.second.update_last_received_timestamp(TOW);
|
data_timestamp.second.set_last_received_TOW(TOW);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -204,33 +236,60 @@ bool OSNMA_NavDataManager::have_nav_data(const std::string& nav_bits, uint32_t P
|
|||||||
*/
|
*/
|
||||||
bool OSNMA_NavDataManager::have_nav_data(const Tag& t) const
|
bool OSNMA_NavDataManager::have_nav_data(const Tag& t) const
|
||||||
{
|
{
|
||||||
|
if (t.cop == 0)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
auto prn_it = d_satellite_nav_data.find(t.PRN_d);
|
auto prn_it = d_satellite_nav_data.find(t.PRN_d);
|
||||||
if (prn_it == d_satellite_nav_data.end())
|
if (prn_it == d_satellite_nav_data.end())
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// satellite was found, check if TOW exists in inner map
|
// satellite was found, check if TOW exists in inner map
|
||||||
std::map<uint32_t, OSNMA_NavData> tow_map = prn_it->second;
|
// try find target TOW directly first
|
||||||
for (auto& tow_it : tow_map) // note: starts with smallest (i.e. oldest) navigation dataset
|
auto nav_data = prn_it->second.find(t.TOW - 30);
|
||||||
{
|
if (nav_data != prn_it->second.end())
|
||||||
// Check if current key (TOW) fulfills condition
|
|
||||||
if (t.TOW - 30 * t.cop <= tow_it.first && tow_it.first <= t.TOW - 30)
|
|
||||||
{
|
{
|
||||||
if (t.ADKD == 0 || t.ADKD == 12)
|
if (t.ADKD == 0 || t.ADKD == 12)
|
||||||
{
|
{
|
||||||
if (!tow_it.second.get_ephemeris_data().empty())
|
if (!nav_data->second.get_ephemeris_data().empty())
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (t.ADKD == 4)
|
else if (t.ADKD == 4)
|
||||||
{
|
{
|
||||||
if (!tow_it.second.get_utc_data().empty())
|
if (!nav_data->second.get_utc_data().empty())
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// iterate in reverse order to find matching TOW with Tag's COP value
|
||||||
|
std::map<uint32_t, OSNMA_NavData> tow_map = prn_it->second;
|
||||||
|
for (auto rev_it = tow_map.rbegin(); rev_it != tow_map.rend(); ++rev_it) // note: starts with largest (i.e. newest) navigation dataset
|
||||||
|
{
|
||||||
|
// Check if current key (TOW) fulfills cut-off point and is not received after the tag
|
||||||
|
if ((t.TOW - 30 * t.cop <= rev_it->first || t.TOW - 30 * t.cop <= rev_it->second.get_last_received_TOW()) && rev_it->first < t.TOW)
|
||||||
|
{
|
||||||
|
if (t.ADKD == 0 || t.ADKD == 12)
|
||||||
|
{
|
||||||
|
if (!rev_it->second.get_ephemeris_data().empty())
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (t.ADKD == 4)
|
||||||
|
{
|
||||||
|
if (!rev_it->second.get_utc_data().empty())
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -245,17 +304,17 @@ void OSNMA_NavDataManager::log_status() const
|
|||||||
for (const auto& nav_data : tow_data)
|
for (const auto& nav_data : tow_data)
|
||||||
{
|
{
|
||||||
LOG(INFO) << "Galileo OSNMA: IOD_nav=0b" << std::uppercase
|
LOG(INFO) << "Galileo OSNMA: IOD_nav=0b" << std::uppercase
|
||||||
<< std::bitset<10>(nav_data.second.IOD_nav)
|
<< std::bitset<10>(nav_data.second.get_IOD_nav())
|
||||||
<< ", TOW_start="
|
<< ", TOW_start="
|
||||||
<< nav_data.second.get_tow_sf0()
|
<< nav_data.second.get_tow_sf0()
|
||||||
<< ", TOW_last="
|
<< ", TOW_last="
|
||||||
<< nav_data.second.get_last_received_TOW()
|
<< nav_data.second.get_last_received_TOW()
|
||||||
<< ", l_t="
|
<< ", l_t="
|
||||||
<< nav_data.second.verified_bits
|
<< nav_data.second.get_verified_bits()
|
||||||
<< ", PRNd="
|
<< ", PRNd="
|
||||||
<< nav_data.second.PRNd
|
<< nav_data.second.get_prn_d()
|
||||||
<< ", verified="
|
<< ", verified="
|
||||||
<< nav_data.second.verified;
|
<< nav_data.second.get_verified_status();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1413,20 +1413,15 @@ int32_t Galileo_Inav_Message::page_jk_decoder(const char* data_jk)
|
|||||||
*/
|
*/
|
||||||
OSNMA_msg Galileo_Inav_Message::get_osnma_msg()
|
OSNMA_msg Galileo_Inav_Message::get_osnma_msg()
|
||||||
{
|
{
|
||||||
// TODO - why PRN of word 4 is done separately?
|
|
||||||
nma_position_filled = std::array<int8_t, 15>{};
|
nma_position_filled = std::array<int8_t, 15>{};
|
||||||
// Fill TOW and WN
|
// Fill TOW and WN
|
||||||
nma_msg.WN_sf0 = WN_0;
|
nma_msg.WN_sf0 = WN_0;
|
||||||
int32_t TOW_sf0 = TOW_5 - 25; //- 24; // according to OS SIS ICD, TOW of word 5 is 25 seconds after Sf start TODO review
|
int32_t TOW_sf0 = TOW_5 - 25;
|
||||||
if (TOW_sf0 < 0)
|
if (TOW_sf0 < 0)
|
||||||
{
|
{
|
||||||
TOW_sf0 += 604800;
|
TOW_sf0 += 604800;
|
||||||
}
|
}
|
||||||
nma_msg.TOW_sf0 = static_cast<uint32_t>(TOW_sf0);
|
nma_msg.TOW_sf0 = static_cast<uint32_t>(TOW_sf0);
|
||||||
// get ephemeris, clock and iono correction datn and GST-UTC and GST-GPS converstion parameters (may be incomplete)
|
|
||||||
nma_msg.EphemerisData = get_ephemeris();
|
|
||||||
nma_msg.IonoData = get_iono();
|
|
||||||
nma_msg.UtcModelData = get_utc_model();
|
|
||||||
return nma_msg;
|
return nma_msg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,16 +48,9 @@ public:
|
|||||||
OSNMA_msg() = default;
|
OSNMA_msg() = default;
|
||||||
std::array<uint32_t, 15> mack{};
|
std::array<uint32_t, 15> mack{};
|
||||||
std::array<uint8_t, 15> hkroot{};
|
std::array<uint8_t, 15> hkroot{};
|
||||||
uint32_t PRN{};
|
uint32_t PRN{}; // PRN_a authentication data PRN
|
||||||
uint32_t WN_sf0{};
|
uint32_t WN_sf0{}; // Week number at the start of OSNMA subframe
|
||||||
uint32_t TOW_sf0{};
|
uint32_t TOW_sf0{}; // TOW at the start of OSNMA subframe
|
||||||
std::vector<uint8_t> EphemerisClockAndStatusData{}; // TODO _2 rename and substitute this
|
|
||||||
std::string EphemerisClockAndStatusData_2{};
|
|
||||||
std::vector<uint8_t> TimingData{};
|
|
||||||
std::string TimingData_2{};
|
|
||||||
Galileo_Ephemeris EphemerisData{};
|
|
||||||
Galileo_Iono IonoData{};
|
|
||||||
Galileo_Utc_Model UtcModelData{};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -35,25 +35,11 @@ bool OSNMA_NavData::add_nav_data(const std::string& nav_data)
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
std::string OSNMA_NavData::get_utc_data() const
|
std::string OSNMA_NavData::get_utc_data() const
|
||||||
{
|
{
|
||||||
return d_utc;
|
return d_utc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
std::string OSNMA_NavData::get_ephemeris_data() const
|
std::string OSNMA_NavData::get_ephemeris_data() const
|
||||||
{
|
{
|
||||||
return d_ephemeris_iono;
|
return d_ephemeris_iono;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates the last TOW the NavData bits were received.
|
|
||||||
* @param TOW
|
|
||||||
*/
|
|
||||||
void OSNMA_NavData::update_last_received_timestamp(uint32_t TOW)
|
|
||||||
{
|
|
||||||
d_last_received_TOW = TOW;
|
|
||||||
}
|
|
||||||
|
@ -137,30 +137,36 @@ class OSNMA_NavData
|
|||||||
public:
|
public:
|
||||||
OSNMA_NavData() : nav_data_id(id_counter++) {}
|
OSNMA_NavData() : nav_data_id(id_counter++) {}
|
||||||
const uint32_t nav_data_id;
|
const uint32_t nav_data_id;
|
||||||
|
|
||||||
std::string get_utc_data() const;
|
std::string get_utc_data() const;
|
||||||
std::string get_ephemeris_data() const;
|
std::string get_ephemeris_data() const;
|
||||||
|
uint32_t get_verified_bits() const { return verified_bits; }
|
||||||
|
uint32_t get_prn_d() const { return PRNd; }
|
||||||
|
uint32_t get_IOD_nav() const { return IOD_nav; }
|
||||||
uint32_t get_last_received_TOW() const { return d_last_received_TOW; }
|
uint32_t get_last_received_TOW() const { return d_last_received_TOW; }
|
||||||
uint32_t get_tow_sf0() const { return d_TOW_sf0; }
|
uint32_t get_tow_sf0() const { return d_TOW_sf0; }
|
||||||
|
bool have_this_bits(std::string nav_data);
|
||||||
|
bool get_verified_status() const { return verified; }
|
||||||
bool add_nav_data(const std::string& nav_data);
|
bool add_nav_data(const std::string& nav_data);
|
||||||
void set_tow_sf0(int value) { d_TOW_sf0 = value; }
|
void set_tow_sf0(int value) { d_TOW_sf0 = value; }
|
||||||
void set_ephemeris_data(std::string value) { d_ephemeris_iono = value; }
|
void set_ephemeris_data(std::string value) { d_ephemeris_iono = value; }
|
||||||
void set_utc_data(std::string value) { d_utc = value; }
|
void set_utc_data(std::string value) { d_utc = value; }
|
||||||
void update_last_received_timestamp(uint32_t TOW);
|
void update_last_received_timestamp(uint32_t TOW);
|
||||||
|
void set_prn_d(uint32_t value) { PRNd = value; }
|
||||||
uint32_t verified_bits{0};
|
void set_last_received_TOW(uint32_t TOW) { d_last_received_TOW = TOW; };
|
||||||
uint32_t IOD_nav{0};
|
void set_update_verified_bits(uint32_t morebits) { verified_bits += morebits; }
|
||||||
uint32_t PRNd{0};
|
void set_verified_status(bool value) { verified = value; }
|
||||||
uint32_t ADKD{};
|
void set_IOD_nav(uint32_t value) { IOD_nav = value; }
|
||||||
bool verified{false};
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
static uint32_t id_counter;
|
||||||
std::string d_ephemeris_iono{""};
|
std::string d_ephemeris_iono{""};
|
||||||
std::string d_utc{""};
|
std::string d_utc{""};
|
||||||
uint32_t d_TOW_sf0{0};
|
uint32_t d_TOW_sf0{0};
|
||||||
uint32_t d_last_received_TOW{0};
|
uint32_t d_last_received_TOW{0};
|
||||||
static uint32_t id_counter;
|
uint32_t PRNd{0};
|
||||||
|
uint32_t verified_bits{0};
|
||||||
|
uint32_t IOD_nav{0};
|
||||||
|
bool verified{false};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -112,6 +112,7 @@ endif()
|
|||||||
add_benchmark(benchmark_atan2 Gnuradio::runtime)
|
add_benchmark(benchmark_atan2 Gnuradio::runtime)
|
||||||
add_benchmark(benchmark_copy)
|
add_benchmark(benchmark_copy)
|
||||||
add_benchmark(benchmark_crypto core_libs Boost::headers ${EXTRA_BENCHMARK_DEPENDENCIES})
|
add_benchmark(benchmark_crypto core_libs Boost::headers ${EXTRA_BENCHMARK_DEPENDENCIES})
|
||||||
|
add_benchmark(benchmark_osnma core_libs Boost::headers ${EXTRA_BENCHMARK_DEPENDENCIES})
|
||||||
add_benchmark(benchmark_detector core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES})
|
add_benchmark(benchmark_detector core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES})
|
||||||
add_benchmark(benchmark_preamble core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES})
|
add_benchmark(benchmark_preamble core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES})
|
||||||
add_benchmark(benchmark_reed_solomon core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES})
|
add_benchmark(benchmark_reed_solomon core_system_parameters ${EXTRA_BENCHMARK_DEPENDENCIES})
|
||||||
|
126
src/tests/benchmarks/benchmark_osnma.cc
Normal file
126
src/tests/benchmarks/benchmark_osnma.cc
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
/*!
|
||||||
|
* \file benchmark_osnma.cc
|
||||||
|
* \brief Benchmarks for osnma functions
|
||||||
|
* \author Carles Fernandez-Prades, 2024. cfernandez(at)cttc.es
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* -----------------------------------------------------------------------------
|
||||||
|
*
|
||||||
|
* GNSS-SDR is a Global Navigation Satellite System software-defined receiver.
|
||||||
|
* This file is part of GNSS-SDR.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2024 (see AUTHORS file for a list of contributors)
|
||||||
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
*
|
||||||
|
* -----------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
#include "osnma_msg_receiver.h"
|
||||||
|
#include "Galileo_OSNMA.h"
|
||||||
|
#include "gnss_crypto.h"
|
||||||
|
#include "osnma_helper.h"
|
||||||
|
#include <benchmark/benchmark.h>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
|
void bm_verify_public_key(benchmark::State& state)
|
||||||
|
{
|
||||||
|
osnma_msg_receiver_sptr osnma = osnma_msg_receiver_make(CRTFILE_DEFAULT, MERKLEFILE_DEFAULT);
|
||||||
|
Osnma_Helper helper;
|
||||||
|
osnma->set_merkle_root(helper.convert_from_hex_string("A10C440F3AA62453526DB4AF76DF8D9410D35D8277397D7053C700D192702B0D"));
|
||||||
|
DSM_PKR_message dsm_pkr_message;
|
||||||
|
dsm_pkr_message.npkt = 0x01;
|
||||||
|
dsm_pkr_message.npktid = 0x2;
|
||||||
|
dsm_pkr_message.mid = 0x01;
|
||||||
|
std::vector<uint8_t> vec = helper.convert_from_hex_string(
|
||||||
|
"7CBE05D9970CFC9E22D0A43A340EF557624453A2E821AADEAC989C405D78BA06"
|
||||||
|
"956380BAB0D2C939EC6208151040CCFFCF1FB7156178FD1255BA0AECAAA253F7"
|
||||||
|
"407B6C5DD4DF059FF8789474061301E1C34881DB7A367A913A3674300E21EAB1"
|
||||||
|
"24EF508389B7D446C3E2ECE8D459FBBD3239A794906F5B1F92469C640164FD87");
|
||||||
|
std::copy(vec.begin(), vec.end(), dsm_pkr_message.itn.begin());
|
||||||
|
dsm_pkr_message.npk = helper.convert_from_hex_string("0303B2CE64BC207BDD8BC4DF859187FCB686320D63FFA091410FC158FBB77980EA");
|
||||||
|
|
||||||
|
while (state.KeepRunning())
|
||||||
|
{
|
||||||
|
osnma->verify_dsm_pkr(dsm_pkr_message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void bm_verify_tesla_key(benchmark::State& state)
|
||||||
|
{
|
||||||
|
// osnma_msg_receiver_sptr osnma = osnma_msg_receiver_make(CRTFILE_DEFAULT, MERKLEFILE_DEFAULT);
|
||||||
|
// Osnma_Helper helper;
|
||||||
|
// osnma->d_tesla_key_verified = false;
|
||||||
|
// osnma->d_osnma_data.d_dsm_kroot_message.kroot = {0x5B, 0xF8, 0xC9, 0xCB, 0xFC, 0xF7, 0x04, 0x22, 0x08, 0x14, 0x75, 0xFD, 0x44, 0x5D, 0xF0, 0xFF}; // Kroot, TOW 345570 GST_0 - 30
|
||||||
|
// osnma->d_osnma_data.d_dsm_kroot_message.ks = 4; // TABLE 10 --> 128 bits
|
||||||
|
// osnma->d_osnma_data.d_dsm_kroot_message.alpha = 0x610BDF26D77B;
|
||||||
|
// osnma->d_GST_SIS = (1248 & 0x00000FFF) << 20 | (345630 & 0x000FFFFF);
|
||||||
|
// osnma->d_GST_0 = ((1248 & 0x00000FFF) << 20 | (345600 & 0x000FFFFF)); // applicable time (GST_Kroot + 30)
|
||||||
|
// osnma->d_GST_Sf = osnma->d_GST_0 + 30 * std::floor((osnma->d_GST_SIS - osnma->d_GST_0) / 30); // Eq. 3 R.G.
|
||||||
|
//
|
||||||
|
// osnma->d_tesla_keys.insert((std::pair<uint32_t, std::vector<uint8_t>>(345600, {0xEF, 0xF9, 0x99, 0x04, 0x0E, 0x19, 0xB5, 0x70, 0x83, 0x50, 0x60, 0xBE, 0xBD, 0x23, 0xED, 0x92}))); // K1, not needed, just for reference.
|
||||||
|
// std::vector<uint8_t> key = {0x2D, 0xC3, 0xA3, 0xCD, 0xB1, 0x17, 0xFA, 0xAD, 0xB8, 0x3B, 0x5F, 0x0B, 0x6F, 0xEA, 0x88, 0xEB}; // K2
|
||||||
|
// uint32_t TOW = 345630;
|
||||||
|
//
|
||||||
|
// while (state.KeepRunning())
|
||||||
|
// {
|
||||||
|
// osnma->verify_tesla_key(key, TOW);
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
void bm_verify_tesla_key_24h(benchmark::State& state)
|
||||||
|
{
|
||||||
|
// TODO - copy of normal tesla verification but with 2800 steps instead of only two (max Kroot time is 1 day as per spec.)
|
||||||
|
}
|
||||||
|
|
||||||
|
void bm_tag_verification(benchmark::State& state)
|
||||||
|
{
|
||||||
|
// osnma_msg_receiver_sptr osnma = osnma_msg_receiver_make(CRTFILE_DEFAULT, MERKLEFILE_DEFAULT);
|
||||||
|
// Osnma_Helper helper;
|
||||||
|
// uint32_t TOW_Tag0 = 345660;
|
||||||
|
// uint32_t TOW_NavData = TOW_Tag0 - 30;
|
||||||
|
// uint32_t TOW_Key_Tag0 = TOW_Tag0 + 30;
|
||||||
|
// uint32_t WN = 1248;
|
||||||
|
// uint32_t PRNa = 2;
|
||||||
|
// uint8_t CTR = 1;
|
||||||
|
//
|
||||||
|
// osnma->d_osnma_data.d_dsm_kroot_message.ts = 9; // 40 bit
|
||||||
|
// osnma->d_tesla_keys[TOW_Key_Tag0] = {0x69, 0xC0, 0x0A, 0xA7, 0x36, 0x42, 0x37, 0xA6, 0x5E, 0xBF, 0x00, 0x6A, 0xD8, 0xDD, 0xBC, 0x73}; // K4
|
||||||
|
// osnma->d_osnma_data.d_dsm_kroot_message.mf = 0;
|
||||||
|
// osnma->d_nav_data_manager->add_navigation_data(
|
||||||
|
// "000011101001011001000100000101000111010110100100100101100000000000"
|
||||||
|
// "011101101011001111101110101010000001010000011011111100000011101011"
|
||||||
|
// "011100101101011010101011011011001001110111101011110110111111001111"
|
||||||
|
// "001000011111101110011000111111110111111010000011101011111111110000"
|
||||||
|
// "110111000000100000001110110000110110001110000100001110101100010100"
|
||||||
|
// "110100010001000110001110011010110000111010000010000000000001101000"
|
||||||
|
// "000000000011100101100100010000000000000110110100110001111100000000"
|
||||||
|
// "000000100110100000000101010010100000001011000010001001100000011111"
|
||||||
|
// "110111111111000000000",
|
||||||
|
// PRNa, TOW_NavData);
|
||||||
|
// osnma->d_osnma_data.d_nma_header.nmas = 0b10;
|
||||||
|
//
|
||||||
|
// MACK_tag_and_info MTI;
|
||||||
|
// MTI.tag = static_cast<uint64_t>(0xE37BC4F858);
|
||||||
|
// MTI.tag_info.PRN_d = 0x02;
|
||||||
|
// MTI.tag_info.ADKD = 0x00;
|
||||||
|
// MTI.tag_info.cop = 0x0F;
|
||||||
|
// Tag t0(MTI, TOW_Tag0, WN, PRNa, CTR);
|
||||||
|
//
|
||||||
|
// while (state.KeepRunning())
|
||||||
|
// {
|
||||||
|
// osnma->verify_tag(t0);
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
void bm_kroot_verification(benchmark::State& state)
|
||||||
|
{
|
||||||
|
// TODO - this is essentially the signature verification, maybe could implement it for comparison purposes
|
||||||
|
}
|
||||||
|
|
||||||
|
BENCHMARK(bm_verify_public_key);
|
||||||
|
BENCHMARK(bm_verify_tesla_key);
|
||||||
|
BENCHMARK(bm_verify_tesla_key_24h);
|
||||||
|
BENCHMARK(bm_tag_verification);
|
||||||
|
BENCHMARK(bm_kroot_verification);
|
||||||
|
|
||||||
|
|
||||||
|
BENCHMARK_MAIN();
|
@ -85,6 +85,12 @@ TEST_F(OsnmaTestVectors, NominalTestConf1)
|
|||||||
ASSERT_TRUE(result);
|
ASSERT_TRUE(result);
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
|
LOG(INFO) << "Successful tags count= " << osnma->d_count_successful_tags;
|
||||||
|
LOG(INFO) << "Failed tags count= " << osnma->d_count_failed_tags;
|
||||||
|
LOG(INFO) << "Unverified tags count= " << osnma->d_tags_awaiting_verify.size();
|
||||||
|
LOG(INFO) << "Failed Kroot count= " << osnma->d_count_failed_Kroot;
|
||||||
|
LOG(INFO) << "Failed PK count= " << osnma->d_count_failed_pubKey;
|
||||||
|
LOG(INFO) << "Failed MACSEQ count= " << osnma->d_count_failed_macseq;
|
||||||
ASSERT_EQ(osnma->d_count_failed_tags, 0);
|
ASSERT_EQ(osnma->d_count_failed_tags, 0);
|
||||||
ASSERT_EQ(osnma->d_count_failed_Kroot, 0);
|
ASSERT_EQ(osnma->d_count_failed_Kroot, 0);
|
||||||
ASSERT_EQ(osnma->d_count_failed_pubKey, 0);
|
ASSERT_EQ(osnma->d_count_failed_pubKey, 0);
|
||||||
@ -113,6 +119,12 @@ TEST_F(OsnmaTestVectors, NominalTestConf2)
|
|||||||
ASSERT_TRUE(result);
|
ASSERT_TRUE(result);
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
|
LOG(INFO) << "Successful tags count= " << osnma->d_count_successful_tags;
|
||||||
|
LOG(INFO) << "Failed tags count= " << osnma->d_count_failed_tags;
|
||||||
|
LOG(INFO) << "Unverified tags count= " << osnma->d_tags_awaiting_verify.size();
|
||||||
|
LOG(INFO) << "Failed Kroot count= " << osnma->d_count_failed_Kroot;
|
||||||
|
LOG(INFO) << "Failed PK count= " << osnma->d_count_failed_pubKey;
|
||||||
|
LOG(INFO) << "Failed MACSEQ count= " << osnma->d_count_failed_macseq;
|
||||||
ASSERT_EQ(osnma->d_count_failed_tags, 0);
|
ASSERT_EQ(osnma->d_count_failed_tags, 0);
|
||||||
ASSERT_EQ(osnma->d_count_failed_Kroot, 0);
|
ASSERT_EQ(osnma->d_count_failed_Kroot, 0);
|
||||||
ASSERT_EQ(osnma->d_count_failed_pubKey, 0);
|
ASSERT_EQ(osnma->d_count_failed_pubKey, 0);
|
||||||
@ -145,6 +157,12 @@ TEST_F(OsnmaTestVectors, PublicKeyRenewal)
|
|||||||
ASSERT_TRUE(result);
|
ASSERT_TRUE(result);
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
|
LOG(INFO) << "Successful tags count= " << osnma->d_count_successful_tags;
|
||||||
|
LOG(INFO) << "Failed tags count= " << osnma->d_count_failed_tags;
|
||||||
|
LOG(INFO) << "Unverified tags count= " << osnma->d_tags_awaiting_verify.size();
|
||||||
|
LOG(INFO) << "Failed Kroot count= " << osnma->d_count_failed_Kroot;
|
||||||
|
LOG(INFO) << "Failed PK count= " << osnma->d_count_failed_pubKey;
|
||||||
|
LOG(INFO) << "Failed MACSEQ count= " << osnma->d_count_failed_macseq;
|
||||||
ASSERT_EQ(osnma->d_count_failed_tags, 0);
|
ASSERT_EQ(osnma->d_count_failed_tags, 0);
|
||||||
ASSERT_EQ(osnma->d_count_failed_Kroot, 0);
|
ASSERT_EQ(osnma->d_count_failed_Kroot, 0);
|
||||||
ASSERT_EQ(osnma->d_count_failed_pubKey, 0);
|
ASSERT_EQ(osnma->d_count_failed_pubKey, 0);
|
||||||
@ -176,6 +194,12 @@ TEST_F(OsnmaTestVectors, PublicKeyRevocation)
|
|||||||
ASSERT_TRUE(result);
|
ASSERT_TRUE(result);
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
|
LOG(INFO) << "Successful tags count= " << osnma->d_count_successful_tags;
|
||||||
|
LOG(INFO) << "Failed tags count= " << osnma->d_count_failed_tags;
|
||||||
|
LOG(INFO) << "Unverified tags count= " << osnma->d_tags_awaiting_verify.size();
|
||||||
|
LOG(INFO) << "Failed Kroot count= " << osnma->d_count_failed_Kroot;
|
||||||
|
LOG(INFO) << "Failed PK count= " << osnma->d_count_failed_pubKey;
|
||||||
|
LOG(INFO) << "Failed MACSEQ count= " << osnma->d_count_failed_macseq;
|
||||||
ASSERT_EQ(osnma->d_count_failed_tags, 0);
|
ASSERT_EQ(osnma->d_count_failed_tags, 0);
|
||||||
ASSERT_EQ(osnma->d_count_failed_Kroot, 0);
|
ASSERT_EQ(osnma->d_count_failed_Kroot, 0);
|
||||||
ASSERT_EQ(osnma->d_count_failed_pubKey, 0);
|
ASSERT_EQ(osnma->d_count_failed_pubKey, 0);
|
||||||
|
Loading…
Reference in New Issue
Block a user