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

Small fixes

pull/3240/head
Antti Kauppila 2015-12-22 14:48:27 +02:00
parent 9a043c3b50
commit 488a05bc5f
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -3,3 +3,9 @@
output output
lcov lcov
coverage coverage
.yotta.json
.yotta_ignore
build/
yotta_modules/
yotta_targets/

1
module.json
View File

@ -20,7 +20,6 @@
"dependencies": { "dependencies": {
"nanostack-libservice": "^3.0.0", "nanostack-libservice": "^3.0.0",
"mbed-client-c": "^1.1.0", "mbed-client-c": "^1.1.0",
"sal-stack-nanostack-eventloop": "^1.0.0",
"sal-stack-nanostack": "^3.0.0", "sal-stack-nanostack": "^3.0.0",
"mbedtls": "^2.0.0" "mbedtls": "^2.0.0"
}, },

3
source/coap_security_handler.c
View File

@ -18,7 +18,7 @@
#include "mbedtls/ssl_ciphersuites.h" #include "mbedtls/ssl_ciphersuites.h"
const static int PSK_SUITES[] = { const int PSK_SUITES[] = {
MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8, MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8,
0 0
}; };
@ -267,6 +267,7 @@ int coap_security_handler_connect(thread_security_t *sec, bool is_server, const
memcpy(sec->_pw, pw, len); memcpy(sec->_pw, pw, len);
sec->_pw_len = len; sec->_pw_len = len;
} }
if( mbedtls_ssl_set_hs_ecjpake_password(&sec->_ssl, pw, len) != 0 ){ if( mbedtls_ssl_set_hs_ecjpake_password(&sec->_ssl, pw, len) != 0 ){
return -1; return -1;
} }

2
test/coap-service/unittest/stub/thread_management_server_stub.c
View File

@ -23,7 +23,7 @@
#include "thread_commissioning_if.h" #include "thread_commissioning_if.h"
//#include "thread_tmf_data_if.h" //#include "thread_tmf_data_if.h"
int thread_management_server_init(int8_t interface_id, uint8_t *PSKd_ptr, uint8_t PSKd_len) int thread_management_server_init(int8_t interface_id)
{ {
return 0; return 0;
} }