X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fsecurity%2Fsrc%2Fsrmresourcestrings.c;h=b847a3056ec8aeaf7bfde9723db39706f6496db9;hb=refs%2Ftags%2Fsubmit%2Ftizen_4.0%2F20171010.021147;hp=4dcea24076b2c93dc8f99db32406448da2e16285;hpb=495ebf2780c41444fe332c4af44de20c7e826b44;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/security/src/srmresourcestrings.c b/resource/csdk/security/src/srmresourcestrings.c
index 4dcea24..b847a30 100644
--- a/resource/csdk/security/src/srmresourcestrings.c
+++ b/resource/csdk/security/src/srmresourcestrings.c
@@ -63,11 +63,6 @@ const char * OIC_RSRC_TYPE_SEC_SACL = "oic.r.sacl";
 const char * OIC_RSRC_SACL_URI =  "/oic/sec/sacl";
 const char * OIC_JSON_SACL_NAME = "sacl";
 
-//svc
-const char * OIC_RSRC_TYPE_SEC_SVC = "oic.r.svc";
-const char * OIC_RSRC_SVC_URI =  "/oic/sec/svc";
-const char * OIC_JSON_SVC_NAME = "svc";
-
 //pconf
 const char * OIC_RSRC_TYPE_SEC_PCONF = "oic.r.pconf";
 const char * OIC_RSRC_PCONF_URI =  "/oic/sec/pconf";
@@ -94,9 +89,15 @@ const char * OIC_JSON_PERMISSION_NAME = "permission";
 const char * OIC_JSON_OWNERS_NAME = "ownrs";
 const char * OIC_JSON_OWNER_NAME = "ownr";
 const char * OIC_JSON_DEVOWNERID_NAME = "devowneruuid";
+#ifdef MULTIPLE_OWNER
+const char * OIC_JSON_SUBOWNERID_NAME = "x.org.iotivity.subowneruuid";
+#endif //MULTIPLE_OWNER
 const char * OIC_JSON_OWNED_NAME = "owned";
 const char * OIC_JSON_OXM_NAME = "oxm";
 const char * OIC_JSON_OXMS_NAME = "oxms";
+#ifdef MULTIPLE_OWNER
+const char * OIC_JSON_MOM_NAME = "x.org.iotivity.mom";
+#endif //MULTIPLE_OWNER
 const char * OIC_JSON_OXM_TYPE_NAME = "oxmtype";
 const char * OIC_JSON_OXM_SEL_NAME = "oxmsel";
 const char * OIC_JSON_DEVICE_ID_FORMAT_NAME = "didformat";
@@ -117,15 +118,14 @@ const char * OIC_JSON_PUBDATA_NAME = "pubdata";
 const char * OIC_JSON_PRIVDATA_NAME = "privdata";
 const char * OIC_JSON_OPTDATA_NAME = "optionaldata";
 const char * OIC_JSON_CREDUSAGE_NAME = "credusage";
-const char * OIC_JSON_SERVICE_DEVICE_ID = "svcdid";
-const char * OIC_JSON_SERVICE_TYPE = "svct";
+const char * OIC_JSON_REVOCATION_STATUS_NAME = "revstat";
 const char* OIC_JSON_VALIDITY_NAME = "validity";
 const char * OIC_JSON_PERIOD_NAME = "period";
 const char * OIC_JSON_PERIODS_NAME = "prds";
 const char * OIC_JSON_CRMS_NAME = "crms";
 const char * OIC_JSON_RECURRENCES_NAME = "recurrence";
 const char * OIC_JSON_SUPPORTED_CRED_TYPE_NAME = "sct";
-const char * OIC_JSON_DPC_NAME = "x.org.iotivity.dpc";
+const char * OIC_JSON_DPC_NAME = "dpc";
 const char * OIC_JSON_EDP_NAME = "edp";
 const char * OIC_JSON_PIN_NAME = "pin";
 const char * OIC_JSON_PDACL_NAME = "pdacl";
@@ -140,15 +140,23 @@ const char * OIC_JSON_REL_NAME = OC_RSRVD_REL;
 const char * OIC_JSON_RT_NAME = OC_RSRVD_RESOURCE_TYPE;
 const char * OIC_JSON_IF_NAME = OC_RSRVD_INTERFACE;
 const char * OIC_JSON_ROWNERID_NAME = "rowneruuid";
+#ifdef MULTIPLE_OWNER
+const char * OIC_JSON_EOWNERID_NAME = "x.org.iotivity.eowneruuid";
+#endif //MULTIPLE_OWNER
 const char * OIC_JSON_ENCODING_NAME = "encoding";
 const char * OIC_JSON_DATA_NAME = "data";
 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";
 
+// Certificates provided by manufacturer
+const char * MF_TRUST_CA = "mfg_trust_ca";
+const char * MF_PRIMARY_CERT = "mfg_primary_cert";
+
 OicUuid_t WILDCARD_SUBJECT_ID = {"*"};
 OicUuid_t WILDCARD_SUBJECT_B64_ID = { .id = {'2', '2', '2', '2', '2', '2', '2', '2',
                                              '2', '2', '2', '2', '2', '2', '2', '2' }};
@@ -159,6 +167,14 @@ const char * WILDCARD_RESOURCE_URI = "*";
 const char * OXM_JUST_WORKS = "oic.sec.doxm.jw";
 const char * OXM_RANDOM_DEVICE_PIN = "oic.sec.doxm.rdp";
 const char * OXM_MANUFACTURER_CERTIFICATE = "oic.sec.doxm.mfgcert";
+#ifdef MULTIPLE_OWNER
+const char * OXM_PRECONF_PIN = "x.org.iotivity.sec.doxm.pcp";
+#endif //MULTIPLE_OWNER
+const char * OXM_MV_JUST_WORKS = "x.org.iotivity.sec.doxm.mvjw";
+const char * OXM_CON_MFG_CERT = "x.org.iotivity.conmfgcert";
+
+//Mutual Verified Just-Works Message Prefix
+const char * MUTUAL_VERIF_NUM = "mutualVerifNum";
 
 //Credential data encoding methods
 const char * OIC_SEC_ENCODING_BASE64 = "oic.sec.encoding.base64";