From: Chul Lee <chuls.lee@samsung.com>
Date: Tue, 11 Oct 2016 07:53:48 +0000 (+0900)
Subject: Disable security version discovery
X-Git-Tag: 1.2.0+RC4~64
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=646a88b424c812a27c471c8851ca14d41362dbe8;p=platform%2Fupstream%2Fiotivity.git

Disable security version discovery

Change-Id: I22183fc82ef953f2fe49966406488d491de18ada
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13087
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
---

diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c
old mode 100755
new mode 100644
index 1e6f610..6f1bec1
--- a/resource/csdk/security/provisioning/src/pmutility.c
+++ b/resource/csdk/security/provisioning/src/pmutility.c
@@ -542,10 +542,6 @@ static OCStackApplicationResult SecurityVersionDiscoveryHandler(void *ctx, OCDoH
 
                 OIC_LOG(INFO, TAG, "Exiting SecVersionDiscoveryHandler.");
                 DeleteVerBinData(ptrVer);
-                if(pDInfo->isSingleDiscovery)
-                {
-                    pDInfo->isFound = true;
-                }
             }
         }
     }
@@ -630,12 +626,23 @@ static OCStackApplicationResult SecurePortDiscoveryHandler(void *ctx, OCDoHandle
                 return OC_STACK_DELETE_TRANSACTION;
             }
 
+            if(pDInfo->isSingleDiscovery)
+            {
+                pDInfo->isFound = true;
+            }
+
+/*
+ * Since security version discovery does not used anymore, disable security version discovery.
+ * Need to discussion to removing all version discovery related codes.
+ */
+#if 0
             res = SecurityVersionDiscovery(pDInfo, clientResponse);
             if(OC_STACK_OK != res)
             {
                 OIC_LOG(ERROR, TAG, "Failed to SecurityVersionDiscovery");
                 return OC_STACK_DELETE_TRANSACTION;
             }
+#endif
 
             OIC_LOG(INFO, TAG, "Exiting SecurePortDiscoveryHandler.");
         }