From af2c4591eca2a68cc797f0ec41a53926cdfc23d4 Mon Sep 17 00:00:00 2001
From: Chul Lee <chuls.lee@samsung.com>
Date: Tue, 8 Nov 2016 17:35:01 +0900
Subject: [PATCH] Add OIC_ prefix for security module's log.

Change-Id: I6802265094222c0d01acc000a14b9b5afdacf6ee
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14107
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
---
 resource/csdk/security/provisioning/src/cloud/aclgroup.c              | 2 +-
 resource/csdk/security/provisioning/src/cloud/aclid.c                 | 2 +-
 resource/csdk/security/provisioning/src/cloud/aclinvite.c             | 2 +-
 resource/csdk/security/provisioning/src/cloud/crl.c                   | 2 +-
 resource/csdk/security/provisioning/src/cloud/csr.c                   | 2 +-
 resource/csdk/security/provisioning/src/cloud/utils.c                 | 2 +-
 resource/csdk/security/provisioning/src/credentialgenerator.c         | 2 +-
 .../csdk/security/provisioning/src/multipleownershiptransfermanager.c | 2 +-
 resource/csdk/security/provisioning/src/ocprovisioningmanager.c       | 4 ++--
 resource/csdk/security/provisioning/src/ownershiptransfermanager.c    | 2 +-
 resource/csdk/security/provisioning/src/oxmjustworks.c                | 2 +-
 resource/csdk/security/provisioning/src/oxmpreconfpin.c               | 2 +-
 resource/csdk/security/provisioning/src/oxmrandompin.c                | 2 +-
 resource/csdk/security/provisioning/src/pmutility.c                   | 2 +-
 resource/csdk/security/provisioning/src/provisioningdatabasemanager.c | 2 +-
 resource/csdk/security/provisioning/src/secureresourceprovider.c      | 2 +-
 resource/csdk/security/src/aclresource.c                              | 2 +-
 resource/csdk/security/src/amaclresource.c                            | 2 +-
 resource/csdk/security/src/amsmgr.c                                   | 2 +-
 resource/csdk/security/src/credresource.c                             | 2 +-
 resource/csdk/security/src/crlresource.c                              | 2 +-
 resource/csdk/security/src/directpairing.c                            | 2 +-
 resource/csdk/security/src/doxmresource.c                             | 2 +-
 resource/csdk/security/src/dpairingresource.c                         | 2 +-
 resource/csdk/security/src/oxmpincommon.c                             | 2 +-
 resource/csdk/security/src/pbkdf2.c                                   | 2 +-
 resource/csdk/security/src/pconfresource.c                            | 2 +-
 resource/csdk/security/src/pkix_interface.c                           | 2 +-
 resource/csdk/security/src/policyengine.c                             | 2 +-
 resource/csdk/security/src/psinterface.c                              | 2 +-
 resource/csdk/security/src/pstatresource.c                            | 2 +-
 resource/csdk/security/src/resourcemanager.c                          | 2 +-
 resource/csdk/security/src/secureresourcemanager.c                    | 2 +-
 resource/csdk/security/src/srmutility.c                               | 2 +-
 resource/csdk/security/src/svcresource.c                              | 2 +-
 resource/csdk/security/src/verresource.c                              | 2 +-
 resource/csdk/security/tool/json2cbor.c                               | 2 +-
 37 files changed, 38 insertions(+), 38 deletions(-)
 mode change 100755 => 100644 resource/csdk/security/src/policyengine.c

diff --git a/resource/csdk/security/provisioning/src/cloud/aclgroup.c b/resource/csdk/security/provisioning/src/cloud/aclgroup.c
index 3ca900c..f15e0af 100644
--- a/resource/csdk/security/provisioning/src/cloud/aclgroup.c
+++ b/resource/csdk/security/provisioning/src/cloud/aclgroup.c
@@ -30,7 +30,7 @@
 #include "pmutility.h"
 #include "cacommonutil.h"
 
-#define TAG "CLOUD-ACL-GROUP"
+#define TAG "OIC_CLOUD_ACL_GROUP"
 
 /**
  * ACL create group request received data handler
diff --git a/resource/csdk/security/provisioning/src/cloud/aclid.c b/resource/csdk/security/provisioning/src/cloud/aclid.c
index d5cd116..e2424db 100644
--- a/resource/csdk/security/provisioning/src/cloud/aclid.c
+++ b/resource/csdk/security/provisioning/src/cloud/aclid.c
@@ -31,7 +31,7 @@
 #include "payload_logging.h"
 #include "utlist.h"
 
-#define TAG "CLOUD-ACL-ID"
+#define TAG "OIC_CLOUD_ACL_ID"
 
 /**
  * ACL Id parse from received response
diff --git a/resource/csdk/security/provisioning/src/cloud/aclinvite.c b/resource/csdk/security/provisioning/src/cloud/aclinvite.c
index 600a604..78d1097 100644
--- a/resource/csdk/security/provisioning/src/cloud/aclinvite.c
+++ b/resource/csdk/security/provisioning/src/cloud/aclinvite.c
@@ -31,7 +31,7 @@
 #include "pmutility.h"
 #include "cacommonutil.h"
 
-#define TAG "CLOUD-ACL-INVITE"
+#define TAG "OIC_CLOUD_ACL_INVITE"
 
 /**
  * This helper function parses "name" : { "gid":[], "mid":[] } payload
diff --git a/resource/csdk/security/provisioning/src/cloud/crl.c b/resource/csdk/security/provisioning/src/cloud/crl.c
index 84e228f..3ed179c 100644
--- a/resource/csdk/security/provisioning/src/cloud/crl.c
+++ b/resource/csdk/security/provisioning/src/cloud/crl.c
@@ -33,7 +33,7 @@
 #include "payload_logging.h"
 #include "cacommonutil.h"
 
-#define TAG "CLOUD-CRL"
+#define TAG "OIC_CLOUD_CRL"
 
 /**
  * CRL GET request received data handler
diff --git a/resource/csdk/security/provisioning/src/cloud/csr.c b/resource/csdk/security/provisioning/src/cloud/csr.c
index 5765c5e..eab8412 100644
--- a/resource/csdk/security/provisioning/src/cloud/csr.c
+++ b/resource/csdk/security/provisioning/src/cloud/csr.c
@@ -49,7 +49,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#define TAG "CLOUD-CSR"
+#define TAG "OIC_CLOUD_CSR"
 
 //TODO: is it required in CSR response?
 static OCByteString privateKey = {0, 0};
diff --git a/resource/csdk/security/provisioning/src/cloud/utils.c b/resource/csdk/security/provisioning/src/cloud/utils.c
index da92219..9bcde50 100644
--- a/resource/csdk/security/provisioning/src/cloud/utils.c
+++ b/resource/csdk/security/provisioning/src/cloud/utils.c
@@ -26,7 +26,7 @@
 #include "srmutility.h"
 #include "pmutility.h"
 
-#define TAG "CLOUD-UTILS"
+#define TAG "OIC_CLOUD_UTILS"
 
 typedef struct {
     void *ctx;
diff --git a/resource/csdk/security/provisioning/src/credentialgenerator.c b/resource/csdk/security/provisioning/src/credentialgenerator.c
index cc39080..623ad74 100644
--- a/resource/csdk/security/provisioning/src/credentialgenerator.c
+++ b/resource/csdk/security/provisioning/src/credentialgenerator.c
@@ -30,7 +30,7 @@
 #include "stdbool.h"
 #include "securevirtualresourcetypes.h"
 
-#define TAG "SRPAPI-CG"
+#define TAG "OIC_SRPAPI_CG"
 
 OCStackResult PMGeneratePairWiseCredentials(OicSecCredType_t type, size_t keySize,
         const OicUuid_t *ptDeviceId, const OicUuid_t *firstDeviceId,
diff --git a/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c b/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
index 0537f9d..09ed4b4 100644
--- a/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
+++ b/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
@@ -59,7 +59,7 @@
 #include "oxmpreconfpin.h"
 #include "oxmrandompin.h"
 
-#define TAG "MULTIPLE_OTM"
+#define TAG "OIC_MULTIPLE_OTM"
 
 /**********************************************************************
  * API for Super Owner
diff --git a/resource/csdk/security/provisioning/src/ocprovisioningmanager.c b/resource/csdk/security/provisioning/src/ocprovisioningmanager.c
index 7246250..cb798da 100644
--- a/resource/csdk/security/provisioning/src/ocprovisioningmanager.c
+++ b/resource/csdk/security/provisioning/src/ocprovisioningmanager.c
@@ -36,7 +36,7 @@
 #include "aclresource.h" //Note: SRM internal header
 #include "pconfresource.h"
 
-#define TAG "OCPMAPI"
+#define TAG "OIC_OCPMAPI"
 
 typedef struct Linkdata Linkdata_t;
 struct Linkdata
@@ -188,7 +188,7 @@ OCStackResult OCDiscoverMultipleOwnedDevices(unsigned short timeout, OCProvision
  * @return OC_STACK_OK in case of success and other value otherwise.
  */
 OCStackResult OCAddPreconfigPin(const OCProvisionDev_t *targetDeviceInfo,
-                                const char *preconfigPin, 
+                                const char *preconfigPin,
                                 size_t preconfigPinLen)
 {
     return MOTAddPreconfigPIN(targetDeviceInfo, preconfigPin, preconfigPinLen);
diff --git a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c
index eef6ba6..133f6cb 100644
--- a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c
+++ b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c
@@ -73,7 +73,7 @@
 #include "ocpayload.h"
 #include "payload_logging.h"
 
-#define TAG "OTM"
+#define TAG "OIC_OTM"
 
 /**
  * Variables for pointing the OTMContext to be used in the DTLS handshake result callback.
diff --git a/resource/csdk/security/provisioning/src/oxmjustworks.c b/resource/csdk/security/provisioning/src/oxmjustworks.c
index 90b8dfe..90ee407 100644
--- a/resource/csdk/security/provisioning/src/oxmjustworks.c
+++ b/resource/csdk/security/provisioning/src/oxmjustworks.c
@@ -30,7 +30,7 @@
 #include "pmtypes.h"
 #include "ownershiptransfermanager.h"
 
-#define TAG "OXM_JustWorks"
+#define TAG "OIC_OXM_JustWorks"
 
 OCStackResult CreateJustWorksSelectOxmPayload(OTMContext_t *otmCtx, uint8_t **payload, size_t *size)
 {
diff --git a/resource/csdk/security/provisioning/src/oxmpreconfpin.c b/resource/csdk/security/provisioning/src/oxmpreconfpin.c
index 193a73a..ecdeb35 100644
--- a/resource/csdk/security/provisioning/src/oxmpreconfpin.c
+++ b/resource/csdk/security/provisioning/src/oxmpreconfpin.c
@@ -37,7 +37,7 @@
 #include "pinoxmcommon.h"
 #include "srmresourcestrings.h"
 
-#define TAG "OXM_PreconfigPIN"
+#define TAG "OIC_OXM_PreconfigPIN"
 
 OCStackResult CreatePreconfigPinBasedSelectOxmPayload(OTMContext_t *otmCtx, uint8_t **payload, size_t *size)
 {
diff --git a/resource/csdk/security/provisioning/src/oxmrandompin.c b/resource/csdk/security/provisioning/src/oxmrandompin.c
index 174b5a4..dcf7214 100644
--- a/resource/csdk/security/provisioning/src/oxmrandompin.c
+++ b/resource/csdk/security/provisioning/src/oxmrandompin.c
@@ -36,7 +36,7 @@
 #include "ownershiptransfermanager.h"
 #include "pinoxmcommon.h"
 
-#define TAG "OXM_RandomPIN"
+#define TAG "OIC_OXM_RandomPIN"
 
 OCStackResult CreatePinBasedSelectOxmPayload(OTMContext_t* otmCtx, uint8_t **payload, size_t *size)
 {
diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c
index b5c6d9d..2f45b0c 100644
--- a/resource/csdk/security/provisioning/src/pmutility.c
+++ b/resource/csdk/security/provisioning/src/pmutility.c
@@ -49,7 +49,7 @@
 
 #include "srmutility.h"
 
-#define TAG ("PM-UTILITY")
+#define TAG ("OIC_PM_UTILITY")
 
 typedef struct _DiscoveryInfo{
     OCProvisionDev_t    **ppDevicesList;
diff --git a/resource/csdk/security/provisioning/src/provisioningdatabasemanager.c b/resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
index 1796ab0..b0cf0f1 100644
--- a/resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
+++ b/resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
@@ -34,7 +34,7 @@
 
 #define DB_FILE "PDM.db"
 
-#define TAG "PDM"
+#define TAG "OIC_PDM"
 
 #define PDM_STALE_STATE 1
 #define PDM_ACTIVE_STATE 0
diff --git a/resource/csdk/security/provisioning/src/secureresourceprovider.c b/resource/csdk/security/provisioning/src/secureresourceprovider.c
index be479ea..73a060c 100644
--- a/resource/csdk/security/provisioning/src/secureresourceprovider.c
+++ b/resource/csdk/security/provisioning/src/secureresourceprovider.c
@@ -49,7 +49,7 @@
 #include "crlresource.h"
 #endif // WITH_X509__
 
-#define TAG "SRPAPI"
+#define TAG "OIC_SRPAPI"
 
 /**
  * Macro to verify argument is not equal to NULL.
diff --git a/resource/csdk/security/src/aclresource.c b/resource/csdk/security/src/aclresource.c
index d774ffa..30a7ba5 100644
--- a/resource/csdk/security/src/aclresource.c
+++ b/resource/csdk/security/src/aclresource.c
@@ -46,7 +46,7 @@
 
 #include "security_internals.h"
 
-#define TAG  "SRM-ACL"
+#define TAG  "OIC_SRM_ACL"
 #define NUMBER_OF_SEC_PROV_RSCS 4
 #define NUMBER_OF_DEFAULT_SEC_RSCS 2
 #define STRING_UUID_SIZE (UUID_LENGTH * 2 + 5)
diff --git a/resource/csdk/security/src/amaclresource.c b/resource/csdk/security/src/amaclresource.c
index 8c8a35b..d7bdb2f 100644
--- a/resource/csdk/security/src/amaclresource.c
+++ b/resource/csdk/security/src/amaclresource.c
@@ -31,7 +31,7 @@
 #include "srmutility.h"
 #include "amaclresource.h"
 
-#define TAG  "SRM-AMACL"
+#define TAG  "OIC_SRM_AMACL"
 
 /** Default cbor payload size. This value is increased in case of CborErrorOutOfMemory.
  * The value of payload size is increased until reaching belox max cbor size. */
diff --git a/resource/csdk/security/src/amsmgr.c b/resource/csdk/security/src/amsmgr.c
index 3ddaac4..771f420 100644
--- a/resource/csdk/security/src/amsmgr.c
+++ b/resource/csdk/security/src/amsmgr.c
@@ -36,7 +36,7 @@
 #include "oic_string.h"
 #include "caremotehandler.h"
 
-#define TAG "SRM-AMSMGR"
+#define TAG "OIC_SRM_AMSMGR"
 
  //Callback for AMS service multicast discovery request.
 static OCStackApplicationResult AmsMgrDiscoveryCallback(void *ctx, OCDoHandle handle,
diff --git a/resource/csdk/security/src/credresource.c b/resource/csdk/security/src/credresource.c
index 74126f6..7363323 100644
--- a/resource/csdk/security/src/credresource.c
+++ b/resource/csdk/security/src/credresource.c
@@ -64,7 +64,7 @@
 #include "global.h"
 #endif
 
-#define TAG  "SRM-CREDL"
+#define TAG  "OIC_SRM_CREDL"
 
 /** Max credential types number used for TLS */
 #define MAX_TYPE 2
diff --git a/resource/csdk/security/src/crlresource.c b/resource/csdk/security/src/crlresource.c
index 33021ae..f2469ea 100644
--- a/resource/csdk/security/src/crlresource.c
+++ b/resource/csdk/security/src/crlresource.c
@@ -34,7 +34,7 @@
 #include "base64.h"
 #include <time.h>
 
-#define TAG  "SRM-CRL"
+#define TAG  "OIC_SRM_CRL"
 
 #define SEPARATOR                   ":"
 #define SEPARATOR_LEN               (1)
diff --git a/resource/csdk/security/src/directpairing.c b/resource/csdk/security/src/directpairing.c
index be6ea15..9f1dba3 100644
--- a/resource/csdk/security/src/directpairing.c
+++ b/resource/csdk/security/src/directpairing.c
@@ -61,7 +61,7 @@
 #endif
 
 
-#define TAG ("DP")
+#define TAG ("OIC_DP")
 static const uint16_t CBOR_SIZE = 1024;
 
 /**
diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c
index ed475b6..e75a965 100644
--- a/resource/csdk/security/src/doxmresource.c
+++ b/resource/csdk/security/src/doxmresource.c
@@ -52,7 +52,7 @@
 #include "srmutility.h"
 #include "pinoxmcommon.h"
 
-#define TAG  "SRM-DOXM"
+#define TAG  "OIC_SRM_DOXM"
 #define CHAR_ZERO ('0')
 
 /** Default cbor payload size. This value is increased in case of CborErrorOutOfMemory.
diff --git a/resource/csdk/security/src/dpairingresource.c b/resource/csdk/security/src/dpairingresource.c
index d005645..f46b2ed 100644
--- a/resource/csdk/security/src/dpairingresource.c
+++ b/resource/csdk/security/src/dpairingresource.c
@@ -51,7 +51,7 @@
 #include "global.h"
 #endif
 
-#define TAG  "SRM-DPAIRING"
+#define TAG  "OIC_SRM_DPAIRING"
 
 /** Default cbor payload size. This value is increased in case of CborErrorOutOfMemory.
  * The value of payload size is increased until reaching belox max cbor size. */
diff --git a/resource/csdk/security/src/oxmpincommon.c b/resource/csdk/security/src/oxmpincommon.c
index c37f241..23532cd 100644
--- a/resource/csdk/security/src/oxmpincommon.c
+++ b/resource/csdk/security/src/oxmpincommon.c
@@ -32,7 +32,7 @@
 #include "credresource.h"
 #include "cainterface.h"
 
-#define TAG "PIN_OXM_COMMON"
+#define TAG "OIC_PIN_OXM_COMMON"
 
 #define NUMBER_OF_PINNUM (10)
 #define NUMBER_OF_ALPHABET (26)
diff --git a/resource/csdk/security/src/pbkdf2.c b/resource/csdk/security/src/pbkdf2.c
index b98c51b..9bbd760 100644
--- a/resource/csdk/security/src/pbkdf2.c
+++ b/resource/csdk/security/src/pbkdf2.c
@@ -26,7 +26,7 @@
 #include "debug.h"
 #include "logger.h"
 
-#define TAG "PBDKF2"
+#define TAG "OIC_PBDKF2"
 #define XOR_BUF(in, out, bufSize)\
 do \
 {\
diff --git a/resource/csdk/security/src/pconfresource.c b/resource/csdk/security/src/pconfresource.c
index 15d5e2d..61f27e6 100644
--- a/resource/csdk/security/src/pconfresource.c
+++ b/resource/csdk/security/src/pconfresource.c
@@ -44,7 +44,7 @@
 #include <strings.h>
 #endif
 
-#define TAG  "SRM-PCONF"
+#define TAG  "OIC_SRM_PCONF"
 
 static const uint16_t CBOR_SIZE = 1024;
 static const uint64_t CBOR_MAX_SIZE = 4400;
diff --git a/resource/csdk/security/src/pkix_interface.c b/resource/csdk/security/src/pkix_interface.c
index 8949aa6..c74f34b 100644
--- a/resource/csdk/security/src/pkix_interface.c
+++ b/resource/csdk/security/src/pkix_interface.c
@@ -23,7 +23,7 @@
 #include "crlresource.h"
 #include "logger.h"
 
-#define TAG "SRM-PKIX-INTERFACE"
+#define TAG "OIC_SRM_PKIX_INTERFACE"
 
 void GetPkixInfo(PkiInfo_t * inf)
 {
diff --git a/resource/csdk/security/src/policyengine.c b/resource/csdk/security/src/policyengine.c
old mode 100755
new mode 100644
index 8c60682..b08a64f
--- a/resource/csdk/security/src/policyengine.c
+++ b/resource/csdk/security/src/policyengine.c
@@ -37,7 +37,7 @@
 #include "amaclresource.h"
 #include "credresource.h"
 
-#define TAG "SRM-PE"
+#define TAG "OIC_SRM_PE"
 
 uint16_t GetPermissionFromCAMethod_t(const CAMethod_t method)
 {
diff --git a/resource/csdk/security/src/psinterface.c b/resource/csdk/security/src/psinterface.c
index a7f87a9..4d2ea94 100644
--- a/resource/csdk/security/src/psinterface.c
+++ b/resource/csdk/security/src/psinterface.c
@@ -39,7 +39,7 @@
 #include "pstatresource.h"
 #include "doxmresource.h"
 
-#define TAG  "SRM-PSI"
+#define TAG  "OIC_SRM_PSI"
 
 //SVR database buffer block size
 #ifdef _WIN32
diff --git a/resource/csdk/security/src/pstatresource.c b/resource/csdk/security/src/pstatresource.c
index 5fa0ed3..8813297 100644
--- a/resource/csdk/security/src/pstatresource.c
+++ b/resource/csdk/security/src/pstatresource.c
@@ -33,7 +33,7 @@
 #include "srmresourcestrings.h"
 #include "srmutility.h"
 
-#define TAG  "SRM-PSTAT"
+#define TAG  "OIC_SRM_PSTAT"
 
 /** Default cbor payload size. This value is increased in case of CborErrorOutOfMemory.
  * The value of payload size is increased until reaching below max cbor size. */
diff --git a/resource/csdk/security/src/resourcemanager.c b/resource/csdk/security/src/resourcemanager.c
index c0246a8..221b873 100644
--- a/resource/csdk/security/src/resourcemanager.c
+++ b/resource/csdk/security/src/resourcemanager.c
@@ -38,7 +38,7 @@
 //#endif // DIRECT_PAIRING
 #include "verresource.h"
 
-#define TAG "SRM-RM"
+#define TAG "OIC_SRM_RM"
 
 #if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
 #include "crlresource.h"
diff --git a/resource/csdk/security/src/secureresourcemanager.c b/resource/csdk/security/src/secureresourcemanager.c
index 770e546..3a145aa 100644
--- a/resource/csdk/security/src/secureresourcemanager.c
+++ b/resource/csdk/security/src/secureresourcemanager.c
@@ -37,7 +37,7 @@
 #if defined( __WITH_TLS__) || defined(__WITH_DTLS__)
 #include "pkix_interface.h"
 #endif //__WITH_TLS__ or __WITH_DTLS__
-#define TAG  "SRM"
+#define TAG  "OIC_SRM"
 
 //Request Callback handler
 static CARequestCallback gRequestHandler = NULL;
diff --git a/resource/csdk/security/src/srmutility.c b/resource/csdk/security/src/srmutility.c
index 3131e13..b3685e2 100644
--- a/resource/csdk/security/src/srmutility.c
+++ b/resource/csdk/security/src/srmutility.c
@@ -26,7 +26,7 @@
 #include "oic_malloc.h"
 #include "base64.h"
 
-#define TAG  "SRM-UTILITY"
+#define TAG  "OIC_SRM_UTILITY"
 
 void ParseQueryIterInit(const unsigned char * query, OicParseQueryIter_t * parseIter)
 {
diff --git a/resource/csdk/security/src/svcresource.c b/resource/csdk/security/src/svcresource.c
index c14ef9b..4151f0c 100644
--- a/resource/csdk/security/src/svcresource.c
+++ b/resource/csdk/security/src/svcresource.c
@@ -34,7 +34,7 @@
 
 #include "security_internals.h"
 
-#define TAG  "SRM-SVC"
+#define TAG  "OIC_SRM_SVC"
 
 /** Default cbor payload size. This value is increased in case of CborErrorOutOfMemory.
  * The value of payload size is increased until reaching belox max cbor size. */
diff --git a/resource/csdk/security/src/verresource.c b/resource/csdk/security/src/verresource.c
index 4979170..8241a03 100644
--- a/resource/csdk/security/src/verresource.c
+++ b/resource/csdk/security/src/verresource.c
@@ -43,7 +43,7 @@
 #include "securevirtualresourcetypes.h"
 #include "srmutility.h"
 
-#define TAG  "SEC-VER"
+#define TAG  "OIC_SEC_VER"
 
 /** Default cbor payload size. This value is increased in case of CborErrorOutOfMemory.
  * The value of payload size is increased until reaching belox max cbor size. */
diff --git a/resource/csdk/security/tool/json2cbor.c b/resource/csdk/security/tool/json2cbor.c
index 765d67c..e880aaa 100644
--- a/resource/csdk/security/tool/json2cbor.c
+++ b/resource/csdk/security/tool/json2cbor.c
@@ -41,7 +41,7 @@
 #include "svcresource.h"
 #include "security_internals.h"
 
-#define TAG  "JSON2CBOR"
+#define TAG  "OIC_JSON2CBOR"
 #define MAX_RANGE   ((size_t)-1)
 //SVR database buffer block size
 static const size_t DB_FILE_SIZE_BLOCK = 1023;
-- 
2.7.4