*/
#include <jni.h>
#include "JniOcStack.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
#ifndef _Included_org_iotivity_base_DisplayPinListener
#define _Included_org_iotivity_base_DisplayPinListener
*/
#include "JniOcStack.h"
-#include "OCCloudProvisioning.h"
+#include "OCCloudProvisioning.hpp"
#include "JniOcCloudResultListener.h"
#include "JniGetAclIdByDeviceListener.h"
#include <mutex>
* //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
*/
#include "JniOcStack.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
#include "JniSecureUtils.h"
#include "oxmjustworks.h"
#include "oxmrandompin.h"
#include "JniOcStack.h"
#include "JniProvisionResultListner.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
#include <mutex>
#ifndef _Included_org_iotivity_base_OcSecureResource
*/
#include "JniOcStack.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
#ifndef _Included_org_iotivity_base_PinCheckListener
#define _Included_org_iotivity_base_PinCheckListener
*/
#include <jni.h>
#include "JniOcStack.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
#ifndef _Included_org_iotivity_base_OcProvisioning_JniProvisionResultListner
#define _Included_org_iotivity_base_OcProvisioning_JniProvisionResultListner
*/
#include "JniOcStack.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
class JniSecureUtils
{
../../include/OCResourceRequest.h \
../../include/OCResourceResponse.h \
../../include/OCResource.h \
- ../../include/OCProvisioningManager.h \
+ ../../include/OCProvisioningManager.hpp \
../../csdk/stack/include/octypes.h \
../../csdk/stack/include/ocstackconfig.h \
guides \
+++ /dev/null
-//****************************************************************\r
-//\r
-// Copyright 2016 Samsung Electronics All Rights Reserved.\r
-//\r
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the "License");\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-// http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-//\r
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
-\r
-#ifndef OC_CLOUD_PROVISIONING_CXX_H_\r
-#define OC_CLOUD_PROVISIONING_CXX_H_\r
-\r
-#include <thread>\r
-\r
-#include "occloudprovisioning.h"\r
-#include "OCApi.h"\r
-#include "OCPlatform_impl.h"\r
-#include "CAManager.h"\r
-\r
-namespace OC\r
-{\r
- typedef std::function<void(OCStackResult result, void *data)> ResponseCallBack;\r
- typedef std::function<void(OCStackResult result, std::string aclId)> AclIdResponseCallBack;\r
-\r
- /**\r
- * Context to be passed to the underlying stack. This is passed back as argument\r
- * to the callback function\r
- */\r
- struct CloudProvisionContext\r
- {\r
- ResponseCallBack callback;\r
- CloudProvisionContext(ResponseCallBack cb) : callback(cb){}\r
- };\r
-\r
- struct AclIdContext\r
- {\r
- AclIdResponseCallBack callback;\r
- AclIdContext(AclIdResponseCallBack cb) : callback(cb){}\r
- };\r
-\r
- class OCCloudProvisioning\r
- {\r
-\r
- private:\r
- OCDevAddr m_devAddr;\r
- public:\r
-\r
- /**\r
- * API to construct the CloudProvisioning\r
- * @param ipAddr address of the cloud server\r
- * @param port port of the cloud server\r
- */\r
- OCCloudProvisioning(std::string& ipAddr, uint16_t port);\r
- ~OCCloudProvisioning();\r
-\r
- void setIpAddr(std::string& ipAddr)\r
- {\r
- memcpy(m_devAddr.addr, ipAddr.c_str(), MAX_ADDR_STR_SIZE);\r
- }\r
-\r
- void setPort(uint16_t port)\r
- {\r
- m_devAddr.port = port;\r
- }\r
-\r
- /**\r
- * API to Request a certificate from the cloud\r
- * @param callback function called by the stack on completion of request\r
- * @return ::OC_STACK_OK on Success and other values otherwise\r
- */\r
- OCStackResult requestCertificate(ResponseCallBack callback);\r
-\r
- /**\r
- * API to get ACL ID for the device\r
- * @param deviceId device ID for which the Acl ID is requested\r
- * @param callback function called by the stack on completion of request\r
- * @return ::OC_STACK_OK on Success and other values otherwise\r
- */\r
- OCStackResult getAclIdByDevice(const std::string& deviceId, AclIdResponseCallBack callback);\r
-\r
- /**\r
- * API to get ACL information about the given Acl ID\r
- * @param aclId ACL ID for which the Acl information is requested\r
- * @param callback function called by the stack on completion of request\r
- * @return ::OC_STACK_OK on Success and other values otherwise\r
- */\r
- OCStackResult getIndividualAclInfo(const std::string& aclId, ResponseCallBack callback);\r
-\r
- /**\r
- * API to get certificate revocation list\r
- * @param callback function called by the stack on completion of request\r
- * @return ::OC_STACK_OK on Success and other values otherwise\r
- */\r
- OCStackResult getCRL(ResponseCallBack callback);\r
-\r
- /**\r
- * API to post the certificate revocation list to cloud\r
- * @param thisUpdate thisUpdate [mandatory param]\r
- * @param nextUpdate nextUpdate [mandatory param]\r
- * @param crl revocation list [optional]\r
- * @param serialNumbers [optional]\r
- * @param callback function called by the stack on completion of request\r
- * @return ::OC_STACK_OK on Success and other values otherwise\r
- */\r
- OCStackResult postCRL(const std::string& thisUpdate,\r
- const std::string& nextUpdate,\r
- const OCByteString *crl,\r
- const stringArray_t *serialNumbers,\r
- ResponseCallBack callback);\r
-\r
- /**\r
- * Common callback wrapper for all the callback functions.\r
- * @param ctx user context passed to the request API\r
- * @param result result of the request performed\r
- * @param data response data\r
- */\r
- static void callbackWrapper(void* ctx, OCStackResult result, void* data);\r
-\r
- /**\r
- * Callback wrapper for Acl ID get request\r
- * @param ctx user context passed to the request API\r
- * @param result result of the request performed\r
- * @param data AclID for the device\r
- */\r
- static void aclIdResponseWrapper(void* ctx, OCStackResult result, void* data);\r
- };\r
-}\r
-#endif //OC_CLOUD_PROVISIONING_CXX_H_\r
--- /dev/null
+//****************************************************************\r
+//\r
+// Copyright 2016 Samsung Electronics All Rights Reserved.\r
+//\r
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+// http://www.apache.org/licenses/LICENSE-2.0\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
+\r
+#ifndef OC_CLOUD_PROVISIONING_CXX_H_\r
+#define OC_CLOUD_PROVISIONING_CXX_H_\r
+\r
+#include <thread>\r
+\r
+#include "occloudprovisioning.h"\r
+#include "OCApi.h"\r
+#include "OCPlatform_impl.h"\r
+#include "CAManager.h"\r
+\r
+namespace OC\r
+{\r
+ typedef std::function<void(OCStackResult result, void *data)> ResponseCallBack;\r
+ typedef std::function<void(OCStackResult result, std::string aclId)> AclIdResponseCallBack;\r
+\r
+ /**\r
+ * Context to be passed to the underlying stack. This is passed back as argument\r
+ * to the callback function\r
+ */\r
+ struct CloudProvisionContext\r
+ {\r
+ ResponseCallBack callback;\r
+ CloudProvisionContext(ResponseCallBack cb) : callback(cb){}\r
+ };\r
+\r
+ struct AclIdContext\r
+ {\r
+ AclIdResponseCallBack callback;\r
+ AclIdContext(AclIdResponseCallBack cb) : callback(cb){}\r
+ };\r
+\r
+ class OCCloudProvisioning\r
+ {\r
+\r
+ private:\r
+ OCDevAddr m_devAddr;\r
+ public:\r
+\r
+ /**\r
+ * API to construct the CloudProvisioning\r
+ * @param ipAddr address of the cloud server\r
+ * @param port port of the cloud server\r
+ */\r
+ OCCloudProvisioning(std::string& ipAddr, uint16_t port);\r
+ ~OCCloudProvisioning();\r
+\r
+ void setIpAddr(std::string& ipAddr)\r
+ {\r
+ memcpy(m_devAddr.addr, ipAddr.c_str(), MAX_ADDR_STR_SIZE);\r
+ }\r
+\r
+ void setPort(uint16_t port)\r
+ {\r
+ m_devAddr.port = port;\r
+ }\r
+\r
+ /**\r
+ * API to Request a certificate from the cloud\r
+ * @param callback function called by the stack on completion of request\r
+ * @return ::OC_STACK_OK on Success and other values otherwise\r
+ */\r
+ OCStackResult requestCertificate(ResponseCallBack callback);\r
+\r
+ /**\r
+ * API to get ACL ID for the device\r
+ * @param deviceId device ID for which the Acl ID is requested\r
+ * @param callback function called by the stack on completion of request\r
+ * @return ::OC_STACK_OK on Success and other values otherwise\r
+ */\r
+ OCStackResult getAclIdByDevice(const std::string& deviceId, AclIdResponseCallBack callback);\r
+\r
+ /**\r
+ * API to get ACL information about the given Acl ID\r
+ * @param aclId ACL ID for which the Acl information is requested\r
+ * @param callback function called by the stack on completion of request\r
+ * @return ::OC_STACK_OK on Success and other values otherwise\r
+ */\r
+ OCStackResult getIndividualAclInfo(const std::string& aclId, ResponseCallBack callback);\r
+\r
+ /**\r
+ * API to get certificate revocation list\r
+ * @param callback function called by the stack on completion of request\r
+ * @return ::OC_STACK_OK on Success and other values otherwise\r
+ */\r
+ OCStackResult getCRL(ResponseCallBack callback);\r
+\r
+ /**\r
+ * API to post the certificate revocation list to cloud\r
+ * @param thisUpdate thisUpdate [mandatory param]\r
+ * @param nextUpdate nextUpdate [mandatory param]\r
+ * @param crl revocation list [optional]\r
+ * @param serialNumbers [optional]\r
+ * @param callback function called by the stack on completion of request\r
+ * @return ::OC_STACK_OK on Success and other values otherwise\r
+ */\r
+ OCStackResult postCRL(const std::string& thisUpdate,\r
+ const std::string& nextUpdate,\r
+ const OCByteString *crl,\r
+ const stringArray_t *serialNumbers,\r
+ ResponseCallBack callback);\r
+\r
+ /**\r
+ * Common callback wrapper for all the callback functions.\r
+ * @param ctx user context passed to the request API\r
+ * @param result result of the request performed\r
+ * @param data response data\r
+ */\r
+ static void callbackWrapper(void* ctx, OCStackResult result, void* data);\r
+\r
+ /**\r
+ * Callback wrapper for Acl ID get request\r
+ * @param ctx user context passed to the request API\r
+ * @param result result of the request performed\r
+ * @param data AclID for the device\r
+ */\r
+ static void aclIdResponseWrapper(void* ctx, OCStackResult result, void* data);\r
+ };\r
+}\r
+#endif //OC_CLOUD_PROVISIONING_CXX_H_\r
+++ /dev/null
-//****************************************************************
-//
-// Copyright 2015 Samsung Electronics All Rights Reserved.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-#ifndef OC_PROVISIONINGMANAGER_CXX_H_
-#define OC_PROVISIONINGMANAGER_CXX_H_
-
-#include <thread>
-
-#include "pinoxmcommon.h"
-#include "ocprovisioningmanager.h"
-#include "OCApi.h"
-#include "OCPlatform_impl.h"
-
-namespace OC
-{
- class OCSecureResource;
-
- typedef std::vector<std::shared_ptr<OCSecureResource>> DeviceList_t;
- typedef std::vector<OicUuid_t> UuidList_t;
- typedef std::vector<OCProvisionResult_t> PMResultList_t;
- typedef std::function<void(PMResultList_t *result, int hasError)> ResultCallBack;
- typedef std::function<void(uint16_t credId, uint8_t *trustCertChain,
- size_t chainSize)>CertChainCallBack;
-
- struct ProvisionContext
- {
- ResultCallBack callback;
- ProvisionContext(ResultCallBack cb) : callback(cb){}
- };
-
- struct TrustCertChainContext
- {
- CertChainCallBack callback;
- TrustCertChainContext(CertChainCallBack cb) : callback(cb){}
- };
- /**
- * This class is for credential's to be set to devices.
- * The types supported are
- * 0: no security mode
- * 1: symmetric pair-wise key
- * 2: symmetric group key
- * 4: asymmetric key
- * 8: signed asymmetric key (aka certificate)
- * 16: PIN /password
- */
- class Credential
- {
- OicSecCredType_t type;
- size_t keySize;
- public:
- Credential() = default;
- Credential(OicSecCredType_t type, size_t size) : type(type), keySize(size)
- {}
-
- /**
- * API to get credential type of device.
- * @return credential type of device.
- */
- OicSecCredType_t getCredentialType() const
- {
- return type;
- }
-
- /**
- * API to get size of credential key type.
- * @return size of credential key type.
- */
- size_t getCredentialKeySize() const
- {
- return keySize;
- }
-
- /**
- * API to set credential type of device.
- * Device can have following credential types
- * - symmetric pair-wise key
- * - symmetric group key
- * - asymmetric key
- * - signed asymmetric key (aka certificate)
- * - PIN /password
- * @param type credential type.
- */
- void setCredentialType(OicSecCredType_t type)
- {
- this->type = type;
- }
-
- /**
- * API to set size of credential key type.
- * @param keySize credential key size.
- * @note can be either 128 or 256 for symmetric pair-wise key
- */
- void setCredentialKeySize(size_t keySize)
- {
- this->keySize = keySize;
- }
- };
-
- class OCSecure
- {
- public:
- /**
- * The API is responsible for initialization of the provisioning manager. It will load
- * provisioning database which have owned device's list and their linked status.
- *
- * @param dbPath file path of the sqlite3 database.
- *
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- static OCStackResult provisionInit(const std::string& dbPath);
-
- /**
- * API is responsible for discovery of devices in it's subnet. It will list
- * all the device in subnet which are not yet owned.
- *
- * @param timeout Timeout in seconds, time until which function will listen to
- * responses from server before returning the list of devices.
- * @param list List of candidate devices to be provisioned.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- static OCStackResult discoverUnownedDevices(unsigned short timeout,
- DeviceList_t &list);
-
- /**
- * API is responsible for discovery of devices in it's subnet. It will list
- * all the device in subnet which are already owned by calling provisioning client.
- *
- * @param timeout Timeout in seconds, time until which function will listen to
- * responses from server before returning the list of devices.
- * @param list List of owned devices.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- static OCStackResult discoverOwnedDevices(unsigned short timeout,
- DeviceList_t &list);
-
- /**
- * API is responsible for discovery of devices in specified endpoint/deviceID.
- * And this function will only return the specified device's response.
- *
- * @param timeout Timeout in seconds, time until which function will listen to
- * responses from server before returning the specified device.
- * @param deviceID deviceID of target device
- * @param foundDevice OCSecureResource object of found device.
- * @return ::OC_STACK_OK in case of success and other value otherwise.\n
- * ::OC_STACK_INVALID_PARAM when deviceID is NULL or ppFoundDevice is not
- * initailized.
- */
- static OCStackResult discoverSingleDevice(unsigned short timeout,
- const OicUuid_t* deviceID,
- std::shared_ptr<OCSecureResource> &foundDevice);
-
- /**
- * API for registering Ownership transfer methods for a particular transfer Type.
- *
- * @param oxm Ownership transfer method.
- * @param callbackData CallbackData Methods for ownership transfer.
- * @param inputPin Callback method to input pin for verification.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- static OCStackResult setOwnerTransferCallbackData(OicSecOxm_t oxm,
- OTMCallbackData_t* callbackData, InputPinCallback inputPin);
-
- /**
- * API to get status of all the devices in current subnet. The status include endpoint
- * information and doxm information which can be extracted during owned and unowned
- * discovery. Along with this information, API will provide information about
- * devices' status.
- * Device can have following states
- * - ON/OFF: Device is switched on or off.
- *
- * @param timeout Wait time for the API.
- * @param ownedDevList List of owned devices.
- * @param unownedDevList List of unowned devices.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- static OCStackResult getDevInfoFromNetwork(unsigned short timeout,
- DeviceList_t &ownedDevList,
- DeviceList_t &unownedDevList);
- /**
- * Server API to register callback to display stack generated PIN.
- *
- * @param displayPin Callback Method to Display generated PIN.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- static OCStackResult setDisplayPinCB(GeneratePinCallback displayPin);
-
- /**
- * API to remove device credential and ACL from all devices in subnet.
- *
- * @param resultCallback Callback provided by API user, callback will be called when
- * credential revocation is finished.
- * @param uuid Device uuid to be revoked.
- * @param waitTimeForOwnedDeviceDiscovery Maximum wait time for owned device
- * discovery in seconds.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- static OCStackResult removeDeviceWithUuid(unsigned short waitTimeForOwnedDeviceDiscovery,
- std::string uuid,
- ResultCallBack resultCallback);
-
- /**
- * API to save ACL which has several ACE into Acl of SVR.
- *
- * @param acl ACL to be saved in Acl of SVR.
- * @return OC_STACK_OK in case of success and other value otherwise.
- */
- static OCStackResult saveACL(const OicSecAcl_t* acl);
-
-#if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
- /**
- * API to save Trust certificate chain into Cred of SVR.
- *
- * @param[in] trustCertChain Trust certificate chain to be saved in Cred of SVR.
- * @param[in] chainSize Size of trust certificate chain to be saved in Cred of SVR
- * @param[in] encodingType Encoding type of trust certificate chain to be saved in Cred of SVR
- * @param[out] credId CredId of saved trust certificate chain in Cred of SVR.
- * @return OC_STACK_OK in case of success and other value otherwise.
- */
- static OCStackResult saveTrustCertChain(uint8_t *trustCertChain, size_t chainSize,
- OicEncodingType_t encodingType, uint16_t *credId);
-
- /*
- * API to read Trust certificate chain from SVR.
- * Caller must free when done using the returned trust certificate
- * @param[in] credId CredId of trust certificate chain in SVR.
- * @param[out] trustCertChain Trust certificate chain.
- * @param[out] chainSize Size of trust certificate chain
- * @return OC_STACK_OK in case of success and other value otherwise.
- */
- static OCStackResult readTrustCertChain(uint16_t credId, uint8_t **trustCertChain,
- size_t *chainSize);
-
- /**
- * API to register Notifier for trustCertChain change.
- *
- * @param[in] TrustCertChainChangeCB trustCertChain Change will be
- * notified asynchronously. User need to "delete[]" trustCertChain
- * in the callback function.
- * @return OC_STACK_OK in case of success and other value otherwise.
- */
- static OCStackResult registerTrustCertChangeNotifier(CertChainCallBack);
-
- /**
- * API to remove Already registered Notifier.
- *
- *@return OC_STACK_OK always, kept it for symmetry.
- */
- static OCStackResult removeTrustCertChangeNotifier();
-
- /**
- * Notifier wrapper for trustCertChain change.
- *
- * @param[in] ctx User context returned in callback
- * @param[in] credId trustCertChain changed for this ID
- * @param[in] trustCertChain trustcertchain binary blob
- * @param[in] chainSize size of trustCertChain
- */
- static void certCallbackWrapper(void* ctx, uint16_t credId, uint8_t *trustCertChain,
- size_t chainSize);
-#endif // __WITH_DTLS__ || __WITH_TLS__
-
- };
-
- /**
- * This class represents a secure virtual device, which can be provisioned by the
- * provisioning client.
- */
- class OCSecureResource
- {
- private:
- std::weak_ptr<std::recursive_mutex> m_csdkLock;
- OCProvisionDev_t *devPtr; // pointer to device.
-
- public:
- OCSecureResource();
- OCSecureResource(std::weak_ptr<std::recursive_mutex> csdkLock, OCProvisionDev_t *dPtr);
-
- ~OCSecureResource();
-
- /**
- * API to provision credentials between two devices and ACLs for the devices who
- * act as a server.
- *
- * @param cred Type of credentials & key size to be provisioned to the device.
- * @param acl1 ACL for device 1. If this is not required set NULL.
- * @param device2 Second device to be provisioned.
- * @param acl2 ACL for device 2. If this is not required set NULL.
- * @param resultCallback Callback will be called when provisioning request receives
- * a response from first resource server.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- OCStackResult provisionPairwiseDevices(const Credential &cred, const OicSecAcl_t* acl1,
- const OCSecureResource &device2, const OicSecAcl_t* acl2,
- ResultCallBack resultCallback);
-
- /**
- * API to do ownership transfer for un-owned device.
- *
- * @param resultCallback Result callback function to be invoked when
- * ownership transfer finished.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- OCStackResult doOwnershipTransfer(ResultCallBack resultCallback);
-
- /**
- * API to send ACL information to resource.
- *
- * @param acl ACL to provision.
- * @param resultCallback Callback will be called when provisioning request
- * receives a response from resource server.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- OCStackResult provisionACL(const OicSecAcl_t* acl,
- ResultCallBack resultCallback);
-
- /**
- * API to provision credential to devices.
- *
- * @param cred Type of credentials to be provisioned to the device.
- * @param device2 Second device' instance, representing resource to be provisioned.
- * @param resultCallback Callback will be called when provisioning request receives
- * a response from first resource server.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- OCStackResult provisionCredentials(const Credential &cred,
- const OCSecureResource &device2,
- ResultCallBack resultCallback);
-
- /**
- * API to remove the credential & relationship between the two devices.
- *
- * @param device2 Second device information to be unlinked.
- * @param resultCallback Callback provided by API user, callback will be called when
- * device unlink is finished.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- OCStackResult unlinkDevices(const OCSecureResource &device2,
- ResultCallBack resultCallback);
-
- /**
- * API to remove device credential from all devices in subnet.
- *
- * @param resultCallback Callback provided by API user, callback will be called when
- * credential revocation is finished.
- * @param waitTimeForOwnedDeviceDiscovery Maximum wait time for owned device
- * discovery in seconds.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- OCStackResult removeDevice(unsigned short waitTimeForOwnedDeviceDiscovery,
- ResultCallBack resultCallback);
-
- /**
- * API to provision DirectPairing to devices.
- *
- * @param pconf pointer to PCONF (Pairing Configuration).
- * @param resultCallback Callback will be called when provisioning request receives
- * a response from first resource server.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- OCStackResult provisionDirectPairing(const OicSecPconf_t *pconf,
- ResultCallBack resultCallback);
-
-#if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
- /**
- * API to provision cert.
- *
- * @param type type of cred.
- * @param credId id of cert.
- * @param resultCallback Callback will be called when provisioning request
- * receives a response from resource server.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- OCStackResult provisionTrustCertChain(OicSecCredType_t type, uint16_t credId,
- ResultCallBack resultCallback);
-
-#endif // __WITH_DTLS__ or __WITH_TLS__
-
- /**
- * This method is used to get linked devices' IDs.
- *
- * @param uuidList Information about the list of linked devices uuids.
- * @return ::OC_STACK_OK in case of success and other value otherwise.
- */
- OCStackResult getLinkedDevices(UuidList_t &uuidList);
-
- /**
- * API to get the device ID of this resource.
- * @return device ID.
- */
- std::string getDeviceID();
-
- /**
- * API to get the information of device for provisioning.
- * @return @ref OCProvisionDev_t Reference provides information of device for provisioning.
- */
- OCProvisionDev_t* getDevPtr()const;
-
- /**
- * This function returns the device's IP address.
- * @return device address.
- */
- std::string getDevAddr();
-
- /**
- * This function returns the device's Status.
- * @return Device status (1 = ON and 2 = OFF).
- */
- int getDeviceStatus();
-
- /**
- * This function provides the owned status of the device.
- * @return Device owned status.
- */
- bool getOwnedStatus();
-
-
- /**
- * Common callback wrapper, which will be called from OC-APIs.
- */
- static void callbackWrapper(void* ctx, int nOfRes,
- OCProvisionResult_t *arr, bool hasError);
-
- private:
- void validateSecureResource();
- };
-
-}
-#endif // OC_PROVISIONINGMANAGER_CXX_H_
--- /dev/null
+//****************************************************************
+//
+// Copyright 2015 Samsung Electronics All Rights Reserved.
+//
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+#ifndef OC_PROVISIONINGMANAGER_CXX_H_
+#define OC_PROVISIONINGMANAGER_CXX_H_
+
+#include <thread>
+
+#include "pinoxmcommon.h"
+#include "ocprovisioningmanager.h"
+#include "OCApi.h"
+#include "OCPlatform_impl.h"
+
+namespace OC
+{
+ class OCSecureResource;
+
+ typedef std::vector<std::shared_ptr<OCSecureResource>> DeviceList_t;
+ typedef std::vector<OicUuid_t> UuidList_t;
+ typedef std::vector<OCProvisionResult_t> PMResultList_t;
+ typedef std::function<void(PMResultList_t *result, int hasError)> ResultCallBack;
+ typedef std::function<void(uint16_t credId, uint8_t *trustCertChain,
+ size_t chainSize)>CertChainCallBack;
+
+ struct ProvisionContext
+ {
+ ResultCallBack callback;
+ ProvisionContext(ResultCallBack cb) : callback(cb){}
+ };
+
+ struct TrustCertChainContext
+ {
+ CertChainCallBack callback;
+ TrustCertChainContext(CertChainCallBack cb) : callback(cb){}
+ };
+ /**
+ * This class is for credential's to be set to devices.
+ * The types supported are
+ * 0: no security mode
+ * 1: symmetric pair-wise key
+ * 2: symmetric group key
+ * 4: asymmetric key
+ * 8: signed asymmetric key (aka certificate)
+ * 16: PIN /password
+ */
+ class Credential
+ {
+ OicSecCredType_t type;
+ size_t keySize;
+ public:
+ Credential() = default;
+ Credential(OicSecCredType_t type, size_t size) : type(type), keySize(size)
+ {}
+
+ /**
+ * API to get credential type of device.
+ * @return credential type of device.
+ */
+ OicSecCredType_t getCredentialType() const
+ {
+ return type;
+ }
+
+ /**
+ * API to get size of credential key type.
+ * @return size of credential key type.
+ */
+ size_t getCredentialKeySize() const
+ {
+ return keySize;
+ }
+
+ /**
+ * API to set credential type of device.
+ * Device can have following credential types
+ * - symmetric pair-wise key
+ * - symmetric group key
+ * - asymmetric key
+ * - signed asymmetric key (aka certificate)
+ * - PIN /password
+ * @param type credential type.
+ */
+ void setCredentialType(OicSecCredType_t type)
+ {
+ this->type = type;
+ }
+
+ /**
+ * API to set size of credential key type.
+ * @param keySize credential key size.
+ * @note can be either 128 or 256 for symmetric pair-wise key
+ */
+ void setCredentialKeySize(size_t keySize)
+ {
+ this->keySize = keySize;
+ }
+ };
+
+ class OCSecure
+ {
+ public:
+ /**
+ * The API is responsible for initialization of the provisioning manager. It will load
+ * provisioning database which have owned device's list and their linked status.
+ *
+ * @param dbPath file path of the sqlite3 database.
+ *
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ static OCStackResult provisionInit(const std::string& dbPath);
+
+ /**
+ * API is responsible for discovery of devices in it's subnet. It will list
+ * all the device in subnet which are not yet owned.
+ *
+ * @param timeout Timeout in seconds, time until which function will listen to
+ * responses from server before returning the list of devices.
+ * @param list List of candidate devices to be provisioned.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ static OCStackResult discoverUnownedDevices(unsigned short timeout,
+ DeviceList_t &list);
+
+ /**
+ * API is responsible for discovery of devices in it's subnet. It will list
+ * all the device in subnet which are already owned by calling provisioning client.
+ *
+ * @param timeout Timeout in seconds, time until which function will listen to
+ * responses from server before returning the list of devices.
+ * @param list List of owned devices.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ static OCStackResult discoverOwnedDevices(unsigned short timeout,
+ DeviceList_t &list);
+
+ /**
+ * API is responsible for discovery of devices in specified endpoint/deviceID.
+ * And this function will only return the specified device's response.
+ *
+ * @param timeout Timeout in seconds, time until which function will listen to
+ * responses from server before returning the specified device.
+ * @param deviceID deviceID of target device
+ * @param foundDevice OCSecureResource object of found device.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.\n
+ * ::OC_STACK_INVALID_PARAM when deviceID is NULL or ppFoundDevice is not
+ * initailized.
+ */
+ static OCStackResult discoverSingleDevice(unsigned short timeout,
+ const OicUuid_t* deviceID,
+ std::shared_ptr<OCSecureResource> &foundDevice);
+
+ /**
+ * API for registering Ownership transfer methods for a particular transfer Type.
+ *
+ * @param oxm Ownership transfer method.
+ * @param callbackData CallbackData Methods for ownership transfer.
+ * @param inputPin Callback method to input pin for verification.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ static OCStackResult setOwnerTransferCallbackData(OicSecOxm_t oxm,
+ OTMCallbackData_t* callbackData, InputPinCallback inputPin);
+
+ /**
+ * API to get status of all the devices in current subnet. The status include endpoint
+ * information and doxm information which can be extracted during owned and unowned
+ * discovery. Along with this information, API will provide information about
+ * devices' status.
+ * Device can have following states
+ * - ON/OFF: Device is switched on or off.
+ *
+ * @param timeout Wait time for the API.
+ * @param ownedDevList List of owned devices.
+ * @param unownedDevList List of unowned devices.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ static OCStackResult getDevInfoFromNetwork(unsigned short timeout,
+ DeviceList_t &ownedDevList,
+ DeviceList_t &unownedDevList);
+ /**
+ * Server API to register callback to display stack generated PIN.
+ *
+ * @param displayPin Callback Method to Display generated PIN.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ static OCStackResult setDisplayPinCB(GeneratePinCallback displayPin);
+
+ /**
+ * API to remove device credential and ACL from all devices in subnet.
+ *
+ * @param resultCallback Callback provided by API user, callback will be called when
+ * credential revocation is finished.
+ * @param uuid Device uuid to be revoked.
+ * @param waitTimeForOwnedDeviceDiscovery Maximum wait time for owned device
+ * discovery in seconds.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ static OCStackResult removeDeviceWithUuid(unsigned short waitTimeForOwnedDeviceDiscovery,
+ std::string uuid,
+ ResultCallBack resultCallback);
+
+ /**
+ * API to save ACL which has several ACE into Acl of SVR.
+ *
+ * @param acl ACL to be saved in Acl of SVR.
+ * @return OC_STACK_OK in case of success and other value otherwise.
+ */
+ static OCStackResult saveACL(const OicSecAcl_t* acl);
+
+#if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
+ /**
+ * API to save Trust certificate chain into Cred of SVR.
+ *
+ * @param[in] trustCertChain Trust certificate chain to be saved in Cred of SVR.
+ * @param[in] chainSize Size of trust certificate chain to be saved in Cred of SVR
+ * @param[in] encodingType Encoding type of trust certificate chain to be saved in Cred of SVR
+ * @param[out] credId CredId of saved trust certificate chain in Cred of SVR.
+ * @return OC_STACK_OK in case of success and other value otherwise.
+ */
+ static OCStackResult saveTrustCertChain(uint8_t *trustCertChain, size_t chainSize,
+ OicEncodingType_t encodingType, uint16_t *credId);
+
+ /*
+ * API to read Trust certificate chain from SVR.
+ * Caller must free when done using the returned trust certificate
+ * @param[in] credId CredId of trust certificate chain in SVR.
+ * @param[out] trustCertChain Trust certificate chain.
+ * @param[out] chainSize Size of trust certificate chain
+ * @return OC_STACK_OK in case of success and other value otherwise.
+ */
+ static OCStackResult readTrustCertChain(uint16_t credId, uint8_t **trustCertChain,
+ size_t *chainSize);
+
+ /**
+ * API to register Notifier for trustCertChain change.
+ *
+ * @param[in] TrustCertChainChangeCB trustCertChain Change will be
+ * notified asynchronously. User need to "delete[]" trustCertChain
+ * in the callback function.
+ * @return OC_STACK_OK in case of success and other value otherwise.
+ */
+ static OCStackResult registerTrustCertChangeNotifier(CertChainCallBack);
+
+ /**
+ * API to remove Already registered Notifier.
+ *
+ *@return OC_STACK_OK always, kept it for symmetry.
+ */
+ static OCStackResult removeTrustCertChangeNotifier();
+
+ /**
+ * Notifier wrapper for trustCertChain change.
+ *
+ * @param[in] ctx User context returned in callback
+ * @param[in] credId trustCertChain changed for this ID
+ * @param[in] trustCertChain trustcertchain binary blob
+ * @param[in] chainSize size of trustCertChain
+ */
+ static void certCallbackWrapper(void* ctx, uint16_t credId, uint8_t *trustCertChain,
+ size_t chainSize);
+#endif // __WITH_DTLS__ || __WITH_TLS__
+
+ };
+
+ /**
+ * This class represents a secure virtual device, which can be provisioned by the
+ * provisioning client.
+ */
+ class OCSecureResource
+ {
+ private:
+ std::weak_ptr<std::recursive_mutex> m_csdkLock;
+ OCProvisionDev_t *devPtr; // pointer to device.
+
+ public:
+ OCSecureResource();
+ OCSecureResource(std::weak_ptr<std::recursive_mutex> csdkLock, OCProvisionDev_t *dPtr);
+
+ ~OCSecureResource();
+
+ /**
+ * API to provision credentials between two devices and ACLs for the devices who
+ * act as a server.
+ *
+ * @param cred Type of credentials & key size to be provisioned to the device.
+ * @param acl1 ACL for device 1. If this is not required set NULL.
+ * @param device2 Second device to be provisioned.
+ * @param acl2 ACL for device 2. If this is not required set NULL.
+ * @param resultCallback Callback will be called when provisioning request receives
+ * a response from first resource server.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ OCStackResult provisionPairwiseDevices(const Credential &cred, const OicSecAcl_t* acl1,
+ const OCSecureResource &device2, const OicSecAcl_t* acl2,
+ ResultCallBack resultCallback);
+
+ /**
+ * API to do ownership transfer for un-owned device.
+ *
+ * @param resultCallback Result callback function to be invoked when
+ * ownership transfer finished.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ OCStackResult doOwnershipTransfer(ResultCallBack resultCallback);
+
+ /**
+ * API to send ACL information to resource.
+ *
+ * @param acl ACL to provision.
+ * @param resultCallback Callback will be called when provisioning request
+ * receives a response from resource server.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ OCStackResult provisionACL(const OicSecAcl_t* acl,
+ ResultCallBack resultCallback);
+
+ /**
+ * API to provision credential to devices.
+ *
+ * @param cred Type of credentials to be provisioned to the device.
+ * @param device2 Second device' instance, representing resource to be provisioned.
+ * @param resultCallback Callback will be called when provisioning request receives
+ * a response from first resource server.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ OCStackResult provisionCredentials(const Credential &cred,
+ const OCSecureResource &device2,
+ ResultCallBack resultCallback);
+
+ /**
+ * API to remove the credential & relationship between the two devices.
+ *
+ * @param device2 Second device information to be unlinked.
+ * @param resultCallback Callback provided by API user, callback will be called when
+ * device unlink is finished.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ OCStackResult unlinkDevices(const OCSecureResource &device2,
+ ResultCallBack resultCallback);
+
+ /**
+ * API to remove device credential from all devices in subnet.
+ *
+ * @param resultCallback Callback provided by API user, callback will be called when
+ * credential revocation is finished.
+ * @param waitTimeForOwnedDeviceDiscovery Maximum wait time for owned device
+ * discovery in seconds.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ OCStackResult removeDevice(unsigned short waitTimeForOwnedDeviceDiscovery,
+ ResultCallBack resultCallback);
+
+ /**
+ * API to provision DirectPairing to devices.
+ *
+ * @param pconf pointer to PCONF (Pairing Configuration).
+ * @param resultCallback Callback will be called when provisioning request receives
+ * a response from first resource server.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ OCStackResult provisionDirectPairing(const OicSecPconf_t *pconf,
+ ResultCallBack resultCallback);
+
+#if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
+ /**
+ * API to provision cert.
+ *
+ * @param type type of cred.
+ * @param credId id of cert.
+ * @param resultCallback Callback will be called when provisioning request
+ * receives a response from resource server.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ OCStackResult provisionTrustCertChain(OicSecCredType_t type, uint16_t credId,
+ ResultCallBack resultCallback);
+
+#endif // __WITH_DTLS__ or __WITH_TLS__
+
+ /**
+ * This method is used to get linked devices' IDs.
+ *
+ * @param uuidList Information about the list of linked devices uuids.
+ * @return ::OC_STACK_OK in case of success and other value otherwise.
+ */
+ OCStackResult getLinkedDevices(UuidList_t &uuidList);
+
+ /**
+ * API to get the device ID of this resource.
+ * @return device ID.
+ */
+ std::string getDeviceID();
+
+ /**
+ * API to get the information of device for provisioning.
+ * @return @ref OCProvisionDev_t Reference provides information of device for provisioning.
+ */
+ OCProvisionDev_t* getDevPtr()const;
+
+ /**
+ * This function returns the device's IP address.
+ * @return device address.
+ */
+ std::string getDevAddr();
+
+ /**
+ * This function returns the device's Status.
+ * @return Device status (1 = ON and 2 = OFF).
+ */
+ int getDeviceStatus();
+
+ /**
+ * This function provides the owned status of the device.
+ * @return Device owned status.
+ */
+ bool getOwnedStatus();
+
+
+ /**
+ * Common callback wrapper, which will be called from OC-APIs.
+ */
+ static void callbackWrapper(void* ctx, int nOfRes,
+ OCProvisionResult_t *arr, bool hasError);
+
+ private:
+ void validateSecureResource();
+ };
+
+}
+#endif // OC_PROVISIONINGMANAGER_CXX_H_
#include "cloudAuth.h"
#include "cloudWrapper.h"
#include "OCApi.h"
-#include "OCCloudProvisioning.h"
+#include "OCCloudProvisioning.hpp"
#ifdef __unix__
#include <unistd.h> //for unlink
#include "logger.h"
#include "occloudprovisioning.h"
-#include "OCCloudProvisioning.h"
+#include "OCCloudProvisioning.hpp"
#include "oic_malloc.h"
#include "oic_string.h"
#include "utils.h"
#define OC_CLOUD_WRAPPER_H
#include "occloudprovisioning.h"
-#include "OCCloudProvisioning.h"
+#include "OCCloudProvisioning.hpp"
using namespace OC;
/**
#include "oic_string.h"
#include "OCPlatform.h"
#include "OCApi.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
#include "oxmjustworks.h"
#include "oxmrandompin.h"
#include "aclresource.h"
* *****************************************************************/
#include "ocstack.h"
-#include "OCCloudProvisioning.h"
+#include "OCCloudProvisioning.hpp"
namespace OC
{
#include "ocstack.h"
#include "srmutility.h"
#include "base64.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
namespace OC
{
#include <OCPlatform_impl.h>
#include <oxmjustworks.h>
#include <oxmrandompin.h>
-#include <OCProvisioningManager.h>
-#include "OCCloudProvisioning.h"
+#include <OCProvisioningManager.hpp>
+#include <OCCloudProvisioning.hpp>
#include <gtest/gtest.h>
#define TIMEOUT 5
#include <oxmjustworks.h>
#include <oxmrandompin.h>
#include <srmutility.h>
-#include <OCProvisioningManager.h>
+#include <OCProvisioningManager.hpp>
#include <gtest/gtest.h>
#define TIMEOUT 5
#include <condition_variable>
#include "ESRichCommon.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
namespace OIC
{
#include "OCPlatform.h"
#include "OCApi.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
#include "EasySetup.h"
#include "ESRichCommon.h"
projects / platform / upstream / iotivity.git / commitdiff