static bool g_doneCB;
#ifdef __WITH_TLS__
static int secure_protocol = 1;
-static void setDevProtocol(const OCProvisionDev_t* dev_lst);
+static void setDevProtocol(OCProvisionDev_t* dev_lst);
#endif
// function declaration(s) for calling them before implementing
static OicSecAcl_t* createAcl(const int);
#ifdef __WITH_TLS__
-static void setDevProtocol(const OCProvisionDev_t* dev_lst)
+static void setDevProtocol(OCProvisionDev_t* lst)
{
- if(!dev_lst)
+ if(!lst)
{
printf(" Device List is Empty..\n\n");
return;
}
- OCProvisionDev_t* lst = (OCProvisionDev_t*) dev_lst;
-
for( ; lst; )
{
if(2 == secure_protocol)
// TODO: We need to add new mechanism to clean up the stale state of the device.
- //Close the DTLS session of the removed device.
- CAEndpoint_t* endpoint = (CAEndpoint_t *)&pTargetDev->endpoint;
+ // Close the DTLS session of the removed device.
+ CAEndpoint_t *endpoint = (CAEndpoint_t *)&pTargetDev->endpoint;
endpoint->port = pTargetDev->securePort;
CAResult_t caResult = CACloseDtlsSession(endpoint);
- if(CA_STATUS_OK != caResult)
- {
+ if (CA_STATUS_OK != caResult) {
OIC_LOG_V(WARNING, TAG, "OCRemoveDevice : Failed to close DTLS session : %d", caResult);
}
//Revert psk_info callback and new deivce uuid in case of random PIN OxM
if(OIC_RANDOM_DEVICE_PIN == otmCtx->selectedDeviceInfo->doxm->oxmSel)
{
-#ifdef __WITH_TLS__
- if(CA_STATUS_OK != CAregisterTlsCredentialsHandler(GetDtlsPskCredentials))
+ if(CA_ADAPTER_IP == ((CAEndpoint_t*)(&otmCtx->selectedDeviceInfo->endpoint))->adapter)
{
- OIC_LOG(WARNING, TAG, "Failed to revert is TLS credential handler.");
+ if(CA_STATUS_OK != CARegisterDTLSCredentialsHandler(GetDtlsPskCredentials))
+ {
+ OIC_LOG(WARNING, TAG, "Failed to register DTLS handshake callback.");
+ }
}
-#endif
- if(CA_STATUS_OK != CARegisterDTLSCredentialsHandler(GetDtlsPskCredentials))
+#ifdef __WITH_TLS__
+ else
{
- OIC_LOG(WARNING, TAG, "Failed to revert is DTLS credential handler.");
+ if(CA_STATUS_OK != CAregisterTlsCredentialsHandler(GetDtlsPskCredentials))
+ {
+ OIC_LOG(WARNING, TAG, "Failed to register TLS handshake callback.");
+ }
}
+#endif
OicUuid_t emptyUuid = { .id={0}};
SetUuidForRandomPinOxm(&emptyUuid);
}
}
uint8_t ownerPSK[OWNER_PSK_LENGTH_128] = {0};
- OicSecKey_t ownerKey = {ownerPSK, OWNER_PSK_LENGTH_128};
+ OicSecKey_t ownerKey = {ownerPSK, OWNER_PSK_LENGTH_128, OIC_ENCODING_UNKNOW};
//Generating OwnerPSK
CAResult_t pskRet = CAGenerateOwnerPSK(&endpoint,
}
//Register DTLS event handler to catch the dtls event while handshake
- if(CA_STATUS_OK != CARegisterDTLSHandshakeCallback(DTLSHandshakeCB))
+ if(CA_ADAPTER_IP == ((CAEndpoint_t*)(&otmCtx->selectedDeviceInfo->endpoint))->adapter)
{
- OIC_LOG(WARNING, TAG, "StartOwnershipTransfer : Failed to register DTLS handshake callback.");
+ if(CA_STATUS_OK != CARegisterDTLSCredentialsHandler(GetDtlsPskCredentials))
+ {
+ OIC_LOG(WARNING, TAG, "Failed to register DTLS handshake callback.");
+ }
}
#ifdef __WITH_TLS__
- //Register TLS event handler to catch the tls event while handshake
- if(CA_STATUS_OK != CAregisterTlsHandshakeCallback(DTLSHandshakeCB))
+ else
{
- OIC_LOG(WARNING, TAG, "StartOwnershipTransfer : Failed to register TLS handshake callback.");
+ if(CA_STATUS_OK != CAregisterTlsCredentialsHandler(GetDtlsPskCredentials))
+ {
+ OIC_LOG(WARNING, TAG, "Failed to register TLS handshake callback.");
+ }
}
#endif
+
OIC_LOG(INFO, TAG, "OUT StartOwnershipTransfer");
return res;
}
}
break;
-
- default:
- {
- OIC_LOG (ERROR, TAG, "Wrong value passed for CADtlsPskCredType_t.");
- }
- break;
}
return ret;
OIC_LOG_V(DEBUG, TAG, "In %s", __func__);
LL_FOREACH(gCred, temp)
{
- if (SIGNED_ASYMMETRIC_KEY == temp->credType && 0 == memcmp((temp->credUsage), TRUST_CA, sizeof(TRUST_CA)))
+ if (SIGNED_ASYMMETRIC_KEY == temp->credType && 0 == memcmp((temp->credUsage), TRUST_CA, strlen(TRUST_CA) + 1))
{
OIC_LOG_V(DEBUG, TAG, "len: %d, crt len: %d", temp->optionalData.len, crt->len);
if(OIC_ENCODING_BASE64 == temp->optionalData.encoding)
OIC_LOG_V(DEBUG, TAG, "In %s", __func__);
LL_FOREACH(gCred, temp)
{
- if (SIGNED_ASYMMETRIC_KEY == temp->credType && 0 == memcmp((temp->credUsage), PRIMARY_CERT, sizeof(PRIMARY_CERT)))
+ if (SIGNED_ASYMMETRIC_KEY == temp->credType && 0 == memcmp((temp->credUsage), PRIMARY_CERT, strlen(PRIMARY_CERT) + 1))
{
OIC_LOG_V(DEBUG, TAG, "len: %d, crt len: %d", temp->publicData.len, crt->len);
crt->data = OICRealloc(crt->data, crt->len + temp->publicData.len);
OIC_LOG_V(DEBUG, TAG, "In %s", __func__);
LL_FOREACH(gCred, temp)
{
- if (SIGNED_ASYMMETRIC_KEY == temp->credType && 0 == memcmp((temp->credUsage), PRIMARY_CERT, sizeof(PRIMARY_CERT)))
+ if (SIGNED_ASYMMETRIC_KEY == temp->credType && 0 == memcmp((temp->credUsage), PRIMARY_CERT, strlen(PRIMARY_CERT) + 1))
{
OIC_LOG_V(DEBUG, TAG, "len: %d, key len: %d", temp->privateData.len, key->len);
key->data = OICRealloc(key->data, key->len + temp->privateData.len);