mirror of https://github.com/ArduPilot/ardupilot
GCS_MAVLink: provide signing streams and accept_unsigned callback
This commit is contained in:
parent
a103e70460
commit
24eb6afbe9
|
@ -309,6 +309,8 @@ private:
|
||||||
static DataFlash_Class *dataflash_p;
|
static DataFlash_Class *dataflash_p;
|
||||||
|
|
||||||
mavlink_signing_t signing;
|
mavlink_signing_t signing;
|
||||||
|
static mavlink_signing_streams_t signing_streams;
|
||||||
|
|
||||||
static StorageAccess _signing_storage;
|
static StorageAccess _signing_storage;
|
||||||
|
|
||||||
// a vehicle can optionally snoop on messages for other systems
|
// a vehicle can optionally snoop on messages for other systems
|
||||||
|
|
|
@ -34,6 +34,9 @@ struct SigningKey {
|
||||||
uint8_t secret_key[32];
|
uint8_t secret_key[32];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// shared signing_streams structure
|
||||||
|
mavlink_signing_streams_t GCS_MAVLINK::signing_streams;
|
||||||
|
|
||||||
bool GCS_MAVLINK::signing_key_save(const struct SigningKey &key)
|
bool GCS_MAVLINK::signing_key_save(const struct SigningKey &key)
|
||||||
{
|
{
|
||||||
if (_signing_storage.size() < sizeof(key)) {
|
if (_signing_storage.size() < sizeof(key)) {
|
||||||
|
@ -74,6 +77,36 @@ void GCS_MAVLINK::handle_setup_signing(const mavlink_message_t *msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
callback to accept unsigned (or incorrectly signed) packets
|
||||||
|
*/
|
||||||
|
extern "C" {
|
||||||
|
|
||||||
|
static const struct {
|
||||||
|
uint8_t dialect;
|
||||||
|
uint16_t msgId;
|
||||||
|
} accept_list[] = {
|
||||||
|
{ MAVLINK_MSG_ID_RADIO_STATUS_TUPLE }
|
||||||
|
};
|
||||||
|
|
||||||
|
static bool accept_unsigned_callback(const mavlink_status_t *status,
|
||||||
|
uint8_t dialect, uint16_t msgId)
|
||||||
|
{
|
||||||
|
if (status == mavlink_get_channel_status(MAVLINK_COMM_0)) {
|
||||||
|
// always accept channel 0, assumed to be secure channel. This
|
||||||
|
// is USB on PX4 boards
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
for (uint8_t i=0; i<ARRAY_SIZE(accept_list); i++) {
|
||||||
|
if (accept_list[i].dialect == dialect &&
|
||||||
|
accept_list[i].msgId == msgId) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
load signing key
|
load signing key
|
||||||
*/
|
*/
|
||||||
|
@ -93,6 +126,8 @@ void GCS_MAVLINK::load_signing_key(void)
|
||||||
signing.link_id = (uint8_t)chan;
|
signing.link_id = (uint8_t)chan;
|
||||||
signing.timestamp = 1;
|
signing.timestamp = 1;
|
||||||
signing.flags = MAVLINK_SIGNING_FLAG_SIGN_OUTGOING;
|
signing.flags = MAVLINK_SIGNING_FLAG_SIGN_OUTGOING;
|
||||||
|
signing.accept_unsigned_callback = accept_unsigned_callback;
|
||||||
|
|
||||||
status->signing = &signing;
|
status->signing = &signing;
|
||||||
|
status->signing_streams = &signing_streams;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue