ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12762 from rvolosatovs/fix/lorawan-1.1 

Various LoRaWAN 1.1 fixes
feature-lorawan-1-1
Antti Kauppila 2020-04-13 07:36:26 +03:00 committed by GitHub
parent d60bbd60d0 e90fc00176
commit d98f42f057
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 61 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
UNITTESTS/features/lorawan/loramaccrypto/Test_LoRaMacCrypto.cpp
View File

@ -52,35 +52,35 @@ TEST_F(Test_LoRaMacCrypto, constructor)
TEST_F(Test_LoRaMacCrypto, compute_mic) TEST_F(Test_LoRaMacCrypto, compute_mic)
{ {
EXPECT_TRUE(MBEDTLS_ERR_CIPHER_ALLOC_FAILED == object->compute_mic(NULL, 0, 0, 0, 0, 0, NULL)); EXPECT_TRUE(MBEDTLS_ERR_CIPHER_ALLOC_FAILED == object->compute_mic(NULL, 0, 0, 0, 0, 0, 0, NULL));
mbedtls_cipher_info_t info; mbedtls_cipher_info_t info;
cipher_stub.info_value = &info; cipher_stub.info_value = &info;
cipher_stub.int_zero_counter = 0; cipher_stub.int_zero_counter = 0;
cipher_stub.int_value = -1; cipher_stub.int_value = -1;
EXPECT_TRUE(-1 == object->compute_mic(NULL, 0, 0, 0, 0, 0, NULL)); EXPECT_TRUE(-1 == object->compute_mic(NULL, 0, 0, 0, 0, 0, 0, NULL));
cipher_stub.int_value = 0; cipher_stub.int_value = 0;
cmac_stub.int_zero_counter = 0; cmac_stub.int_zero_counter = 0;
cmac_stub.int_value = -1; cmac_stub.int_value = -1;
EXPECT_TRUE(-1 == object->compute_mic(NULL, 0, 0, 0, 0, 0, NULL)); EXPECT_TRUE(-1 == object->compute_mic(NULL, 0, 0, 0, 0, 0, 0, NULL));
cmac_stub.int_zero_counter = 1; cmac_stub.int_zero_counter = 1;
cmac_stub.int_value = -1; cmac_stub.int_value = -1;
EXPECT_TRUE(-1 == object->compute_mic(NULL, 0, 0, 0, 0, 0, NULL)); EXPECT_TRUE(-1 == object->compute_mic(NULL, 0, 0, 0, 0, 0, 0, NULL));
cmac_stub.int_zero_counter = 2; cmac_stub.int_zero_counter = 2;
cmac_stub.int_value = -1; cmac_stub.int_value = -1;
EXPECT_TRUE(-1 == object->compute_mic(NULL, 0, 0, 0, 0, 0, NULL)); EXPECT_TRUE(-1 == object->compute_mic(NULL, 0, 0, 0, 0, 0, 0, NULL));
cmac_stub.int_zero_counter = 3; cmac_stub.int_zero_counter = 3;
cmac_stub.int_value = -1; cmac_stub.int_value = -1;
EXPECT_TRUE(-1 == object->compute_mic(NULL, 0, 0, 0, 0, 0, NULL)); EXPECT_TRUE(-1 == object->compute_mic(NULL, 0, 0, 0, 0, 0, 0, NULL));
uint32_t mic[16]; uint32_t mic[16];
cmac_stub.int_zero_counter = 3; cmac_stub.int_zero_counter = 3;
cmac_stub.int_value = 0; cmac_stub.int_value = 0;
EXPECT_TRUE(0 == object->compute_mic(NULL, 0, 0, 0, 0, 0, mic)); EXPECT_TRUE(0 == object->compute_mic(NULL, 0, 0, 0, 0, 0, 0, mic));
} }

2
UNITTESTS/stubs/LoRaMacCrypto_stub.cpp
View File

@ -42,7 +42,7 @@ lorawan_status_t LoRaMacCrypto::set_keys(uint8_t *, uint8_t *, uint8_t *, uint8_
} }
int LoRaMacCrypto::compute_mic(const uint8_t *, uint16_t, uint32_t, uint32_t, int LoRaMacCrypto::compute_mic(const uint8_t *, uint16_t, uint32_t, uint32_t,
uint8_t, uint32_t, uint32_t *) uint8_t, uint32_t, uint8_t, uint32_t *)
{ {
return LoRaMacCrypto_stub::int_table[LoRaMacCrypto_stub::int_table_idx_value++]; return LoRaMacCrypto_stub::int_table[LoRaMacCrypto_stub::int_table_idx_value++];
} }

1
features/lorawan/LoRaWANStack.cpp
View File

@ -555,7 +555,6 @@ lorawan_status_t LoRaWANStack::set_device_class(const device_class_t &device_cla
if (_loramac.get_device_class() != device_class) { if (_loramac.get_device_class() != device_class) {
if ((_loramac.get_server_type() == LW1_1) && (device_class != CLASS_B)) { if ((_loramac.get_server_type() == LW1_1) && (device_class != CLASS_B)) {
_new_class_type = device_class; _new_class_type = device_class;
set_device_mode_indication();
_device_mode_ind_needed = true; _device_mode_ind_needed = true;
_device_mode_ind_ongoing = true; _device_mode_ind_ongoing = true;
} else { } else {

6
features/lorawan/lorastack/mac/LoRaMac.cpp
View File

@ -422,7 +422,7 @@ bool LoRaMac::message_integrity_check(const uint8_t *const payload,
_lora_crypto.compute_mic(payload, size - LORAMAC_MFR_LEN, _lora_crypto.compute_mic(payload, size - LORAMAC_MFR_LEN,
args, address, DOWN_LINK, *downlink_counter, args, address, DOWN_LINK, *downlink_counter,
&mic); 0, &mic);
if (mic_rx != mic) { if (mic_rx != mic) {
_mcps_indication.status = LORAMAC_EVENT_INFO_STATUS_MIC_FAIL; _mcps_indication.status = LORAMAC_EVENT_INFO_STATUS_MIC_FAIL;
@ -2456,7 +2456,7 @@ lorawan_status_t LoRaMac::calculate_userdata_mic()
if (0 != _lora_crypto.compute_mic(_params.tx_buffer, _params.tx_buffer_len, if (0 != _lora_crypto.compute_mic(_params.tx_buffer, _params.tx_buffer_len,
args, _params.dev_addr, UP_LINK, args, _params.dev_addr, UP_LINK,
_params.ul_frame_counter, &mic)) { _params.ul_frame_counter, 0, &mic)) {
status = LORAWAN_STATUS_CRYPTO_FAIL; status = LORAWAN_STATUS_CRYPTO_FAIL;
} }
@ -2469,7 +2469,7 @@ lorawan_status_t LoRaMac::calculate_userdata_mic()
if (0 != _lora_crypto.compute_mic(_params.tx_buffer, _params.tx_buffer_len, if (0 != _lora_crypto.compute_mic(_params.tx_buffer, _params.tx_buffer_len,
args, _params.dev_addr, UP_LINK, args, _params.dev_addr, UP_LINK,
_params.ul_frame_counter, &mic2)) { _params.ul_frame_counter, 1, &mic2)) {
status = LORAWAN_STATUS_CRYPTO_FAIL; status = LORAWAN_STATUS_CRYPTO_FAIL;
} }

2
features/lorawan/lorastack/mac/LoRaMacCommand.cpp
View File

@ -69,6 +69,7 @@ void LoRaMacCommand::parse_mac_commands_to_repeat()
for (i = 0; i < mac_cmd_buf_idx; i++) { for (i = 0; i < mac_cmd_buf_idx; i++) {
switch (mac_cmd_buffer[i]) { switch (mac_cmd_buffer[i]) {
// STICKY // STICKY
case MOTE_DEVICE_MODE_IND:
case MOTE_MAC_RESET_IND: case MOTE_MAC_RESET_IND:
case MOTE_MAC_RX_PARAM_SETUP_ANS: case MOTE_MAC_RX_PARAM_SETUP_ANS:
case MOTE_MAC_DL_CHANNEL_ANS: case MOTE_MAC_DL_CHANNEL_ANS:
@ -86,6 +87,7 @@ void LoRaMacCommand::parse_mac_commands_to_repeat()
i += 2; i += 2;
break; break;
} }
case MOTE_MAC_BEACON_FREQ_ANS:
case MOTE_MAC_LINK_ADR_ANS: case MOTE_MAC_LINK_ADR_ANS:
case MOTE_MAC_NEW_CHANNEL_ANS: case MOTE_MAC_NEW_CHANNEL_ANS:
case MOTE_MAC_REJOIN_PARAM_SETUP_ANS: case MOTE_MAC_REJOIN_PARAM_SETUP_ANS:

67
features/lorawan/lorastack/mac/LoRaMacCrypto.cpp
View File

@ -82,40 +82,65 @@ lorawan_status_t LoRaMacCrypto::set_keys(uint8_t *nwk_key, uint8_t *app_key, uin
int LoRaMacCrypto::compute_mic(const uint8_t *buffer, uint16_t size, int LoRaMacCrypto::compute_mic(const uint8_t *buffer, uint16_t size,
uint32_t args, uint32_t address, uint32_t args, uint32_t address,
uint8_t dir, uint32_t seq_counter, uint8_t dir, uint32_t seq_counter,
uint32_t *mic) uint8_t block, uint32_t *mic)
{ {
uint8_t computed_mic[16] = {}; uint8_t computed_mic[16] = {};
uint8_t mic_block_b0[16] = {}; uint8_t mic_block[16] = {};
int ret = 0; int ret = 0;
//In case of LW_1_0_2 this is same as nwk_skey uint8_t *key;
uint8_t *key = _keys.snwk_sintkey; switch (dir) {
case 0:
switch (block) {
case 0:
key = _keys.nwk_skey;
break;
case 1:
key = _keys.snwk_sintkey;
break;
default:
MBED_ASSERT(false);
break;
}
break;
case 1:
MBED_ASSERT(block == 0);
key = _keys.snwk_sintkey;
break;
default:
MBED_ASSERT(false);
break;
}
//TODO: handle multicast based on address //TODO: handle multicast based on address
//_dev_addr //_dev_addr
mic_block_b0[0] = 0x49; mic_block[0] = 0x49;
mic_block_b0[1] = (args) & 0xFF; mic_block[1] = (args) & 0xFF;
mic_block_b0[2] = (args >> 8) & 0xFF; mic_block[2] = (args >> 8) & 0xFF;
mic_block_b0[3] = (args >> 16) & 0xFF; mic_block[3] = (args >> 16) & 0xFF;
mic_block_b0[4] = (args >> 24) & 0xFF; mic_block[4] = (args >> 24) & 0xFF;
mic_block_b0[5] = dir; mic_block[5] = dir;
mic_block_b0[6] = (address) & 0xFF; mic_block[6] = (address) & 0xFF;
mic_block_b0[7] = (address >> 8) & 0xFF; mic_block[7] = (address >> 8) & 0xFF;
mic_block_b0[8] = (address >> 16) & 0xFF; mic_block[8] = (address >> 16) & 0xFF;
mic_block_b0[9] = (address >> 24) & 0xFF; mic_block[9] = (address >> 24) & 0xFF;
mic_block_b0[10] = (seq_counter) & 0xFF; mic_block[10] = (seq_counter) & 0xFF;
mic_block_b0[11] = (seq_counter >> 8) & 0xFF; mic_block[11] = (seq_counter >> 8) & 0xFF;
mic_block_b0[12] = (seq_counter >> 16) & 0xFF; mic_block[12] = (seq_counter >> 16) & 0xFF;
mic_block_b0[13] = (seq_counter >> 24) & 0xFF; mic_block[13] = (seq_counter >> 24) & 0xFF;
mic_block_b0[14] = 0; mic_block[14] = 0;
mic_block_b0[15] = size & 0xFF; mic_block[15] = size & 0xFF;
mbedtls_cipher_init(aes_cmac_ctx); mbedtls_cipher_init(aes_cmac_ctx);
@ -132,7 +157,7 @@ int LoRaMacCrypto::compute_mic(const uint8_t *buffer, uint16_t size,
goto exit; goto exit;
} }
ret = mbedtls_cipher_cmac_update(aes_cmac_ctx, mic_block_b0, sizeof(mic_block_b0)); ret = mbedtls_cipher_cmac_update(aes_cmac_ctx, mic_block, sizeof(mic_block));
if (0 != ret) { if (0 != ret) {
goto exit; goto exit;
} }

3
features/lorawan/lorastack/mac/LoRaMacCrypto.h
View File

@ -68,6 +68,7 @@ public:
* @param [in] address - Frame address * @param [in] address - Frame address
* @param [in] dir - Frame direction [0: uplink, 1: downlink] * @param [in] dir - Frame direction [0: uplink, 1: downlink]
* @param [in] seq_counter - Frame sequence counter * @param [in] seq_counter - Frame sequence counter
* @param [in] block - Block number [0, 1]
* @param [out] mic - Computed MIC field * @param [out] mic - Computed MIC field
* *
* @return 0 if successful, or a cipher specific error code * @return 0 if successful, or a cipher specific error code
@ -75,7 +76,7 @@ public:
int compute_mic(const uint8_t *buffer, uint16_t size, int compute_mic(const uint8_t *buffer, uint16_t size,
uint32_t args, uint32_t address, uint32_t args, uint32_t address,
uint8_t dir, uint32_t seq_counter, uint8_t dir, uint32_t seq_counter,
uint32_t *mic); uint8_t block, uint32_t *mic);
/** /**
* Performs payload encryption * Performs payload encryption