From 488a05bc5f732726059efa840ade15ba21a0910c Mon Sep 17 00:00:00 2001 From: Antti Kauppila Date: Tue, 22 Dec 2015 14:48:27 +0200 Subject: [PATCH] Small fixes --- .gitignore | 6 ++++++ module.json | 1 - source/coap_security_handler.c | 3 ++- .../unittest/stub/thread_management_server_stub.c | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 80fbaf0da9..ea0c29b5cf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,9 @@ output lcov coverage +.yotta.json +.yotta_ignore +build/ +yotta_modules/ +yotta_targets/ + diff --git a/module.json b/module.json index 7208e9d57f..0fe1bbb866 100644 --- a/module.json +++ b/module.json @@ -20,7 +20,6 @@ "dependencies": { "nanostack-libservice": "^3.0.0", "mbed-client-c": "^1.1.0", - "sal-stack-nanostack-eventloop": "^1.0.0", "sal-stack-nanostack": "^3.0.0", "mbedtls": "^2.0.0" }, diff --git a/source/coap_security_handler.c b/source/coap_security_handler.c index fd8a99dadd..b7bf166299 100644 --- a/source/coap_security_handler.c +++ b/source/coap_security_handler.c @@ -18,7 +18,7 @@ #include "mbedtls/ssl_ciphersuites.h" -const static int PSK_SUITES[] = { +const int PSK_SUITES[] = { MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8, 0 }; @@ -267,6 +267,7 @@ int coap_security_handler_connect(thread_security_t *sec, bool is_server, const memcpy(sec->_pw, pw, len); sec->_pw_len = len; } + if( mbedtls_ssl_set_hs_ecjpake_password(&sec->_ssl, pw, len) != 0 ){ return -1; } diff --git a/test/coap-service/unittest/stub/thread_management_server_stub.c b/test/coap-service/unittest/stub/thread_management_server_stub.c index 7e6b3d3b4d..78b942420f 100644 --- a/test/coap-service/unittest/stub/thread_management_server_stub.c +++ b/test/coap-service/unittest/stub/thread_management_server_stub.c @@ -23,7 +23,7 @@ #include "thread_commissioning_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; }