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

Squashed 'features/nanostack/coap-service/' changes from 36d36ce..1cb994e 

1cb994e Move security _pkey into X.509 condition (#99)

git-subtree-dir: features/nanostack/coap-service
git-subtree-split: 1cb994e46e4943b44139cd19c5e97b74834e8216
pull/6876/head^2
Juhani Puurula 2018-05-14 17:08:10 +03:00
parent 4cb7e03c7b
commit 03edf998fa
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/coap_security_handler.c
View File

@ -51,8 +51,8 @@ struct coap_security_s {
#if defined(MBEDTLS_X509_CRT_PARSE_C)
mbedtls_x509_crt _cacert;
mbedtls_x509_crt _owncert;
#endif
mbedtls_pk_context _pkey;
#endif
uint8_t _pw[64];
uint8_t _pw_len;
@ -109,8 +109,8 @@ static int coap_security_handler_init(coap_security_t *sec){
#if defined(MBEDTLS_X509_CRT_PARSE_C)
mbedtls_x509_crt_init( &sec->_cacert );
mbedtls_x509_crt_init( &sec->_owncert );
#endif
mbedtls_pk_init( &sec->_pkey );
#endif
memset(&sec->_cookie, 0, sizeof(simple_cookie_t));
memset(&sec->_keyblk, 0, sizeof(key_block_t));
@ -145,9 +145,8 @@ static void coap_security_handler_reset(coap_security_t *sec){
#if defined(MBEDTLS_X509_CRT_PARSE_C)
mbedtls_x509_crt_free(&sec->_cacert);
mbedtls_x509_crt_free(&sec->_owncert);
#endif
mbedtls_pk_free(&sec->_pkey);
#endif
mbedtls_entropy_free( &sec->_entropy );
mbedtls_ctr_drbg_free( &sec->_ctr_drbg );