Remove unused old API.

 - delete registerSecurityCallbackHandler api.

Change-Id: I0d4c31af7ac9d5d25c260cf07f5ebf38381609ea
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13081
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 071b2cf0e75cae68b8441552dbbc660d158489d9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13197

diff --git a/service/easy-setup/mediator/richsdk/inc/RemoteEnrollee.h b/service/easy-setup/mediator/richsdk/inc/RemoteEnrollee.h
index e1ce4f3240c42efb42ff19d811aa318781667cc9..a58dacb28ea0b18e7527eb75287abcabc0953cec 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/inc/RemoteEnrollee.h
+++ b/service/easy-setup/mediator/richsdk/inc/RemoteEnrollee.h
@@ -52,23 +52,6 @@ namespace OIC
         public:
             ~RemoteEnrollee() = default;
 
-#ifdef __WITH_DTLS__
-            /**
-             * Register Security status and other information callback handlers.
-             *
-             * @param secProvisioningDbCb Callback to be invoked when the stack expects a
-             *        path for the provisioning db.
-             * @param securityPinCb Callback to get security pin during pin based ownership transfer.
-             *
-             * @throws InvalidParameterException If callback is an empty function or null.
-             * @throws ESBadRequestException If registration is already completed.
-             *
-             * @see SecProvisioningResult
-             */
-            ESResult registerSecurityCallbackHandler(const SecurityPinCb securityPinCb,
-                    const SecProvisioningDbPathCb secProvisioningDbPathCb);
-#endif //__WITH_DTLS__
-
             /**
              * Get an Enrollee's status which includes provisioning status and last error code
              *

diff --git a/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp b/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
index a7a30d0e6c3a7cb03a3d54863330ed6d1f6265a8..8912859d108f479adf6395f938f9759b8e7dacb6 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
+++ b/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
@@ -58,16 +58,6 @@ namespace OIC
             m_ocResource = resource;
         }
 
-        void EnrolleeSecurity::registerCallbackHandler(
-            const SecurityProvStatusCb securityProvStatusCb,
-            const SecurityPinCb securityPinCb,
-            const SecProvisioningDbPathCb secProvisioningDbPathCb)
-        {
-            m_securityProvStatusCb = securityProvStatusCb;
-            m_securityPinCb = securityPinCb;
-            m_secProvisioningDbPathCb = secProvisioningDbPathCb;
-        }
-
         void EnrolleeSecurity::convertUUIDToString(const uint8_t uuid[UUID_SIZE],
                                                               std::string& uuidString)
         {

diff --git a/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h b/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h
index 4a4e4c1ae227754f39d4751fede6fcff6345f150..5ea2f87c6fc682bb0f7f4135cc24343442a395be 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h
+++ b/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h
@@ -52,10 +52,6 @@ namespace OIC
         public:
             EnrolleeSecurity(std::shared_ptr< OC::OCResource > resource,
             const std::string secDbPath);
-            void registerCallbackHandler(
-                const SecurityProvStatusCb securityProvStatusCb,
-                const SecurityPinCb securityPinCb,
-                const SecProvisioningDbPathCb secProvisioningDbPathCb);
             ESResult provisionOwnership();
             std::string getUUID() const;
 

diff --git a/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp b/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
index e23f2c24f2e5e9ca0b12566fbeaf3f1c6416a9d5..6fec143ed25e638e0122664ae4fe4002476f8327 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
+++ b/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
@@ -53,22 +53,6 @@ namespace OIC
             m_deviceId = resource->sid();
         }
 
-#ifdef __WITH_DTLS__
-        ESResult RemoteEnrollee::registerSecurityCallbackHandler(
-                const SecurityPinCb securityPinCb,
-                const SecProvisioningDbPathCb secProvisioningDbPathCb)
-        {
-            // No need to check NULL for m_secProvisioningDbPathCB as this is not a mandatory
-            // callback function. If m_secProvisioningDbPathCB is NULL, provisioning manager
-            // in security layer will try to find the PDM.db file in the local path.
-            // If PDM.db is found, the provisioning manager operations will succeed.
-            // Otherwise all the provisioning manager operations will fail.
-            m_secProvisioningDbPathCb = secProvisioningDbPathCb;
-            m_securityPinCb = securityPinCb;
-            return ES_OK;
-        }
-#endif //__WITH_DTLS__
-
         void RemoteEnrollee::securityStatusHandler(
                 const std::shared_ptr< SecProvisioningStatus > status) const
         {
@@ -238,9 +222,6 @@ namespace OIC
             //TODO : DBPath is passed empty as of now. Need to take dbpath from application.
             m_enrolleeSecurity = std::make_shared <EnrolleeSecurity> (m_ocResource, "");
 
-            m_enrolleeSecurity->registerCallbackHandler(securityProvStatusCb, m_securityPinCb,
-                                                        m_secProvisioningDbPathCb);
-
             res = m_enrolleeSecurity->provisionOwnership();
 
             std::shared_ptr< SecProvisioningStatus > securityProvisioningStatus =