diff options
| author | Dmitriy Zhuravlev <d.zhuravlev@samsung.com> | 2016-01-13 09:18:20 +0000 |
|---|---|---|
| committer | Dmitriy Zhuravlev <d.zhuravlev@samsung.com> | 2016-01-14 07:25:19 +0000 |
| commit | 4072ddde979445de646eb431fd2bf85590e15828 (patch) | |
| tree | 54be783e4732281d7286a2924fc4afd00a4f99ed /resource/csdk/security/provisioning/src/oxmjustworks.c | |
| parent | 296901f09ec0136a393ef98aa752e84bff0ac06b (diff) | |
| download | iotivity-4072ddde979445de646eb431fd2bf85590e15828.tar.gz iotivity-4072ddde979445de646eb431fd2bf85590e15828.tar.bz2 iotivity-4072ddde979445de646eb431fd2bf85590e15828.zip | |
Revert "Update secure resource related modules(SRM,OTM,SRP,CKM,unit tests,samples) according to spec B."
Roll back the JSON changes for waiting until the Security Spec JSON definitions are released.
This reverts commit b578b61090303a71ae07126107c40c18238a02cd.
Change-Id: I8c520b0a99ca2dbae6c3e44ff93f5221288a4188
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Diffstat (limited to 'resource/csdk/security/provisioning/src/oxmjustworks.c')
| -rw-r--r-- | resource/csdk/security/provisioning/src/oxmjustworks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/resource/csdk/security/provisioning/src/oxmjustworks.c b/resource/csdk/security/provisioning/src/oxmjustworks.c index 5968ed97a..7a0d56132 100644 --- a/resource/csdk/security/provisioning/src/oxmjustworks.c +++ b/resource/csdk/security/provisioning/src/oxmjustworks.c @@ -40,7 +40,7 @@ char* CreateJustWorksSelectOxmPayload(OTMContext_t* otmCtx) } otmCtx->selectedDeviceInfo->doxm->oxmSel = OIC_JUST_WORKS; - return BinToDoxmJSON(otmCtx->selectedDeviceInfo->doxm, false); + return BinToDoxmJSON(otmCtx->selectedDeviceInfo->doxm); } char* CreateJustWorksOwnerTransferPayload(OTMContext_t* otmCtx) @@ -60,7 +60,7 @@ char* CreateJustWorksOwnerTransferPayload(OTMContext_t* otmCtx) memcpy(otmCtx->selectedDeviceInfo->doxm->owner.id, uuidPT.id , UUID_LENGTH); otmCtx->selectedDeviceInfo->doxm->owned = true; - return BinToDoxmJSON(otmCtx->selectedDeviceInfo->doxm, false); + return BinToDoxmJSON(otmCtx->selectedDeviceInfo->doxm); } OCStackResult LoadSecretJustWorksCallback(OTMContext_t* UNUSED_PARAM) |