ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-06-20 08:13:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix LoRaWAN 1.1 downlink fopts encryption.

Browse Source
This commit is contained in:
Orne Brocaar
2022-08-09 16:33:58 +01:00
parent 2b1bf3b96f
commit 7868629533
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
chirpstack/src/downlink/data.rs
View File

@ -557,6 +557,19 @@ impl Data {
} }
} }
// Encrypt f_opts mac-commands (LoRaWAN 1.1)
if !self
.device_session
.mac_version()
.to_string()
.starts_with("1.0")
{
phy.encrypt_f_opts(&lrwn::AES128Key::from_slice(
&self.device_session.nwk_s_enc_key,
)?)
.context("Encrypt f_opts")?;
}
// Set MIC. // Set MIC.
// If this is an ACK, then FCntUp has already been incremented by one. If // If this is an ACK, then FCntUp has already been incremented by one. If
// this is not an ACK, then DownlinkDataMIC will zero out ConfFCnt. // this is not an ACK, then DownlinkDataMIC will zero out ConfFCnt.

16
chirpstack/src/test/class_a_test.rs
View File

@ -2393,14 +2393,14 @@ async fn test_lorawan_11_mac_commands() {
..Default::default() ..Default::default()
}, },
f_opts: lrwn::MACCommandSet::new(vec![lrwn::MACCommand::Raw(vec![ f_opts: lrwn::MACCommandSet::new(vec![lrwn::MACCommand::Raw(vec![
2, 20, 1, 85, 88, 242,
])]), ])]),
..Default::default() ..Default::default()
}, },
f_port: None, f_port: None,
frm_payload: None, frm_payload: None,
}), }),
mic: Some([119, 74, 235, 162]), mic: Some([124, 101, 247, 223]),
}, },
lrwn::PhyPayload { lrwn::PhyPayload {
mhdr: lrwn::MHDR { mhdr: lrwn::MHDR {
@ -2417,14 +2417,14 @@ async fn test_lorawan_11_mac_commands() {
..Default::default() ..Default::default()
}, },
f_opts: lrwn::MACCommandSet::new(vec![lrwn::MACCommand::Raw(vec![ f_opts: lrwn::MACCommandSet::new(vec![lrwn::MACCommand::Raw(vec![
2, 20, 1, 85, 88, 242,
])]), ])]),
..Default::default() ..Default::default()
}, },
f_port: None, f_port: None,
frm_payload: None, frm_payload: None,
}), }),
mic: Some([119, 74, 235, 162]), mic: Some([124, 101, 247, 223]),
}, },
]), ]),
], ],
@ -3329,14 +3329,14 @@ async fn test_lorawan_11_device_queue() {
..Default::default() ..Default::default()
}, },
f_opts: lrwn::MACCommandSet::new(vec![ f_opts: lrwn::MACCommandSet::new(vec![
lrwn::MACCommand::Raw(vec![2,20,1]), lrwn::MACCommand::Raw(vec![85, 88, 242]),
]), ]),
..Default::default() ..Default::default()
}, },
f_port: None, f_port: None,
frm_payload: None, frm_payload: None,
}), }),
mic: Some([183, 102, 104, 194]), mic: Some([227, 104, 50, 163]),
}, },
lrwn::PhyPayload { lrwn::PhyPayload {
mhdr: lrwn::MHDR { mhdr: lrwn::MHDR {
@ -3355,14 +3355,14 @@ async fn test_lorawan_11_device_queue() {
..Default::default() ..Default::default()
}, },
f_opts: lrwn::MACCommandSet::new(vec![ f_opts: lrwn::MACCommandSet::new(vec![
lrwn::MACCommand::Raw(vec![2,20,1]), lrwn::MACCommand::Raw(vec![85, 88, 242]),
]), ]),
..Default::default() ..Default::default()
}, },
f_port: None, f_port: None,
frm_payload: None, frm_payload: None,
}), }),
mic: Some([183, 102, 104, 194]), mic: Some([227, 104, 50, 163]),
}, },
]), ]),
], ],