From 70baca7f7f08eec063a8ae1eb7aef69d4b083a23 Mon Sep 17 00:00:00 2001 From: "Hongkuk, Son" Date: Fri, 24 Nov 2017 10:55:24 +0900 Subject: [PATCH] Update snapshot(2017-11-23) Signed-off-by: Hongkuk, Son Change-Id: I1f1159259819400edca8bc384bbc8c883168abbf --- packaging/snapshot_history.txt | 6 ++++++ .../connectivity/src/bt_le_adapter/tizen/caleserver.c | 9 ++------- .../connectivity/src/bt_le_adapter/tizen/caleserver_mcd.c | 8 ++------ .../connectivity/src/bt_le_adapter/tizen/caleserver_vd.c | 8 ++------ resource/csdk/connectivity/src/camessagehandler.c | 3 ++- resource/csdk/connectivity/src/tcp_adapter/catcpserver.c | 3 +++ resource/csdk/security/src/pkix_interface.c | 15 ++++++++++++--- 7 files changed, 29 insertions(+), 23 deletions(-) diff --git a/packaging/snapshot_history.txt b/packaging/snapshot_history.txt index 9b727a7..51607b8 100755 --- a/packaging/snapshot_history.txt +++ b/packaging/snapshot_history.txt @@ -1,3 +1,9 @@ +http://suprem.sec.samsung.net/jira/browse/CONPRO-1142 + +commit_info_2017-11-23.txt + +commit_id: 2cca3e2b4d8aad38e38cfa8c8081c0891d82f264 +---------------------------------------------------------------------------------------------------------------------------------- http://suprem.sec.samsung.net/jira/browse/CONPRO-1131 commit_info_2017-11-14.txt diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver.c index 09f36d4..4b16e70 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver.c @@ -34,11 +34,6 @@ #define TAG "OIC_CA_LE_SERVER" /** - * Initial buffer size for Gatt Server. - */ -#define CA_LE_INITIAL_BUF_SIZE 512 - -/** * The handle of the OIC server. */ static bt_gatt_server_h g_gattServer = NULL; @@ -209,7 +204,7 @@ CAResult_t CAStartLEGattServer() // For Read Characteristics. ret = CAAddNewCharacteristicsToGattServer(g_gattSvcPath, charReadUUID, charReadValue, - CA_LE_INITIAL_BUF_SIZE, true); + sizeof(charReadValue), true); if (CA_STATUS_OK != ret) { OIC_LOG_V(ERROR, TAG, "CAAddNewCharacteristicsToGattServer failed[%d]", ret); @@ -223,7 +218,7 @@ CAResult_t CAStartLEGattServer() ret = CAAddNewCharacteristicsToGattServer(g_gattSvcPath, charWriteUUID, charWriteValue, - CA_LE_INITIAL_BUF_SIZE, false); // For Write Characteristics. + sizeof(charWriteValue), false); // For Write Characteristics. if (CA_STATUS_OK != ret ) { OIC_LOG_V(ERROR, TAG, "CAAddNewCharacteristicsToGattServer failed[%d]", ret); diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_mcd.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_mcd.c index a7273e7..6913289 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_mcd.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_mcd.c @@ -33,10 +33,6 @@ */ //#define TAG "OIC_CA_LE_SERVER_MCD" #define TAG BLE_SERVER_MCD_TAG -/** - * Initial buffer size for Gatt Server. - */ -#define CA_LE_INITIAL_BUF_SIZE 512 /** * The handle of the OIC server. @@ -278,7 +274,7 @@ CAResult_t CAStartLEGattServer() // For Read Characteristics. ret = CAAddNewCharacteristicsToGattServer(g_gattSvcPath, charReadUUID, charReadValue, - CA_LE_INITIAL_BUF_SIZE, true); + sizeof(charReadValue), true); if (CA_STATUS_OK != ret) { OIC_LOG_V(ERROR, TAG, "CAAddNewCharacteristicsToGattServer failed[%d]", ret); @@ -292,7 +288,7 @@ CAResult_t CAStartLEGattServer() ret = CAAddNewCharacteristicsToGattServer(g_gattSvcPath, charWriteUUID, charWriteValue, - CA_LE_INITIAL_BUF_SIZE, false); // For Write Characteristics. + sizeof(charWriteValue), false); // For Write Characteristics. if (CA_STATUS_OK != ret ) { OIC_LOG_V(ERROR, TAG, "CAAddNewCharacteristicsToGattServer failed[%d]", ret); diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_vd.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_vd.c index ef3654b..ab1f153 100755 --- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_vd.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_vd.c @@ -32,10 +32,6 @@ * Logging tag for module name */ #define TAG "OIC_CA_LE_SERVER_VD" -/** - * Initial buffer size for Gatt Server. - */ -#define CA_LE_INITIAL_BUF_SIZE 512 /** * The handle of the OIC server. @@ -228,7 +224,7 @@ CAResult_t CAStartLEGattServer() // For Read Characteristics. ret = CAAddNewCharacteristicsToGattServer(g_gattSvcPath, charReadUUID, charReadValue, - CA_LE_INITIAL_BUF_SIZE, true); + sizeof(charReadValue), true); if (CA_STATUS_OK != ret) { OIC_LOG_V(ERROR, TAG, "CAAddNewCharacteristicsToGattServer failed[%d]", ret); @@ -242,7 +238,7 @@ CAResult_t CAStartLEGattServer() ret = CAAddNewCharacteristicsToGattServer(g_gattSvcPath, charWriteUUID, charWriteValue, - CA_LE_INITIAL_BUF_SIZE, false); // For Write Characteristics. + sizeof(charWriteValue), false); // For Write Characteristics. if (CA_STATUS_OK != ret ) { OIC_LOG_V(ERROR, TAG, "CAAddNewCharacteristicsToGattServer failed[%d]", ret); diff --git a/resource/csdk/connectivity/src/camessagehandler.c b/resource/csdk/connectivity/src/camessagehandler.c index bb9d829..394a728 100755 --- a/resource/csdk/connectivity/src/camessagehandler.c +++ b/resource/csdk/connectivity/src/camessagehandler.c @@ -201,7 +201,8 @@ static CAData_t* CAGenerateHandlerData(const CAEndpoint_t *endpoint, goto exit; } - if (CADropSecondMessage(&caglobals.ca.requestHistory, endpoint, reqInfo->info.messageId, + if ((reqInfo->info.type != CA_MSG_CONFIRM) && + CADropSecondMessage(&caglobals.ca.requestHistory, endpoint, reqInfo->info.messageId, reqInfo->info.token, reqInfo->info.tokenLength)) { OIC_LOG(INFO, TAG, "Second Request with same Token, Drop it"); diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c index 2d7df00..78b43bb 100644 --- a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c +++ b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c @@ -616,6 +616,9 @@ static void CAReceiveMessage(int fd) { OIC_LOG(ERROR, TAG, "Failed to disconnect TCP session"); } + + CASearchAndDeleteTCPSession(&svritem->sep.endpoint); + return; } } diff --git a/resource/csdk/security/src/pkix_interface.c b/resource/csdk/security/src/pkix_interface.c index dc807d3..5b1dc61 100644 --- a/resource/csdk/security/src/pkix_interface.c +++ b/resource/csdk/security/src/pkix_interface.c @@ -106,6 +106,10 @@ void CheckInvalidDERSignature(uint8_t *crtBuf, size_t *crtBufLen) return; } + OIC_LOG_V(INFO, TAG, "Cert Buf Length: %lu", *crtBufLen); + OIC_LOG(INFO, TAG, "[Cert Buf] : "); + OIC_LOG_BUFFER(INFO, TAG, crtBuf, *crtBufLen); + mbedtls_x509_crt deviceCert; int ret = 0; @@ -431,8 +435,13 @@ int SetHwPkixCallbacks(GetHwKeyContext getHwKeyContext, { OIC_LOG_V(INFO, TAG, "In %s", __func__); - if (NULL == getHwKeyContext || NULL == freeHwKeyContext - || NULL == getOwnCertCb || NULL == setupPkContextCb) + if (NULL == getHwKeyContext && NULL == freeHwKeyContext + && NULL == getOwnCertCb && NULL == setupPkContextCb) + { + OIC_LOG(INFO, TAG, "Unregistering callbacks"); + } + else if (NULL == getHwKeyContext || NULL == freeHwKeyContext + || NULL == getOwnCertCb || NULL == setupPkContextCb) { OIC_LOG(ERROR, TAG, "NULL Passed"); OIC_LOG(ERROR, TAG, "Callback function parameters can not be null"); @@ -444,7 +453,7 @@ int SetHwPkixCallbacks(GetHwKeyContext getHwKeyContext, gHwPkixCtx.getOwnCertCb = getOwnCertCb; gHwPkixCtx.setupPkContextCb = setupPkContextCb; - if (gHwPkixCtx.hwKeyCtx) + if (gHwPkixCtx.hwKeyCtx && NULL != freeHwKeyContext) { gHwPkixCtx.freeHwKeyContext(gHwPkixCtx.hwKeyCtx); } -- 2.7.4