Change the cred usage according to CR33(MfgCertOTMClarifications)

Change-Id: I042a93cd8acc6c0ec5f6e77f24ecb78b667b9912
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16515
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 317078b7708e6542aa84f30da44afc2f1e14e0d7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17109

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat
index c47fe43..1463162 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_mfg.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_server_mfg.dat
index 09bc734..d914a09 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_server_mfg.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_server_mfg.dat differ

diff --git a/resource/csdk/security/src/srmresourcestrings.c b/resource/csdk/security/src/srmresourcestrings.c
index 4f82686..eb9a3a4 100644 (file)
--- a/resource/csdk/security/src/srmresourcestrings.c
+++ b/resource/csdk/security/src/srmresourcestrings.c
@@ -157,12 +157,12 @@ const char * OIC_JSON_SEC_V_NAME = "secv";
 const char * OIC_JSON_EMPTY_STRING = "";
 
 // Certificates provided by Cloud
-const char * TRUST_CA = "trust_ca";
-const char * PRIMARY_CERT = "primary_cert";
+const char * TRUST_CA = "oic.sec.cred.trustca";
+const char * PRIMARY_CERT = "oic.sec.cred.cert";
 
 // Certificates provided by manufacturer
-const char * MF_TRUST_CA = "mfg_trust_ca";
-const char * MF_PRIMARY_CERT = "mfg_primary_cert";
+const char * MF_TRUST_CA = "oic.sec.cred.mfgtrustca";
+const char * MF_PRIMARY_CERT = "oic.sec.cred.mfgcert";
 
 OicUuid_t WILDCARD_SUBJECT_ID = {"*"};
 OicUuid_t WILDCARD_SUBJECT_B64_ID = { .id = {'2', '2', '2', '2', '2', '2', '2', '2',