mirror of
https://github.com/chirpstack/chirpstack.git
synced 2025-04-30 16:09:42 +00:00
Fix validate_mic clause.
This commit is contained in:
parent
11fdd33139
commit
c9bdea87f1
@ -328,6 +328,9 @@ async fn _handle_pr_start_req_data(
|
|||||||
let kek_label = roaming::get_passive_roaming_kek_label(sender_id)?;
|
let kek_label = roaming::get_passive_roaming_kek_label(sender_id)?;
|
||||||
let ds = d.get_device_session()?;
|
let ds = d.get_device_session()?;
|
||||||
|
|
||||||
|
println!("TEST: {}", ds.mac_version());
|
||||||
|
|
||||||
|
// Only in case validate_mic=true and LoRaWAN=1.0.x.
|
||||||
let nwk_s_key = if validate_mic && ds.mac_version().to_string().starts_with("1.0") {
|
let nwk_s_key = if validate_mic && ds.mac_version().to_string().starts_with("1.0") {
|
||||||
Some(keywrap::wrap(
|
Some(keywrap::wrap(
|
||||||
&kek_label,
|
&kek_label,
|
||||||
@ -337,13 +340,14 @@ async fn _handle_pr_start_req_data(
|
|||||||
None
|
None
|
||||||
};
|
};
|
||||||
|
|
||||||
let f_nwk_s_int_key = if validate_mic && ds.mac_version().to_string().starts_with("1.0") {
|
// Only in case validate_mic=true and LoRaWAN=1.1.x.
|
||||||
None
|
let f_nwk_s_int_key = if validate_mic && ds.mac_version().to_string().starts_with("1.1") {
|
||||||
} else {
|
|
||||||
Some(keywrap::wrap(
|
Some(keywrap::wrap(
|
||||||
&kek_label,
|
&kek_label,
|
||||||
AES128Key::from_slice(&ds.f_nwk_s_int_key)?,
|
AES128Key::from_slice(&ds.f_nwk_s_int_key)?,
|
||||||
)?)
|
)?)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
};
|
};
|
||||||
|
|
||||||
// In case of stateless, the payload is directly handled
|
// In case of stateless, the payload is directly handled
|
||||||
|
Loading…
x
Reference in New Issue
Block a user