X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fsecurity%2Finclude%2Finternal%2Fsrmresourcestrings.h;h=28cb3cb6c215cc7b682c37ad307d3804c886a428;hb=c315c87e07c4080ecd0ef488e7a1047bc3c509b2;hp=c1900acc5b7aa00d0242f138aa2266e975970da4;hpb=442026128ead8780fa45d0db8a6f17be7c9220e0;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/security/include/internal/srmresourcestrings.h b/resource/csdk/security/include/internal/srmresourcestrings.h
index c1900ac..28cb3cb 100644
--- a/resource/csdk/security/include/internal/srmresourcestrings.h
+++ b/resource/csdk/security/include/internal/srmresourcestrings.h
@@ -23,9 +23,12 @@
 
 #include "securevirtualresourcetypes.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern const char * SVR_DB_FILE_NAME;
 extern const char * SVR_DB_DAT_FILE_NAME;
-extern const char * OIC_MI_DEF;
 
 //AMACL
 extern const char * OIC_RSRC_TYPE_SEC_AMACL;
@@ -66,11 +69,6 @@ extern const char * OIC_RSRC_TYPE_SEC_SACL;
 extern const char * OIC_RSRC_SACL_URI;
 extern const char * OIC_JSON_SACL_NAME;
 
-//SVC
-extern const char * OIC_RSRC_TYPE_SEC_SVC;
-extern const char * OIC_RSRC_SVC_URI;
-extern const char * OIC_JSON_SVC_NAME;
-
 //PCONF
 extern const char * OIC_RSRC_TYPE_SEC_PCONF;
 extern const char * OIC_RSRC_PCONF_URI;
@@ -86,6 +84,9 @@ extern const char * OIC_RSRC_TYPE_SEC_VER;
 extern const char * OIC_RSRC_VER_URI;
 extern const char * OIC_JSON_VER_NAME;
 
+//reset profile
+extern const char * OIC_JSON_RESET_PF_NAME;
+
 extern const char * OIC_JSON_SUBJECT_NAME;
 extern const char * OIC_JSON_SUBJECTID_NAME;
 extern const char * OIC_JSON_RESOURCES_NAME;
@@ -95,9 +96,15 @@ extern const char * OIC_JSON_PERMISSION_NAME;
 extern const char * OIC_JSON_OWNERS_NAME;
 extern const char * OIC_JSON_OWNER_NAME;
 extern const char * OIC_JSON_DEVOWNERID_NAME;
+#ifdef MULTIPLE_OWNER
+extern const char * OIC_JSON_SUBOWNERID_NAME;
+#endif //MULTIPLE_OWNER
 extern const char * OIC_JSON_OWNED_NAME;
 extern const char * OIC_JSON_OXM_NAME;
 extern const char * OIC_JSON_OXMS_NAME;
+#ifdef MULTIPLE_OWNER
+extern const char * OIC_JSON_MOM_NAME;
+#endif //MULTIPLE_OWNER
 extern const char * OIC_JSON_OXM_TYPE_NAME;
 extern const char * OIC_JSON_OXM_SEL_NAME;
 extern const char * OIC_JSON_DEVICE_ID_FORMAT_NAME;
@@ -109,7 +116,10 @@ extern const char * OIC_JSON_PRIVATEDATA_NAME;
 extern const char * OIC_JSON_PUBDATA_NAME;
 extern const char * OIC_JSON_PRIVDATA_NAME;
 extern const char * OIC_JSON_OPTDATA_NAME;
+extern const char * OIC_JSON_REVOCATION_STATUS_NAME;
+extern const char * OIC_JSON_CREDUSAGE_NAME;
 extern const char * OIC_JSON_CRMS_NAME;
+extern const char * OIC_JSON_VALIDITY_NAME;
 extern const char * OIC_JSON_PERIOD_NAME;
 extern const char * OIC_JSON_PERIODS_NAME;
 extern const char * OIC_JSON_RECURRENCES_NAME;
@@ -120,8 +130,6 @@ extern const char * OIC_JSON_CM_NAME;
 extern const char * OIC_JSON_TM_NAME;
 extern const char * OIC_JSON_OM_NAME;
 extern const char * OIC_JSON_SM_NAME;
-extern const char * OIC_JSON_SERVICE_DEVICE_ID;
-extern const char * OIC_JSON_SERVICE_TYPE;
 extern const char * OIC_JSON_SUPPORTED_CRED_TYPE_NAME;
 extern const char * OIC_JSON_DPC_NAME;
 extern const char * OIC_JSON_EDP_NAME;
@@ -138,12 +146,23 @@ extern const char * OIC_JSON_REL_NAME;
 extern const char * OIC_JSON_RT_NAME;
 extern const char * OIC_JSON_IF_NAME;
 extern const char * OIC_JSON_ROWNERID_NAME;
+#ifdef MULTIPLE_OWNER
+extern const char * OIC_JSON_EOWNERID_NAME;
+#endif //MULTIPLE_OWNER
 extern const char * OIC_JSON_ENCODING_NAME;
 extern const char * OIC_JSON_DATA_NAME;
 extern const char * OIC_JSON_SEC_V_NAME;
 
 extern const char * OIC_JSON_EMPTY_STRING;
 
+// Certificates provided by Cloud
+extern const char * TRUST_CA;
+extern const char * PRIMARY_CERT;
+
+// Certificates provided by manufacturer
+extern const char * MF_TRUST_CA;
+extern const char * MF_PRIMARY_CERT;
+
 extern OicUuid_t WILDCARD_SUBJECT_ID;
 extern OicUuid_t WILDCARD_SUBJECT_B64_ID;
 extern size_t WILDCARD_SUBJECT_ID_LEN;
@@ -153,9 +172,19 @@ extern const char * WILDCARD_RESOURCE_URI;
 extern const char * OXM_JUST_WORKS;
 extern const char * OXM_RANDOM_DEVICE_PIN;
 extern const char * OXM_MANUFACTURER_CERTIFICATE;
+#ifdef MULTIPLE_OWNER
+extern const char * OXM_PRECONF_PIN;
+#endif //MULTIPLE_OWNER
+extern const char * OXM_MV_JUST_WORKS;
+extern const char * OXM_CON_MFG_CERT;
+
+//Mutual Verified Just-Works Message Prefix
+extern const char * MUTUAL_VERIF_NUM;
 
 extern const char * OIC_SEC_ENCODING_BASE64;
 extern const char * OIC_SEC_ENCODING_RAW;
+extern const char * OIC_SEC_ENCODING_PEM;
+extern const char * OIC_SEC_ENCODING_DER;
 
 extern const char * OIC_SEC_TRUE;
 extern const char * OIC_SEC_FALSE;
@@ -166,5 +195,9 @@ extern char OIC_SEC_REST_QUERY_DELIMETER;
 //Security Version
 extern const char * DEFAULT_SEC_VERSION;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //IOTVT_SRM_RSRC_STRINGS_H