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 #13048 from mikter/ws_certificate_set_change 

Allowed to set Wi-SUN certificates in DISCONNECTED state
pull/13077/head
Martin Kojtal 2020-06-05 09:58:19 +02:00 committed by GitHub
parent 8911f96c1b ad6ed89e10
commit ecf988731c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
features/nanostack/mbed-mesh-api/source/wisun_tasklet.c
View File

@ -643,43 +643,40 @@ int wisun_tasklet_set_regulatory_domain(int8_t nwk_interface_id, uint8_t regulat
int wisun_tasklet_set_own_certificate(uint8_t *cert, uint16_t cert_len, uint8_t *cert_key, uint16_t cert_key_len) int wisun_tasklet_set_own_certificate(uint8_t *cert, uint16_t cert_len, uint8_t *cert_key, uint16_t cert_key_len)
{ {
if (wisun_tasklet_data_ptr) { if (wisun_tasklet_data_ptr && wisun_tasklet_data_ptr->network_interface_id != INVALID_INTERFACE_ID) {
// this API can be only used before first connect() // interface already active write certificates to stack.
tr_err("Already connected"); arm_certificate_entry_s arm_cert_entry;
return -2; arm_cert_entry.cert = cert;
arm_cert_entry.cert_len = cert_len;
arm_cert_entry.key = cert_key;
arm_cert_entry.key_len = cert_key_len;
return arm_network_own_certificate_add(&arm_cert_entry);
} }
// Stack is inactive store the certificates and activate when connect() called
return wisun_tasklet_store_certificate_data(cert, cert_len, cert_key, cert_key_len, false, false, false); return wisun_tasklet_store_certificate_data(cert, cert_len, cert_key, cert_key_len, false, false, false);
} }
int wisun_tasklet_remove_own_certificates(void) int wisun_tasklet_remove_own_certificates(void)
{ {
if (wisun_tasklet_data_ptr) {
// this API can be only used before first connect()
tr_err("Already connected");
return -2;
}
return wisun_tasklet_store_certificate_data(NULL, 0, NULL, 0, true, false, false); return wisun_tasklet_store_certificate_data(NULL, 0, NULL, 0, true, false, false);
} }
int wisun_tasklet_remove_trusted_certificates(void) int wisun_tasklet_remove_trusted_certificates(void)
{ {
if (wisun_tasklet_data_ptr) {
// this API can be only used before first connect()
tr_err("Already connected");
return -2;
}
return wisun_tasklet_store_certificate_data(NULL, 0, NULL, 0, false, true, false); return wisun_tasklet_store_certificate_data(NULL, 0, NULL, 0, false, true, false);
} }
int wisun_tasklet_set_trusted_certificate(uint8_t *cert, uint16_t cert_len) int wisun_tasklet_set_trusted_certificate(uint8_t *cert, uint16_t cert_len)
{ {
if (wisun_tasklet_data_ptr) { if (wisun_tasklet_data_ptr && wisun_tasklet_data_ptr->network_interface_id != INVALID_INTERFACE_ID) {
// this API can be only used before first connect() // interface already active write certificates to stack.
tr_err("Already connected"); arm_certificate_entry_s arm_cert_entry;
return -2; arm_cert_entry.cert = cert;
arm_cert_entry.cert_len = cert_len;
arm_cert_entry.key = NULL;
arm_cert_entry.key_len = 0;
return arm_network_trusted_certificate_add(&arm_cert_entry);
} }
// Stack is inactive store the certificates and activate when connect() called
return wisun_tasklet_store_certificate_data(cert, cert_len, NULL, 0, false, false, true); return wisun_tasklet_store_certificate_data(cert, cert_len, NULL, 0, false, false, true);
} }