Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: support disabling signing with zero key

This commit is contained in:
Andrew Tridgell 2016-01-22 07:41:35 +11:00
parent c96ed2b4c6
commit 4ba09671a4
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/GCS_MAVLink/GCS_Signing.cpp
View File

@ -130,8 +130,28 @@ void GCS_MAVLINK::load_signing_key(void)
signing.flags = MAVLINK_SIGNING_FLAG_SIGN_OUTGOING;
signing.accept_unsigned_callback = accept_unsigned_callback;
status->signing = &signing;
status->signing_streams = &signing_streams;
// if timestamp and key are all zero then we disable signing
bool all_zero = (signing.timestamp == 0);
for (uint8_t i=0; i<sizeof(key.secret_key); i++) {
if (signing.secret_key[i] != 0) {
all_zero = false;
}
}
// enable signing on all channels
for (uint8_t i=0; i<MAVLINK_COMM_NUM_BUFFERS; i++) {
mavlink_status_t *cstatus = mavlink_get_channel_status((mavlink_channel_t)(MAVLINK_COMM_0 + i));
if (cstatus != NULL) {
if (all_zero) {
// disable signing
cstatus->signing = NULL;
cstatus->signing_streams = NULL;
} else {
cstatus->signing = &signing;
cstatus->signing_streams = &signing_streams;
}
}
}
}
/*