localhorst/ttn-esp32
1
0
Fork 0
mirror of https://github.com/manuelbl/ttn-esp32.git synced 2025-06-15 20:24:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check for all zero EUIs and keys

Browse Source
This commit is contained in:
Manuel Bleichenbacher 2018-07-28 22:13:59 +02:00
parent 78f65901cd
commit c95ecaab0c
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/TheThingsNetwork.cpp
View File

@ -195,7 +195,9 @@ bool TheThingsNetwork::isProvisioned()
if (provisioning_have_keys()) if (provisioning_have_keys())
return true; return true;
return provisioning_restore_keys(true); provisioning_restore_keys(true);
return provisioning_have_keys();
} }

34
src/provisioning.c
View File

@ -40,6 +40,7 @@ static int hex_digit_to_val(char ch);
static void bin_to_hex_str(const uint8_t* buf, int len, char* hex); static void bin_to_hex_str(const uint8_t* buf, int len, char* hex);
static char val_to_hex_digit(int val); static char val_to_hex_digit(int val);
static void swap_bytes(uint8_t* buf, int len); static void swap_bytes(uint8_t* buf, int len);
static bool is_all_zeroes(const uint8_t* buf, int len);
static QueueHandle_t uart_queue = NULL; static QueueHandle_t uart_queue = NULL;
@ -306,8 +307,14 @@ bool provisioning_decode_keys(const char *dev_eui, const char *app_eui, const ch
memcpy(global_app_eui, buf_app_eui, sizeof(global_app_eui)); memcpy(global_app_eui, buf_app_eui, sizeof(global_app_eui));
memcpy(global_app_key, buf_app_key, sizeof(global_app_key)); memcpy(global_app_key, buf_app_key, sizeof(global_app_key));
have_keys = provisioning_save_keys(); have_keys = !is_all_zeroes(global_dev_eui, sizeof(global_dev_eui))
return have_keys; && !is_all_zeroes(global_app_eui, sizeof(global_app_eui))
&& !is_all_zeroes(global_app_key, sizeof(global_app_key));
if (!provisioning_save_keys())
return false;
return true;
} }
@ -379,12 +386,23 @@ bool provisioning_restore_keys(bool silent)
memcpy(global_dev_eui, buf_dev_eui, sizeof(global_dev_eui)); memcpy(global_dev_eui, buf_dev_eui, sizeof(global_dev_eui));
memcpy(global_app_eui, buf_app_eui, sizeof(global_app_eui)); memcpy(global_app_eui, buf_app_eui, sizeof(global_app_eui));
memcpy(global_app_key, buf_app_key, sizeof(global_app_key)); memcpy(global_app_key, buf_app_key, sizeof(global_app_key));
have_keys = true;
have_keys = !is_all_zeroes(global_dev_eui, sizeof(global_dev_eui))
&& !is_all_zeroes(global_app_eui, sizeof(global_app_eui))
&& !is_all_zeroes(global_app_key, sizeof(global_app_key));
if (have_keys)
{
ESP_LOGI(TAG, "Dev and app EUI and app key have been restored from NVS storage"); ESP_LOGI(TAG, "Dev and app EUI and app key have been restored from NVS storage");
}
else
{
ESP_LOGW(TAG, "Dev and app EUI and app key are invalid (zeroes only)");
}
done: done:
nvs_close(handle); nvs_close(handle);
return have_keys; return true;
} }
bool read_nvs_value(nvs_handle handle, const char* key, uint8_t* data, size_t expected_length, bool silent) bool read_nvs_value(nvs_handle handle, const char* key, uint8_t* data, size_t expected_length, bool silent)
@ -493,3 +511,11 @@ void swap_bytes(uint8_t* buf, int len)
p2--; p2--;
} }
} }
bool is_all_zeroes(const uint8_t* buf, int len)
{
for (int i = 0; i < len; i++)
if (buf[i] != 0)
return false;
return true;
}