pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protocomm : Session security now supports multiple instances of the same type

Browse Source 
List of changes:
* Security APIs accept handle to instance created during initialization
* Protocomm internally stores the security instance handle and calls security APIs with this handle as first parameter
This commit is contained in:
Anurag Kar
2019-04-12 17:32:38 +05:30
parent 936ee2884b
commit cccf829366
8 changed files with 107 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/protocomm/src/common/protocomm.c
+10 -7
View File
@@ -59,7 +59,7 @@ void protocomm_delete(protocomm_t *pc)
/* Free memory allocated to security */
if (pc->sec && pc->sec->cleanup) {
pc->sec->cleanup();
pc->sec->cleanup(pc->sec_inst);
}
if (pc->pop) {
free(pc->pop);
@@ -182,7 +182,7 @@ esp_err_t protocomm_req_handle(protocomm_t *pc, const char *ep_name, uint32_t se
}
ssize_t dec_inbuf_len = inlen;
ret = pc->sec->decrypt(session_id, inbuf, inlen, dec_inbuf, &dec_inbuf_len);
ret = pc->sec->decrypt(pc->sec_inst, session_id, inbuf, inlen, dec_inbuf, &dec_inbuf_len);
if (ret != ESP_OK) {
ESP_LOGE(TAG, "Decryption of response failed for endpoint %s", ep_name);
free(dec_inbuf);
@@ -214,7 +214,7 @@ esp_err_t protocomm_req_handle(protocomm_t *pc, const char *ep_name, uint32_t se
}
ssize_t enc_resp_len = plaintext_resp_len;
ret = pc->sec->encrypt(session_id, plaintext_resp, plaintext_resp_len,
ret = pc->sec->encrypt(pc->sec_inst, session_id, plaintext_resp, plaintext_resp_len,
enc_resp, &enc_resp_len);
if (ret != ESP_OK) {
@@ -253,7 +253,8 @@ static int protocomm_common_security_handler(uint32_t session_id,
protocomm_t *pc = (protocomm_t *) priv_data;
if (pc->sec && pc->sec->security_req_handler) {
return pc->sec->security_req_handler(pc->pop, session_id,
return pc->sec->security_req_handler(pc->sec_inst,
pc->pop, session_id,
inbuf, inlen,
outbuf, outlen,
priv_data);
@@ -283,7 +284,7 @@ esp_err_t protocomm_set_security(protocomm_t *pc, const char *ep_name,
}
if (sec->init) {
ret = sec->init();
ret = sec->init(&pc->sec_inst);
if (ret != ESP_OK) {
ESP_LOGE(TAG, "Error initializing security");
protocomm_remove_endpoint(pc, ep_name);
@@ -297,7 +298,8 @@ esp_err_t protocomm_set_security(protocomm_t *pc, const char *ep_name,
if (pc->pop == NULL) {
ESP_LOGE(TAG, "Error allocating Proof of Possession");
if (pc->sec && pc->sec->cleanup) {
pc->sec->cleanup();
pc->sec->cleanup(pc->sec_inst);
pc->sec_inst = NULL;
pc->sec = NULL;
}
@@ -316,7 +318,8 @@ esp_err_t protocomm_unset_security(protocomm_t *pc, const char *ep_name)
}
if (pc->sec && pc->sec->cleanup) {
pc->sec->cleanup();
pc->sec->cleanup(pc->sec_inst);
pc->sec_inst = NULL;
pc->sec = NULL;
}
components/protocomm/src/common/protocomm_priv.h
+4 -1
View File
@@ -61,10 +61,13 @@ struct protocomm {
* internally when protocomm_remove_endpoint() is invoked. */
int (*remove_endpoint)(const char *ep_name);
/* Pointer to security layer instance to be used internally for
/* Pointer to security layer to be used internally for
* establishing secure sessions */
const protocomm_security_t *sec;
/* Handle to the security layer instance */
protocomm_security_handle_t sec_inst;
/* Pointer to proof of possession object */
protocomm_security_pop_t *pop;