#include "securevirtualresourcetypes.h"
#include "srmutility.h"
#include "pmtypes.h"
+#include "oxmverifycommon.h"
+#include "pkix_interface.h"
+#include "hw_emul/hw_interface.h"
+#include "mbedtls/x509_crt.h"
#ifdef __cplusplus
extern "C"
// declaration(s) for provisioning client using C-level provisioning API
// user input definition for main loop on provisioning client
-#define _10_DISCOV_ALL_DEVS_ 10
-#define _11_DISCOV_UNOWN_DEVS_ 11
-#define _12_DISCOV_OWN_DEVS_ 12
-#ifdef _ENABLE_MULTIPLE_OWNER_
-#define _13_MOT_DISCOV_DEV_ 13
-#endif //_ENABLE_MULTIPLE_OWNER_
-#define _20_REGIST_DEVS_ 20
-#define _30_PROVIS_PAIR_DEVS_ 30
-#define _31_PROVIS_CRED_ 31
-#define _32_PROVIS_ACL_ 32
-#define _33_PROVIS_DP_ 33
-#define _34_CHECK_LINK_STATUS_ 34
-#define _35_SAVE_ACL_ 35
-#define _40_UNLINK_PAIR_DEVS_ 40
-#define _50_REMOVE_SELEC_DEV_ 50
-#define _51_REMOVE_DEV_WITH_UUID_ 51
-#define _52_RESET_SELEC_DEV_ 52
-#define _60_GET_CRED_ 60
-#define _61_GET_ACL_ 61
-#ifdef _ENABLE_MULTIPLE_OWNER_
-#define _70_MOT_CHANGE_MOM_ 70
-#define _71_MOT_PROV_PRECONF_PIN_ 71
-#define _72_MOT_OXM_SEL_ 72
-#endif //_ENABLE_MULTIPLE_OWNER_
-#define _80_SELECT_PROTOCOL_ 80
-#define _99_EXIT_PRVN_CLT_ 99
+#define _10_DISCOV_ALL_DEVS_ 10
+#define _11_DISCOV_UNOWN_DEVS_ 11
+#define _12_DISCOV_OWN_DEVS_ 12
+#ifdef MULTIPLE_OWNER
+#define _13_MOT_DISCOV_DEV_ 13
+#endif //MULTIPLE_OWNER
+#define _20_REGIST_DEVS_ 20
+#define _30_PROVIS_PAIR_DEVS_ 30
+#define _31_PROVIS_CRED_ 31
+#define _32_PROVIS_ACL_ 32
+#define _33_PROVIS_DP_ 33
+#define _34_CHECK_LINK_STATUS_ 34
+#define _35_SAVE_ACL_ 35
+#define _40_UNLINK_PAIR_DEVS_ 40
+#define _50_REMOVE_SELEC_DEV_ 50
+#define _51_REMOVE_DEV_WITH_UUID_ 51
+#define _52_RESET_SELEC_DEV_ 52
+#define _53_RESET_SVR_DB_ 53
+#define _60_GET_CRED_ 60
+#define _61_GET_ACL_ 61
+#ifdef MULTIPLE_OWNER
+#define _70_MOT_CHANGE_MOM_ 70
+#define _71_MOT_PROV_PRECONF_PIN_ 71
+#define _72_MOT_OXM_SEL_ 72
+#define _73_MOT_REMOVE_SUBOWNER_ 73
+#define _74_MOT_REMOVE_ALL_SUBOWNER_ 74
+#endif //MULTIPLE_OWNER
+#define _80_SELECT_PROTOCOL_ 80
+#define _81_SELECT_VERIF_METHOD_ 81
+#define _82_SECURE_STORAGE_HW_EMULATION_ 82
+#define _99_EXIT_PRVN_CLT_ 99
#define ACL_RESRC_MAX_NUM 16
#define ACL_RESRC_ARRAY_SIZE 3 //This value is used only for sample (not OCF spec)
static OCProvisionDev_t* g_unown_list;
static int g_own_cnt;
static int g_unown_cnt;
-#ifdef _ENABLE_MULTIPLE_OWNER_
+#ifdef MULTIPLE_OWNER
static OCProvisionDev_t* g_mot_enable_list;
static int g_mot_enable_cnt;
-#endif //_ENABLE_MULTIPLE_OWNER_
+#endif //MULTIPLE_OWNER
static bool g_doneCB;
#ifdef __WITH_TLS__
g_doneCB = true;
}
-#ifdef _ENABLE_MULTIPLE_OWNER_
+#ifdef MULTIPLE_OWNER
static void updateDoxmForMOTCB(void* ctx, int nOfRes, OCProvisionResult_t* arr, bool hasError)
{
if(!hasError)
}
g_doneCB = true;
}
-#endif //_ENABLE_MULTIPLE_OWNER_
+
+static void deleteDoxmForMOTCB(void* ctx, int nOfRes, OCProvisionResult_t* arr, bool hasError)
+{
+ if(!hasError)
+ {
+ OIC_LOG_V(INFO, TAG, "DELETE 'doxm' SUCCEEDED - ctx: %s", (char*) ctx);
+ }
+ else
+ {
+ OIC_LOG_V(ERROR, TAG, "DELETE 'doxm' FAILED - ctx: %s", (char*) ctx);
+ printResultList((const OCProvisionResult_t*) arr, nOfRes);
+ }
+ g_doneCB = true;
+}
+
+#endif //MULTIPLE_OWNER
static void inputPinCB(char* pin, size_t len)
{
return 0;
}
-#ifdef _ENABLE_MULTIPLE_OWNER_
+#ifdef MULTIPLE_OWNER
static int discoverMOTEnabledDevices(void)
{
// delete owned device list before updating it
return 0;
}
-#endif //_ENABLE_MULTIPLE_OWNER_
+#endif //MULTIPLE_OWNER
static int registerDevices(void)
{
return 0;
}
-#ifdef _ENABLE_MULTIPLE_OWNER_
+OCStackResult displayNumCB(void * ctx, uint8_t mutualVerifNum[MUTUAL_VERIF_NUM_LEN])
+{
+ OIC_LOG(INFO, TAG, "IN displayMutualVerifNumCB");
+ OC_UNUSED(ctx);
+ if (NULL != mutualVerifNum)
+ {
+ OIC_LOG(INFO, TAG, "############ mutualVerifNum ############");
+ OIC_LOG_BUFFER(INFO, TAG, mutualVerifNum, MUTUAL_VERIF_NUM_LEN);
+ OIC_LOG(INFO, TAG, "############ mutualVerifNum ############");
+ OIC_LOG(INFO, TAG, "OUT displayMutualVerifNumCB");
+ }
+ else
+ {
+ OIC_LOG(INFO, TAG, "############ Confirm on the Server side ############");
+ }
+ return OC_STACK_OK;
+}
+
+OCStackResult confirmNumCB(void * ctx)
+{
+ OC_UNUSED(ctx);
+ for (;;)
+ {
+ int userConfirm;
+
+ printf(" > Press 1 if the mutual verification numbers are the same\n");
+ printf(" > Press 0 if the mutual verification numbers are not the same\n");
+
+ for (int ret=0; 1!=ret; )
+ {
+ ret = scanf("%d", &userConfirm);
+ for (; 0x20<=getchar(); ); // for removing overflow garbage
+ // '0x20<=code' is character region
+ }
+ if (1 == userConfirm)
+ {
+ break;
+ }
+ else if (0 == userConfirm)
+ {
+ return OC_STACK_USER_DENIED_REQ;
+ }
+ printf(" Entered Wrong Number. Please Enter Again\n");
+ }
+ return OC_STACK_OK;
+}
+
+OCStackResult notifyInputStateCB(void * ctx)
+{
+ OC_UNUSED(ctx);
+
+ OIC_LOG(DEBUG, TAG, "IN notifyInputStateCB");
+ OIC_LOG(DEBUG, TAG, "User input Callback in progress");
+ OIC_LOG(DEBUG, TAG, "OUT notifyInputStateCB");
+
+ return OC_STACK_OK;
+}
+
+#ifdef MULTIPLE_OWNER
static int changeMultipleOwnershipTrnasferMode(void)
{
// check |own_list| for removing device
return 0;
}
-#endif //_ENABLE_MULTIPLE_OWNER_
+
+static int removeSubOwner(void)
+{
+ // check |g_mot_enable_list| for removing sub-owner
+ if (!g_mot_enable_list || 1 > g_mot_enable_cnt)
+ {
+ printf(" > Multiple Ownership Transfer Enabled Device List is Empty\n");
+ printf(" > Please Discover the Multiple Ownership Transfer Enabled Devices, with [13] Menu\n");
+ return 0; // normal case
+ }
+
+ // select resource server for removing sub-owner
+ int dev_num = 0;
+ for ( ; ; )
+ {
+ printf(" > Enter Device Number to remove sub-owner: ");
+ for (int ret = 0; 1 != ret; )
+ {
+ ret = scanf("%d", &dev_num);
+ for( ; 0x20 <= getchar(); ); // for removing overflow garbages
+ // '0x20<=code' is character region
+ }
+ if (0 < dev_num && g_mot_enable_cnt >= dev_num)
+ {
+ break;
+ }
+ printf(" Entered Wrong Number. Please Enter Again\n");
+ }
+
+ OCProvisionDev_t* motDev = getDevInst(g_mot_enable_list, dev_num);
+ if (motDev && motDev->doxm && motDev->doxm->subOwners)
+ {
+ OicSecSubOwner_t* subOwner = motDev->doxm->subOwners;
+ int so_cnt = 0;
+ while(subOwner)
+ {
+ printf(" [%zu] ", ++so_cnt);
+ printUuid(&subOwner->uuid);
+ printf("\n");
+ subOwner = subOwner->next;
+ }
+
+ int so_num = 0;
+ for ( ; ; )
+ {
+ printf(" > Enter SubOwner Number to be removed : ");
+ for (int ret = 0; 1 != ret; )
+ {
+ ret = scanf("%d", &so_num);
+ for( ; 0x20<=getchar(); ); // for removing overflow garbages
+ // '0x20<=code' is character region
+ }
+ if (0 < so_num && so_cnt >= so_num)
+ {
+ int target_num = 0;
+ subOwner = motDev->doxm->subOwners;
+ while (subOwner)
+ {
+ if(so_num == ++target_num)
+ {
+ if (OC_STACK_OK != OCRemoveSubOwner(NULL, motDev, &subOwner->uuid, deleteDoxmForMOTCB))
+ {
+ return -1;
+ }
+
+ g_doneCB = false;
+
+ if(waitCallbackRet()) // input |g_doneCB| flag implicitly
+ {
+ OIC_LOG(ERROR, TAG, "waitCallbackRet callback error");
+ return -1;
+ }
+ return 0;
+ }
+ subOwner = subOwner->next;
+ }
+ break;
+ }
+ printf(" Entered Wrong Number. Please Enter Again\n");
+ }
+ }
+ else
+ {
+ printf(" SubOwner list is empty.\n");
+ }
+
+ return 0;
+}
+
+static int removeAllSubOwner(void)
+{
+ // check |g_mot_enable_list| for removing sub-owner
+ if (!g_mot_enable_list || 1 > g_mot_enable_cnt)
+ {
+ printf(" > Multiple Ownership Transfer Enabled Device List is Empty\n");
+ printf(" > Please Discover the Multiple Ownership Transfer Enabled Devices, with [13] Menu\n");
+ return 0; // normal case
+ }
+
+ // select resource server for removing sub-owner
+ int dev_num = 0;
+ for ( ; ; )
+ {
+ printf(" > Enter Device Number to remove sub-owner: ");
+ for (int ret = 0; 1 != ret; )
+ {
+ ret = scanf("%d", &dev_num);
+ for( ; 0x20 <= getchar(); ); // for removing overflow garbages
+ // '0x20<=code' is character region
+ }
+ if (0 < dev_num && g_mot_enable_cnt >= dev_num)
+ {
+ break;
+ }
+ printf(" Entered Wrong Number. Please Enter Again\n");
+ }
+
+ OCProvisionDev_t* motDev = getDevInst(g_mot_enable_list, dev_num);
+ if (motDev && motDev->doxm && motDev->doxm->subOwners)
+ {
+ if (OC_STACK_OK != OCRemoveAllSubOwner(NULL, motDev, deleteDoxmForMOTCB))
+ {
+ return -1;
+ }
+
+ g_doneCB = false;
+
+ if(waitCallbackRet()) // input |g_doneCB| flag implicitly
+ {
+ OIC_LOG(ERROR, TAG, "waitCallbackRet callback error");
+ return -1;
+ }
+ return 0;
+ }
+ else
+ {
+ printf(" SubOwner list is empty.\n");
+ }
+
+ return 0;
+}
+
+#endif //MULTIPLE_OWNER
static int resetDevice(void)
{
return 0;
}
+static int resetSVRDB(void)
+{
+ printf(" Resetting SVR DB..\n");
+ OCStackResult rst = OCResetSVRDB();
+ if (OC_STACK_OK != rst)
+ {
+ OIC_LOG_V(ERROR, TAG, "OCResetSVRDB API error: %d", rst);
+ return -1;
+ }
+ return 0;
+}
+
static OicSecAcl_t* createAcl(const int dev_num)
{
if(0>=dev_num || g_own_cnt<dev_num)
printf(" Enter Number of resource type for [%s] : ", rsrc->href);
for(int ret=0; 1!=ret; )
{
- ret = scanf("%d", &arrLen);
+ ret = scanf("%zu", &arrLen);
for( ; 0x20<=getchar(); ); // for removing overflow garbages
// '0x20<=code' is character region
}
goto CRACL_ERROR;
}
- for(int i = 0; i < arrLen; i++)
+ for(size_t i = 0; i < arrLen; i++)
{
- printf(" Enter ResourceType[%d] Name (e.g. core.led): ", i+1);
+ printf(" Enter ResourceType[%zu] Name (e.g. core.led): ", i+1);
for(int ret=0; 1!=ret; )
{
ret = scanf("%128s", rsrc_in); // '128' is ACL_RESRC_MAX_LEN
printf(" Enter Number of interface for [%s]: ", rsrc->href);
for(int ret=0; 1!=ret; )
{
- ret = scanf("%d", &arrLen);
+ ret = scanf("%zu", &arrLen);
for( ; 0x20<=getchar(); ); // for removing overflow garbages
// '0x20<=code' is character region
}
goto CRACL_ERROR;
}
- for(int i = 0; i < arrLen; i++)
+ for(size_t i = 0; i < arrLen; i++)
{
- printf(" Enter Interface[%d] Name (e.g. oic.if.baseline): ", i+1);
+ printf(" Enter Interface[%zu] Name (e.g. oic.if.baseline): ", i+1);
for(int ret=0; 1!=ret; )
{
ret = scanf("%128s", rsrc_in); // '128' is ACL_RESRC_MAX_LEN
return fopen(SVR_DB_FILE_NAME, mode);
}
+static int peerCertCallback(void *ctx, const mbedtls_x509_crt *cert, int depth)
+{
+ (void)ctx;
+
+ OIC_LOG_V(DEBUG, TAG, "Depth : %d", depth);
+ OIC_LOG_V(DEBUG, TAG, "IN %s", __func__);
+ OIC_LOG(DEBUG, TAG, "***** Serial number of certificate is below *****");
+ OIC_LOG_BUFFER(DEBUG, TAG, cert->serial.p, cert->serial.len);
+ OIC_LOG(DEBUG, TAG, "***** Serial number of certificate is above *****");
+ OIC_LOG_V(DEBUG, TAG, "OUT%s", __func__);
+
+ return 0;
+}
+
static int waitCallbackRet(void)
{
for(int i=0; !g_doneCB && CALLBACK_TIMEOUT>i; ++i)
}
}
+ if(!g_doneCB)
+ {
+ OCPDMCleanupForTimeout();
+ }
+
return 0;
}
}
#endif
+static void secureStorageHwEmulation()
+{
+ printf(" Enable Secure Storage HW Emulation\n");
+
+ printf(" Enter Own Certificate File Path[~4095]: ");
+ char cert_filepath[4096] = {0,};
+ for(int ret=0; 1!=ret; )
+ {
+ ret = scanf("%255s", cert_filepath);
+ for( ; 0x20<=getchar(); ); // for removing overflow garbages
+ // '0x20<=code' is character region
+ }
+
+ printf(" Enter Private Key File Path[~4095]: ");
+ char key_filepath[4096] = {0,};
+ for(int ret=0; 1!=ret; )
+ {
+ ret = scanf("%255s", key_filepath);
+ for( ; 0x20<=getchar(); ); // for removing overflow garbages
+ // '0x20<=code' is character region
+ }
+
+ printf(" Enter Password for Key Password[~31][Press (Enter) to not set]: ");
+ char pwd[32] = {0,};
+ for(int i=0; i < 31; i++)
+ {
+ pwd[i] = (char)getchar();
+ if (0x20 <= pwd[i])
+ {
+ pwd[i--] = '\0';
+ continue;
+ }
+ if (0x0A == pwd[i])
+ {
+ pwd[i] = '\0';
+ break;
+ }
+ }
+
+ if (0 != SSemulSetCertkeyFilepath(cert_filepath, key_filepath, pwd))
+ {
+ printf(" Fail to set cert/key file path");
+ return;
+ }
+
+ if (0 != SetHwPkixCallbacks(HWGetKeyContext,
+ HWFreeKeyContext,
+ HWGetOwnCertificateChain,
+ HWSetupPkContext))
+ {
+ printf(" Fail to regist HW Pkix Callbacks");
+ return;
+ }
+ printf(" Success to regist HW Pkix Callbacks");
+}
+
+static void selectVerifMethod()
+{
+ int option;
+ printf(" Select verification method for ownership transfer\n");
+ printf(" 0 - No verification\n");
+ printf(" 1 - Display only\n");
+ printf(" 2 - Confirm only\n");
+ printf(" 3 - Both Display and Confirm\n");
+
+ for(int ret=0; 1!=ret; )
+ {
+ ret = scanf("%d",&option);
+ for( ; 0x20<=getchar(); ); // for removing overflow garbages
+ // '0x20<=code' is character region
+ }
+
+ if(0 > option || 3 < option)
+ {
+ printf("Invalid option!");
+ }
+ SetVerifyOption((VerifyOptionBitmask_t) option);
+ printf("Option %d chosen!", option);
+}
+
static void printMenu(void)
{
printf("************************************************************\n");
printf("** [A] DISCOVER DEVICES ON NETWORK\n");
printf("** 10. Discover All Un/Owned Devices on Network\n");
printf("** 11. Discover Only Unowned Devices on Network\n");
-#ifdef _ENABLE_MULTIPLE_OWNER_
+#ifdef MULTIPLE_OWNER
printf("** 12. Discover Only Owned Devices on Network\n");
printf("** 13. Discover Multiple Ownership Transfer Enabled Devices on Network\n\n");
#else
printf("** 12. Discover Only Owned Devices on Network\n\n");
-#endif //_ENABLE_MULTIPLE_OWNER_
+#endif //MULTIPLE_OWNER
printf("** [B] REGISTER/OWN ALL DISCOVERED UNOWNED DEVICES\n");
printf("** 20. Register/Own All Discovered Unowned Devices\n\n");
printf("** [E] REMOVE THE SELECTED DEVICE\n");
printf("** 50. Remove the Selected Device\n");
printf("** 51. Remove Device with UUID (UUID input is required)\n");
- printf("** 52. Reset the Selected Device\n\n");
+ printf("** 52. Reset the Selected Device\n");
+ printf("** 53. Reset SVR DB\n\n");
printf("** [F] GET SECURITY RESOURCE FOR DEBUGGING ONLY\n");
printf("** 60. Get the Credential resources of the Selected Device\n");
printf("** 61. Get the ACL resources of the Selected Device\n\n");
-#ifdef _ENABLE_MULTIPLE_OWNER_
+#ifdef MULTIPLE_OWNER
printf("** [G] UPDATE THE MULTIPLE OWNERSHIP TRANSFER RELATED VALUE\n");
printf("** 70. Change the Multiple Ownership transfer MODE(update mom)\n");
printf("** 71. Provision Preconfigured PIN\n");
- printf("** 72. Change the Multiple Ownership transfer METHOD(update oxmsel)\n\n");
-#endif //_ENABLE_MULTIPLE_OWNER_
+ printf("** 72. Change the Multiple Ownership transfer METHOD(update oxmsel)\n");
+ printf("** 73. Remove Sub-Owner from Resource Server\n");
+ printf("** 74. Remove All Sub-Owner from Resource Server\n\n");
+#endif //MULTIPLE_OWNER
#ifdef __WITH_TLS__
- printf("** [H] SELECT SECURE PROTOCOL DTLS/TLS\n");
- printf("** 80. Select secure protocol(default DTLS)\n\n");
-
- printf("** [I] EXIT PROVISIONING CLIENT\n");
+ printf("** [H] SELECT SECURE PROTOCOL DTLS/TLS AND OTHERS\n");
+ printf("** 80. Select secure protocol(default DTLS)\n");
+ printf("** 81. Select verification method\n");
+ printf("** 82. Enable secure storage hw emulation\n\n");
#else
- printf("** [H] EXIT PROVISIONING CLIENT\n");
+ printf("** [H] SELECT VERIFICATION OPTION\n");
+ printf("** 81. Select verification method\n\n");
#endif
+ printf("** [I] EXIT PROVISIONING CLIENT\n");
printf("** 99. Exit Provisionong Client\n\n");
}
#endif
+/**
+ * Sample implementation of Export key block and master secret
+ *
+ * @param[in] p_expkey Context for the callback
+ * @aram[in] ms Pointer to master secret (fixed length: 48 bytes)
+ * @param[in] kb Pointer to key block, see RFC 5246 section 6.3
+ * (variable length: 2 * maclen + 2 * keylen + 2 * ivlen).
+ * @param[in] maclen MAC length
+ * @param[in] keylen Key length
+ * @param[in] ivlen IV length
+ */
+static void SslExportKeysCallback(const unsigned char* masterSecret,
+ const unsigned char* keyBlock,
+ size_t macLen, size_t keyLen, size_t ivLen)
+{
+ OIC_LOG_V(INFO, TAG, "In %s ", __func__);
+
+ OIC_LOG(INFO, TAG, "[MASTER SECRET] : ");
+ OIC_LOG_BUFFER(INFO, TAG, masterSecret, 48);
+
+ OIC_LOG(INFO, TAG, "[KEY BLOCK] : ");
+ OIC_LOG_BUFFER(INFO, TAG, keyBlock, (2 * macLen) + (2 * keyLen) + (2 * ivLen));
+
+ OIC_LOG_V(INFO, TAG, "Mac Length = %zu, Key Length = %zu, IV Length = %zu",
+ macLen, keyLen, ivLen);
+
+ OIC_LOG_V(INFO, TAG, "Out %s ", __func__);
+}
+
// main function for provisioning client using C-level provisioning API
int main()
{
goto PMCLT_ERROR;
}
+ if (CA_STATUS_OK !=
+ CASetSslExportKeysCallback(SslExportKeysCallback, CA_SSL_EKCB_DTLS, CA_SSL_EKCB_CLIENT))
+ {
+ OIC_LOG(ERROR, TAG, "Failed to register the (D)TLS export Key Callback!");
+ goto PMCLT_ERROR;
+ }
+
// Client can choose a allowed/not-allowed OxM method.
if(OC_STACK_OK != OCSetOxmAllowStatus(OIC_DECENTRALIZED_PUBLIC_KEY, false))
{
OIC_LOG(WARNING, TAG, "Failed to disable OIC_DECENTRALIZED_PUBLIC_KEY OxM");
}
-#ifdef _ENABLE_MULTIPLE_OWNER_
+ // set callbacks for verification options
+ SetDisplayNumCB(NULL, displayNumCB);
+ SetUserConfirmCB(NULL, confirmNumCB);
+ SetInputStateCB(NULL, notifyInputStateCB);
+
+ // set callback for checking peer certificate information
+ OCSetPeerCertCallback(NULL, peerCertCallback);
+
+#ifdef MULTIPLE_OWNER
SetPreconfigPin("12341234", 8);
-#endif //_ENABLE_MULTIPLE_OWNER_
+#endif //MULTIPLE_OWNER
// main loop for provisioning manager
int mn_num = 0;
OIC_LOG(ERROR, TAG, "_12_DISCOV_OWN_DEVS_: error");
}
break;
-#ifdef _ENABLE_MULTIPLE_OWNER_
+#ifdef MULTIPLE_OWNER
case _13_MOT_DISCOV_DEV_:
if(discoverMOTEnabledDevices())
{
OIC_LOG(ERROR, TAG, "_13_MOT_DISCOV_DEV_: error");
}
break;
-#endif //_ENABLE_MULTIPLE_OWNER_
+#endif //MULTIPLE_OWNER
case _20_REGIST_DEVS_:
if(registerDevices())
{
OIC_LOG(ERROR, TAG, "_52_RESET_SELEC_DEV_: error");
}
break;
+ case _53_RESET_SVR_DB_:
+ if(resetSVRDB())
+ {
+ OIC_LOG(ERROR, TAG, "_53_RESET_SVR_DB_: error");
+ }
+ break;
case _60_GET_CRED_:
if(getCred())
{
OIC_LOG(ERROR, TAG, "_61_GET_ACL_: error");
}
break;
-#ifdef _ENABLE_MULTIPLE_OWNER_
+#ifdef MULTIPLE_OWNER
case _70_MOT_CHANGE_MOM_:
if(changeMultipleOwnershipTrnasferMode())
{
OIC_LOG(ERROR, TAG, "_72_MOT_OXM_SEL_: error");
}
break;
-#endif //_ENABLE_MULTIPLE_OWNER_
+ case _73_MOT_REMOVE_SUBOWNER_:
+ if(removeSubOwner())
+ {
+ OIC_LOG(ERROR, TAG, "_73_MOT_REMOVE_SUBOWNER_ : error");
+ }
+ break;
+ case _74_MOT_REMOVE_ALL_SUBOWNER_:
+ if(removeAllSubOwner())
+ {
+ OIC_LOG(ERROR, TAG, "_74_MOT_REMOVE_ALL_SUBOWNER_ : error");
+ }
+ break;
+#endif //MULTIPLE_OWNER
#ifdef __WITH_TLS__
case _80_SELECT_PROTOCOL_:
selectSecureProtocol();
break;
#endif
+ case _81_SELECT_VERIF_METHOD_:
+ selectVerifMethod();
+ break;
+ case _82_SECURE_STORAGE_HW_EMULATION_:
+ secureStorageHwEmulation();
+ break;
case _99_EXIT_PRVN_CLT_:
goto PMCLT_ERROR;
default:
}
OCDeleteDiscoveredDevices(g_own_list); // after here |g_own_list| points nothing
OCDeleteDiscoveredDevices(g_unown_list); // after here |g_unown_list| points nothing
-#ifdef _ENABLE_MULTIPLE_OWNER_
+#ifdef MULTIPLE_OWNER
OCDeleteDiscoveredDevices(g_mot_enable_list); // after here |g_motdev_list| points nothing
-#endif //_ENABLE_MULTIPLE_OWNER_
+#endif //MULTIPLE_OWNER
if(g_svr_fname)
{
projects / platform / upstream / iotivity.git / blobdiff