Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

msbf4_read corrupts certain Device Addresses #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

msbf4_read corrupts certain Device Addresses #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b320736
msbf4_read corrupts certain Device Addresses. Just enter it directly …
mikenz Jun 4, 2016
d32c853
Fix encryption code to match new device address format
mikenz Jun 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions libraries/lmic-v1.51/examples/esp-lmic-v1.51-F/esp-lmic-v1.51-F.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ unsigned char AppSkey[16] = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0x

// LoRaWAN end-device address (DevAddr)
// See http://thethingsnetwork.org/wiki/AddressSpace

#define msbf4_read(p) (u4_t)((u4_t)(p)[0]<<24 | (u4_t)(p)[1]<<16 | (p)[2]<<8 | (p)[3])
unsigned char DevAddr[4] = { 0x01, 0x01, 0x01, 0x01 };
u4_t DevAddr = 0x01010101;


// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -171,7 +169,7 @@ void setup() {
LMIC_reset();
// Set static session parameters. Instead of dynamically establishing a session
// by joining the network, precomputed session parameters are be provided.
LMIC_setSession (0x1, msbf4_read(DevAddr), (uint8_t*)NwkSkey, (uint8_t*)AppSkey);
LMIC_setSession (0x1, DevAddr, (uint8_t*)NwkSkey, (uint8_t*)AppSkey);
// Disable data rate adaptation
LMIC_setAdrMode(0);
// Disable link check validation
Expand Down
6 changes: 2 additions & 4 deletions libraries/lmic-v1.51/examples/nano-lmic-v1.51-F/nano-lmic-v1.51-F.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ unsigned char AppSkey[16] = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0

// LoRaWAN end-device address (DevAddr)
// See http://thethingsnetwork.org/wiki/AddressSpace

#define msbf4_read(p) (u4_t)((u4_t)(p)[0]<<24 | (u4_t)(p)[1]<<16 | (p)[2]<<8 | (p)[3])
unsigned char DevAddr[4] = { 0x01, 0x01, 0x01, 0x01 };
u4_t DevAddr = 0x01010101;


// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -167,7 +165,7 @@ void setup() {
LMIC_reset();
// Set static session parameters. Instead of dynamically establishing a session
// by joining the network, precomputed session parameters are be provided.
LMIC_setSession (0x1, msbf4_read(DevAddr), (uint8_t*)NwkSkey, (uint8_t*)AppSkey);
LMIC_setSession (0x1, DevAddr, (uint8_t*)NwkSkey, (uint8_t*)AppSkey);
// Disable data rate adaptation
LMIC_setAdrMode(0);
// Disable link check validation
Expand Down
19 changes: 10 additions & 9 deletions libraries/lmic-v1.51/src/lmic/Encrypt_V30.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
*****************************************************************************************
*/

#include "oslmic.h"
#include "Encrypt_V30.h"
#include "AES-128_V10.h"

Expand All @@ -41,7 +42,7 @@

extern unsigned char NwkSkey[16];
extern unsigned char AppSkey[16];
extern unsigned char DevAddr[4];
extern u4_t DevAddr;

// --------------------------------------------------------------------
//
Expand Down Expand Up @@ -73,10 +74,10 @@ void Encrypt_Payload(unsigned char *Data, unsigned char Data_Length, unsigned in

Block_A[5] = Direction;

Block_A[6] = DevAddr[3];
Block_A[7] = DevAddr[2];
Block_A[8] = DevAddr[1];
Block_A[9] = DevAddr[0];
Block_A[6] = DevAddr;
Block_A[7] = DevAddr>>8;
Block_A[8] = DevAddr>>16;
Block_A[9] = DevAddr>>24;

Block_A[10] = (Frame_Counter & 0x00FF);
Block_A[11] = ((Frame_Counter >> 8) & 0x00FF);
Expand Down Expand Up @@ -157,10 +158,10 @@ void Calculate_MIC(unsigned char *Data, unsigned char *Final_MIC, unsigned char

Block_B[5] = Direction;

Block_B[6] = DevAddr[3];
Block_B[7] = DevAddr[2];
Block_B[8] = DevAddr[1];
Block_B[9] = DevAddr[0];
Block_B[6] = DevAddr;
Block_B[7] = DevAddr>>8;
Block_B[8] = DevAddr>>16;
Block_B[9] = DevAddr>>24;

Block_B[10] = (Frame_Counter & 0x00FF);
Block_B[11] = ((Frame_Counter >> 8) & 0x00FF);
Expand Down