security: publish securevirtualresourcetypes.h

Designate securevirtualresourcetypes.h
as a "Public Experimental" header.

Those headers are needed for C applications in secured mode
(using OCRepPayloadCreate from ocpayload.h)

  Observed error is:
  .../resource/stack/ocpayload.h:42:40: \
  fatal error: securevirtualresourcetypes.h: \
  No such file or directory

For C++ app there is no such requierements

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I6a37fa82e3a1065541dba8be541ff4ac90e3294a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21549
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Martin Rösch <martin.roesch@kistler.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/resource/c_common/SConscript b/resource/c_common/SConscript
index e7e8581..df6f515 100644 (file)
--- a/resource/c_common/SConscript
+++ b/resource/c_common/SConscript
@@ -220,6 +220,9 @@ common_env.UserInstallTargetHeader(
     'iotivity_debug.h', 'c_common', 'iotivity_debug.h')
 common_env.UserInstallTargetHeader(
     'platform_features.h', 'c_common', 'platform_features.h')
+common_env.UserInstallTargetHeader(
+    'experimental/byte_array.h', 'c_common/experimental', 'byte_array.h')
+
 
 Clean(commonlib, config_h_file_path)
 

diff --git a/resource/c_common/byte_array.h b/resource/c_common/experimental/byte_array.h
similarity index 100%
rename from resource/c_common/byte_array.h
rename to resource/c_common/experimental/byte_array.h

diff --git a/resource/csdk/connectivity/api/casecurityinterface.h b/resource/csdk/connectivity/api/casecurityinterface.h
index 7705ea3..0e427a7 100644 (file)
--- a/resource/csdk/connectivity/api/casecurityinterface.h
+++ b/resource/csdk/connectivity/api/casecurityinterface.h
@@ -29,7 +29,7 @@
 
 
 #include "cacommon.h"
-#include "byte_array.h"
+#include "experimental/byte_array.h"
 
 #ifdef __cplusplus
 extern "C"

diff --git a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
index 56bb853..ad52677 100644 (file)
--- a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
+++ b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
@@ -33,7 +33,7 @@
 #include "caipinterface.h"
 #include "oic_malloc.h"
 #include "ocrandom.h"
-#include "byte_array.h"
+#include "experimental/byte_array.h"
 #include "octhread.h"
 #include "octimer.h"
 

diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript
index 860a289..28a9870 100644 (file)
--- a/resource/csdk/security/SConscript
+++ b/resource/csdk/security/SConscript
@@ -150,3 +150,6 @@ if target_os in ['arduino']:
 libocsrm = libocsrm_env.StaticLibrary('ocsrm', libocsrm_src)
 
 libocsrm_env.InstallTarget(libocsrm, 'ocsrm')
+libocsrm_env.UserInstallTargetHeader(
+    'include/experimental/securevirtualresourcetypes.h',
+    'resource/stack/experimental', 'securevirtualresourcetypes.h')

diff --git a/resource/csdk/security/include/securevirtualresourcetypes.h b/resource/csdk/security/include/experimental/securevirtualresourcetypes.h
similarity index 99%
rename from resource/csdk/security/include/securevirtualresourcetypes.h
rename to resource/csdk/security/include/experimental/securevirtualresourcetypes.h
index 74a8e7c..5f483e1 100644 (file)
--- a/resource/csdk/security/include/securevirtualresourcetypes.h
+++ b/resource/csdk/security/include/experimental/securevirtualresourcetypes.h
@@ -51,7 +51,7 @@
 #include <stdint.h> // for uint8_t typedef
 #include <stdbool.h>
 #if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
-#include "byte_array.h"
+#include "experimental/byte_array.h"
 #endif /* __WITH_DTLS__  or __WITH_TLS__*/
 
 #ifdef __cplusplus

diff --git a/resource/csdk/security/include/internal/acl_logging.h b/resource/csdk/security/include/internal/acl_logging.h
index e46b795..8382f1c 100644 (file)
--- a/resource/csdk/security/include/internal/acl_logging.h
+++ b/resource/csdk/security/include/internal/acl_logging.h
@@ -25,7 +25,7 @@
 #include "oic_malloc.h"
 #include "ocrandom.h"
 #include "utlist.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
 extern "C"

diff --git a/resource/csdk/security/include/internal/credresource.h b/resource/csdk/security/include/internal/credresource.h
index 4064d98..1bee048 100644 (file)
--- a/resource/csdk/security/include/internal/credresource.h
+++ b/resource/csdk/security/include/internal/credresource.h
@@ -22,7 +22,7 @@
 #define IOTVT_SRM_CREDR_H
 
 #include "cainterface.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "octypes.h"
 #include "rolesresource.h"
 #include <cbor.h>

diff --git a/resource/csdk/security/include/internal/crl_logging.h b/resource/csdk/security/include/internal/crl_logging.h
index c60b76f..eb6eb8a 100644 (file)
--- a/resource/csdk/security/include/internal/crl_logging.h
+++ b/resource/csdk/security/include/internal/crl_logging.h
@@ -22,7 +22,7 @@
 #define CRL_LOGGING_H_
 
 #include "logger.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
 extern "C"

diff --git a/resource/csdk/security/include/internal/csrresource.h b/resource/csdk/security/include/internal/csrresource.h
index 5522066..5bf24b2 100644 (file)
--- a/resource/csdk/security/include/internal/csrresource.h
+++ b/resource/csdk/security/include/internal/csrresource.h
@@ -22,7 +22,7 @@
 #define IOTVT_SRM_CSRR_H
 
 #include "cainterface.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "octypes.h"
 
 #if defined(__WITH_TLS__) || defined(__WITH_DTLS__)

diff --git a/resource/csdk/security/include/internal/deviceonboardingstate.h b/resource/csdk/security/include/internal/deviceonboardingstate.h
index 86ca59c..5dcfb89 100644 (file)
--- a/resource/csdk/security/include/internal/deviceonboardingstate.h
+++ b/resource/csdk/security/include/internal/deviceonboardingstate.h
@@ -22,7 +22,7 @@
 #define DEVICEONBOARDINGSTATE_H_
 
 #include "octypes.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/resource/csdk/security/include/internal/directpairing.h b/resource/csdk/security/include/internal/directpairing.h
index 4732756..a11d2df 100644 (file)
--- a/resource/csdk/security/include/internal/directpairing.h
+++ b/resource/csdk/security/include/internal/directpairing.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>\r
 #include "ocstack.h"\r
 #include "pmtypes.h"\r
-#include "securevirtualresourcetypes.h"\r
+#include "experimental/securevirtualresourcetypes.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C"\r

diff --git a/resource/csdk/security/include/internal/policyengine.h b/resource/csdk/security/include/internal/policyengine.h
index 5d7c097..44f2065 100644 (file)
--- a/resource/csdk/security/include/internal/policyengine.h
+++ b/resource/csdk/security/include/internal/policyengine.h
@@ -23,7 +23,7 @@
 
 #include "ocstack.h"
 #include "logger.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "secureresourcemanager.h"
 #include "cainterface.h"
 #include <stdlib.h>

diff --git a/resource/csdk/security/include/internal/resourcemanager.h b/resource/csdk/security/include/internal/resourcemanager.h
index a75cb7a..c0bb611 100644 (file)
--- a/resource/csdk/security/include/internal/resourcemanager.h
+++ b/resource/csdk/security/include/internal/resourcemanager.h
@@ -23,7 +23,7 @@
 
 #include <stdlib.h>
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/resource/csdk/security/include/internal/rolesresource.h b/resource/csdk/security/include/internal/rolesresource.h
index 40c75cd..cb5a082 100644 (file)
--- a/resource/csdk/security/include/internal/rolesresource.h
+++ b/resource/csdk/security/include/internal/rolesresource.h
@@ -24,7 +24,7 @@
 #if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
 
 #include "cainterface.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "octypes.h"
 
 #ifdef __cplusplus

diff --git a/resource/csdk/security/include/internal/secureresourcemanager.h b/resource/csdk/security/include/internal/secureresourcemanager.h
index bec8ed2..a5003ca 100644 (file)
--- a/resource/csdk/security/include/internal/secureresourcemanager.h
+++ b/resource/csdk/security/include/internal/secureresourcemanager.h
@@ -21,7 +21,7 @@
 #ifndef SECURITYRESOURCEMANAGER_H_
 #define SECURITYRESOURCEMANAGER_H_
 
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "cainterface.h"
 
 #ifdef __cplusplus

diff --git a/resource/csdk/security/include/internal/srmresourcestrings.h b/resource/csdk/security/include/internal/srmresourcestrings.h
index f2c6d36..d260fa4 100644 (file)
--- a/resource/csdk/security/include/internal/srmresourcestrings.h
+++ b/resource/csdk/security/include/internal/srmresourcestrings.h
@@ -21,7 +21,7 @@
 #ifndef IOTVT_SRM_RSRC_STRINGS_H
 #define IOTVT_SRM_RSRC_STRINGS_H
 
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/resource/csdk/security/include/occertutility.h b/resource/csdk/security/include/occertutility.h
index b0cdf18..d88d2f6 100644 (file)
--- a/resource/csdk/security/include/occertutility.h
+++ b/resource/csdk/security/include/occertutility.h
@@ -23,7 +23,7 @@
 #ifndef OCCERTUTILITY_H_
 #define OCCERTUTILITY_H_
 
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/resource/csdk/security/include/oxmverifycommon.h b/resource/csdk/security/include/oxmverifycommon.h
index bd189be..795442d 100644 (file)
--- a/resource/csdk/security/include/oxmverifycommon.h
+++ b/resource/csdk/security/include/oxmverifycommon.h
@@ -21,7 +21,7 @@
 #ifndef _OXM_VERIFY_COMMON_
 #define _OXM_VERIFY_COMMON_
 
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "casecurityinterface.h"
 
 #ifdef __cplusplus

diff --git a/resource/csdk/security/include/pinoxmcommon.h b/resource/csdk/security/include/pinoxmcommon.h
index 5a80a63..59f61c1 100644 (file)
--- a/resource/csdk/security/include/pinoxmcommon.h
+++ b/resource/csdk/security/include/pinoxmcommon.h
@@ -21,7 +21,7 @@
 #ifndef PIN_CALLBACK_DEF_H_
 #define PIN_CALLBACK_DEF_H_
 
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "casecurityinterface.h"
 
 #ifdef __cplusplus

diff --git a/resource/csdk/security/include/srmutility.h b/resource/csdk/security/include/srmutility.h
index 79a8693..6dd214a 100644 (file)
--- a/resource/csdk/security/include/srmutility.h
+++ b/resource/csdk/security/include/srmutility.h
@@ -22,7 +22,7 @@
 #define IOTVT_SRM_UTILITY_H
 
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #ifdef __cplusplus
 extern "C"
 {

diff --git a/resource/csdk/security/provisioning/include/cloud/occloudprovisioning.h b/resource/csdk/security/provisioning/include/cloud/occloudprovisioning.h
index 068f336..12f19d8 100644 (file)
--- a/resource/csdk/security/provisioning/include/cloud/occloudprovisioning.h
+++ b/resource/csdk/security/provisioning/include/cloud/occloudprovisioning.h
@@ -21,7 +21,7 @@
 #define OC_CLOUD_PROVISIONING_H
 
 #include "octypes.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/resource/csdk/security/provisioning/include/internal/credentialgenerator.h b/resource/csdk/security/provisioning/include/internal/credentialgenerator.h
index c8a6bf9..055f267 100644 (file)
--- a/resource/csdk/security/provisioning/include/internal/credentialgenerator.h
+++ b/resource/csdk/security/provisioning/include/internal/credentialgenerator.h
@@ -22,7 +22,7 @@
 #define PM_CREDENTIAL_GENERATOR_H
 
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/resource/csdk/security/provisioning/include/internal/multipleownershiptransfermanager.h b/resource/csdk/security/provisioning/include/internal/multipleownershiptransfermanager.h
index 7f3195d..bbc60bd 100644 (file)
--- a/resource/csdk/security/provisioning/include/internal/multipleownershiptransfermanager.h
+++ b/resource/csdk/security/provisioning/include/internal/multipleownershiptransfermanager.h
@@ -24,7 +24,7 @@
 #include "pmtypes.h"
 #include "ocstack.h"
 #include "octypes.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/resource/csdk/security/provisioning/include/internal/otmcontextlist.h b/resource/csdk/security/provisioning/include/internal/otmcontextlist.h
index c25bec1..f62d093 100644 (file)
--- a/resource/csdk/security/provisioning/include/internal/otmcontextlist.h
+++ b/resource/csdk/security/provisioning/include/internal/otmcontextlist.h
@@ -24,7 +24,7 @@
 #include "pmtypes.h"
 #include "ocstack.h"
 #include "octypes.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "ownershiptransfermanager.h"
 
 #ifdef __cplusplus

diff --git a/resource/csdk/security/provisioning/include/internal/ownershiptransfermanager.h b/resource/csdk/security/provisioning/include/internal/ownershiptransfermanager.h
index 3514a50..08e2270 100644 (file)
--- a/resource/csdk/security/provisioning/include/internal/ownershiptransfermanager.h
+++ b/resource/csdk/security/provisioning/include/internal/ownershiptransfermanager.h
@@ -24,7 +24,7 @@
 #include "pmtypes.h"\r
 #include "ocstack.h"\r
 #include "octypes.h"\r
-#include "securevirtualresourcetypes.h"\r
+#include "experimental/securevirtualresourcetypes.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

diff --git a/resource/csdk/security/provisioning/include/internal/provisioningdatabasemanager.h b/resource/csdk/security/provisioning/include/internal/provisioningdatabasemanager.h
index 9e8fbec..9c72002 100644 (file)
--- a/resource/csdk/security/provisioning/include/internal/provisioningdatabasemanager.h
+++ b/resource/csdk/security/provisioning/include/internal/provisioningdatabasemanager.h
@@ -20,7 +20,7 @@
 
 #ifndef PROVISIONING_DATABASE_MANAGER_H
 #define PROVISIONING_DATABASE_MANAGER_H
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "ocstack.h"
 #include "pmtypes.h"
 

diff --git a/resource/csdk/security/provisioning/include/internal/secureresourceprovider.h b/resource/csdk/security/provisioning/include/internal/secureresourceprovider.h
index 6768791..ff6e95e 100644 (file)
--- a/resource/csdk/security/provisioning/include/internal/secureresourceprovider.h
+++ b/resource/csdk/security/provisioning/include/internal/secureresourceprovider.h
@@ -22,7 +22,7 @@
 #define SRP_SECURERESOURCEPROVIDER_H
 
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "pmtypes.h"
 #include "octypes.h"
 

diff --git a/resource/csdk/security/provisioning/include/ocprovisioningmanager.h b/resource/csdk/security/provisioning/include/ocprovisioningmanager.h
index 7abd523..ef904bf 100644 (file)
--- a/resource/csdk/security/provisioning/include/ocprovisioningmanager.h
+++ b/resource/csdk/security/provisioning/include/ocprovisioningmanager.h
@@ -25,7 +25,7 @@
 #include "pmtypes.h"
 #include "ownershiptransfermanager.h"
 #ifdef MULTIPLE_OWNER
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #endif //MULTIPLE_OWNER
 
 #ifdef __cplusplus

diff --git a/resource/csdk/security/provisioning/include/oxm/oxmjustworks.h b/resource/csdk/security/provisioning/include/oxm/oxmjustworks.h
index a2b846a..26f8ff4 100644 (file)
--- a/resource/csdk/security/provisioning/include/oxm/oxmjustworks.h
+++ b/resource/csdk/security/provisioning/include/oxm/oxmjustworks.h
@@ -22,7 +22,7 @@
 #define OXM_JUST_WORKS_H_
 
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "ownershiptransfermanager.h"
 
 #ifdef __cplusplus

diff --git a/resource/csdk/security/provisioning/include/oxm/oxmmanufacturercert.h b/resource/csdk/security/provisioning/include/oxm/oxmmanufacturercert.h
index 999f52d..cb63f05 100644 (file)
--- a/resource/csdk/security/provisioning/include/oxm/oxmmanufacturercert.h
+++ b/resource/csdk/security/provisioning/include/oxm/oxmmanufacturercert.h
@@ -22,7 +22,7 @@
 #define _OXM_MANUFACTURER_CERTIFICATE_H_
 
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "ownershiptransfermanager.h"
 #include "pmtypes.h"
 

diff --git a/resource/csdk/security/provisioning/include/oxm/oxmpreconfpin.h b/resource/csdk/security/provisioning/include/oxm/oxmpreconfpin.h
index c31fc1d..92fb563 100644 (file)
--- a/resource/csdk/security/provisioning/include/oxm/oxmpreconfpin.h
+++ b/resource/csdk/security/provisioning/include/oxm/oxmpreconfpin.h
@@ -22,7 +22,7 @@
 #define OXM_PRECONF_PIN_H_
 
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "ownershiptransfermanager.h"
 #include "pmtypes.h"
 #include "pinoxmcommon.h"

diff --git a/resource/csdk/security/provisioning/include/oxm/oxmrandompin.h b/resource/csdk/security/provisioning/include/oxm/oxmrandompin.h
index 998180e..786cfa5 100644 (file)
--- a/resource/csdk/security/provisioning/include/oxm/oxmrandompin.h
+++ b/resource/csdk/security/provisioning/include/oxm/oxmrandompin.h
@@ -22,7 +22,7 @@
 #define OXM_RANDOM_PIN_H_
 
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "ownershiptransfermanager.h"
 #include "pmtypes.h"
 #include "pinoxmcommon.h"

diff --git a/resource/csdk/security/provisioning/include/pmtypes.h b/resource/csdk/security/provisioning/include/pmtypes.h
index 5e73fff..92ff617 100644 (file)
--- a/resource/csdk/security/provisioning/include/pmtypes.h
+++ b/resource/csdk/security/provisioning/include/pmtypes.h
@@ -22,7 +22,7 @@
 #define OC_PROVISIONING_TYPES_H
 
 #include <stdbool.h>
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/resource/csdk/security/provisioning/sample/autoprovisioningclient.c b/resource/csdk/security/provisioning/sample/autoprovisioningclient.c
index 2dee720..9019a18 100644 (file)
--- a/resource/csdk/security/provisioning/sample/autoprovisioningclient.c
+++ b/resource/csdk/security/provisioning/sample/autoprovisioningclient.c
@@ -43,7 +43,6 @@
 #include "ocprovisioningmanager.h"
 #include "oxmjustworks.h"
 #include "oxmrandompin.h"
-#include "securevirtualresourcetypes.h"
 #include "srmutility.h"
 #include "pmtypes.h"
 #include "oxmverifycommon.h"

diff --git a/resource/csdk/security/provisioning/sample/cloud/cloudAuth.c b/resource/csdk/security/provisioning/sample/cloud/cloudAuth.c
index e44d434..08665a4 100644 (file)
--- a/resource/csdk/security/provisioning/sample/cloud/cloudAuth.c
+++ b/resource/csdk/security/provisioning/sample/cloud/cloudAuth.c
@@ -24,7 +24,7 @@
 #include "ocstack.h"
 #include "ocpayload.h"
 #include "psinterface.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "doxmresource.h"
 #include "oic_malloc.h"
 #include "oic_string.h"

diff --git a/resource/csdk/security/provisioning/sample/provisioningclient.c b/resource/csdk/security/provisioning/sample/provisioningclient.c
index 4ef507e..c07bc4d 100644 (file)
--- a/resource/csdk/security/provisioning/sample/provisioningclient.c
+++ b/resource/csdk/security/provisioning/sample/provisioningclient.c
@@ -33,7 +33,6 @@
 #include "ocprovisioningmanager.h"
 #include "oxmjustworks.h"
 #include "oxmrandompin.h"
-#include "securevirtualresourcetypes.h"
 #include "srmutility.h"
 #include "pmtypes.h"
 #include "oxmverifycommon.h"

diff --git a/resource/csdk/security/provisioning/sample/subownerclient.c b/resource/csdk/security/provisioning/sample/subownerclient.c
index 20dc4cc..fd2e533 100644 (file)
--- a/resource/csdk/security/provisioning/sample/subownerclient.c
+++ b/resource/csdk/security/provisioning/sample/subownerclient.c
@@ -34,7 +34,6 @@
 #include "ocprovisioningmanager.h"
 #include "oxmjustworks.h"
 #include "oxmrandompin.h"
-#include "securevirtualresourcetypes.h"
 #include "srmutility.h"
 #include "pmtypes.h"
 #include "pmutility.h"

diff --git a/resource/csdk/security/provisioning/src/credentialgenerator.c b/resource/csdk/security/provisioning/src/credentialgenerator.c
index 2e375d0..f723e31 100644 (file)
--- a/resource/csdk/security/provisioning/src/credentialgenerator.c
+++ b/resource/csdk/security/provisioning/src/credentialgenerator.c
@@ -28,7 +28,6 @@
 #include "ocrandom.h"
 #include "srmutility.h"
 #include "stdbool.h"
-#include "securevirtualresourcetypes.h"
 
 #define TAG "OIC_SRPAPI_CG"
 

diff --git a/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c b/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
index 6e14e56..825e3ec 100644 (file)
--- a/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
+++ b/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
@@ -43,7 +43,6 @@
 #include "credresource.h"
 #include "aclresource.h"
 #include "ownershiptransfermanager.h"
-#include "securevirtualresourcetypes.h"
 #include "oxmjustworks.h"
 #include "pmtypes.h"
 #include "pmutility.h"

diff --git a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c
index d0250e5..e55bb80 100644 (file)
--- a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c
+++ b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c
@@ -58,7 +58,6 @@
 #include "aclresource.h"
 #include "ownershiptransfermanager.h"
 #include "secureresourceprovider.h"
-#include "securevirtualresourcetypes.h"
 #include "oxmjustworks.h"
 #include "oxmrandompin.h"
 #include "oxmmanufacturercert.h"

diff --git a/resource/csdk/security/provisioning/src/oxmjustworks.c b/resource/csdk/security/provisioning/src/oxmjustworks.c
index 2e60511..55702dd 100644 (file)
--- a/resource/csdk/security/provisioning/src/oxmjustworks.c
+++ b/resource/csdk/security/provisioning/src/oxmjustworks.c
@@ -20,7 +20,7 @@
 
 #include <memory.h>
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "doxmresource.h"
 #include "cacommon.h"
 #include "cainterface.h"

diff --git a/resource/csdk/security/provisioning/src/oxmmanufacturercert.c b/resource/csdk/security/provisioning/src/oxmmanufacturercert.c
index 2976d76..544669f 100644 (file)
--- a/resource/csdk/security/provisioning/src/oxmmanufacturercert.c
+++ b/resource/csdk/security/provisioning/src/oxmmanufacturercert.c
@@ -21,7 +21,7 @@
 #include <memory.h>
 
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "doxmresource.h"
 #include "credresource.h"
 #include "cacommon.h"

diff --git a/resource/csdk/security/provisioning/src/oxmpreconfpin.c b/resource/csdk/security/provisioning/src/oxmpreconfpin.c
index c2c7228..06eca4e 100644 (file)
--- a/resource/csdk/security/provisioning/src/oxmpreconfpin.c
+++ b/resource/csdk/security/provisioning/src/oxmpreconfpin.c
@@ -21,7 +21,7 @@
 #include <memory.h>
 
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "doxmresource.h"
 #include "credresource.h"
 #include "cacommon.h"

diff --git a/resource/csdk/security/provisioning/src/oxmrandompin.c b/resource/csdk/security/provisioning/src/oxmrandompin.c
index 237d42f..d98f1e2 100644 (file)
--- a/resource/csdk/security/provisioning/src/oxmrandompin.c
+++ b/resource/csdk/security/provisioning/src/oxmrandompin.c
@@ -21,7 +21,7 @@
 #include <memory.h>
 
 #include "ocstack.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "doxmresource.h"
 #include "credresource.h"
 #include "cacommon.h"

diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c
index 4045c0e..bdc1ff6 100644 (file)
--- a/resource/csdk/security/provisioning/src/pmutility.c
+++ b/resource/csdk/security/provisioning/src/pmutility.c
@@ -37,7 +37,6 @@
 #include "utlist.h"
 #include "ocpayload.h"
 
-#include "securevirtualresourcetypes.h"
 #include "srmresourcestrings.h" //@note: SRM's internal header
 #include "doxmresource.h"       //@note: SRM's internal header
 #include "pstatresource.h"      //@note: SRM's internal header

diff --git a/resource/csdk/security/provisioning/unittest/otmunittest.cpp b/resource/csdk/security/provisioning/unittest/otmunittest.cpp
index a11d565..84b842c 100644 (file)
--- a/resource/csdk/security/provisioning/unittest/otmunittest.cpp
+++ b/resource/csdk/security/provisioning/unittest/otmunittest.cpp
@@ -29,7 +29,6 @@
 #include "oxmjustworks.h"
 #include "oxmrandompin.h"
 #include "oxmmanufacturercert.h"
-#include "securevirtualresourcetypes.h"
 #include "provisioningdatabasemanager.h"
 #ifdef MULTIPLE_OWNER
 #include "multipleownershiptransfermanager.h"

diff --git a/resource/csdk/security/src/deviceonboardingstate.c b/resource/csdk/security/src/deviceonboardingstate.c
index d896aa0..c0c4ea6 100644 (file)
--- a/resource/csdk/security/src/deviceonboardingstate.c
+++ b/resource/csdk/security/src/deviceonboardingstate.c
@@ -22,7 +22,6 @@
 #include "srmutility.h"
 #include "octypes.h"
 #include "logger.h"
-#include "securevirtualresourcetypes.h"
 #include "srmresourcestrings.h"
 #include "aclresource.h"
 #include "amaclresource.h"

diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c
index 36aa3e9..635823e 100644 (file)
--- a/resource/csdk/security/src/doxmresource.c
+++ b/resource/csdk/security/src/doxmresource.c
@@ -45,7 +45,6 @@
 #include "dpairingresource.h"
 #include "psinterface.h"
 #include "srmresourcestrings.h"
-#include "securevirtualresourcetypes.h"
 #include "credresource.h"
 #include "srmutility.h"
 #include "pinoxmcommon.h"

diff --git a/resource/csdk/security/src/oxmpincommon.c b/resource/csdk/security/src/oxmpincommon.c
index 5d42287..f48b1c7 100644 (file)
--- a/resource/csdk/security/src/oxmpincommon.c
+++ b/resource/csdk/security/src/oxmpincommon.c
@@ -29,7 +29,6 @@
 #include "pinoxmcommon.h"
 #include "pbkdf2.h"
 #include "base64.h"
-#include "securevirtualresourcetypes.h"
 #include "srmresourcestrings.h"
 #include "doxmresource.h"
 #include "credresource.h"

diff --git a/resource/csdk/security/src/oxmverifycommon.c b/resource/csdk/security/src/oxmverifycommon.c
index 179981b..9bd9f6e 100644 (file)
--- a/resource/csdk/security/src/oxmverifycommon.c
+++ b/resource/csdk/security/src/oxmverifycommon.c
@@ -21,7 +21,6 @@
 #include "ocstack.h"
 #include "logger.h"
 #include "base64.h"
-#include "securevirtualresourcetypes.h"
 #include "srmresourcestrings.h"
 #include "cainterface.h"
 #include "oxmverifycommon.h"

diff --git a/resource/csdk/security/src/policyengine.c b/resource/csdk/security/src/policyengine.c
index e9ff547..8684ed1 100644 (file)
--- a/resource/csdk/security/src/policyengine.c
+++ b/resource/csdk/security/src/policyengine.c
@@ -25,7 +25,6 @@
 #include "ocrandom.h"
 #include "policyengine.h"
 #include "resourcemanager.h"
-#include "securevirtualresourcetypes.h"
 #include "srmresourcestrings.h"
 #include "logger.h"
 #include "aclresource.h"

diff --git a/resource/csdk/security/src/resourcemanager.c b/resource/csdk/security/src/resourcemanager.c
index 10af591..c35ce0b 100644 (file)
--- a/resource/csdk/security/src/resourcemanager.c
+++ b/resource/csdk/security/src/resourcemanager.c
@@ -20,7 +20,6 @@
 
 #include <string.h>
 #include "resourcemanager.h"
-#include "securevirtualresourcetypes.h"
 #include "aclresource.h"
 #include "pstatresource.h"
 #include "doxmresource.h"

diff --git a/resource/csdk/security/src/secureresourcemanager.c b/resource/csdk/security/src/secureresourcemanager.c
index d854464..50a24b0 100644 (file)
--- a/resource/csdk/security/src/secureresourcemanager.c
+++ b/resource/csdk/security/src/secureresourcemanager.c
@@ -28,7 +28,6 @@
 #include "srmutility.h"
 #include "oic_string.h"
 #include "oic_malloc.h"
-#include "securevirtualresourcetypes.h"
 #include "secureresourcemanager.h"
 #include "srmresourcestrings.h"
 #include "ocresourcehandler.h"

diff --git a/resource/csdk/security/src/srmresourcestrings.c b/resource/csdk/security/src/srmresourcestrings.c
index 0429297..19e4398 100644 (file)
--- a/resource/csdk/security/src/srmresourcestrings.c
+++ b/resource/csdk/security/src/srmresourcestrings.c
@@ -19,7 +19,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 #include <stdlib.h>
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "octypes.h"
 
 const char * SVR_DB_FILE_NAME = OC_SECURITY_DB_FILE_NAME;

diff --git a/resource/csdk/security/unittest/aclresourcetest.cpp b/resource/csdk/security/unittest/aclresourcetest.cpp
index 4904136..ce1b13d 100644 (file)
--- a/resource/csdk/security/unittest/aclresourcetest.cpp
+++ b/resource/csdk/security/unittest/aclresourcetest.cpp
@@ -28,7 +28,6 @@
 #include "oic_string.h"
 #include "cainterface.h"
 #include "secureresourcemanager.h"
-#include "securevirtualresourcetypes.h"
 #include "srmresourcestrings.h"
 #include "aclresource.h"
 #include "pstatresource.h"

diff --git a/resource/csdk/security/unittest/amaclresourcetest.cpp b/resource/csdk/security/unittest/amaclresourcetest.cpp
index 0bef64f..b825539 100644 (file)
--- a/resource/csdk/security/unittest/amaclresourcetest.cpp
+++ b/resource/csdk/security/unittest/amaclresourcetest.cpp
@@ -27,7 +27,6 @@
 #include "payload_logging.h"
 #include "psinterface.h"
 #include "secureresourcemanager.h"
-#include "securevirtualresourcetypes.h"
 #include "srmresourcestrings.h"
 #include "srmutility.h"
 #include "amaclresource.h"

diff --git a/resource/csdk/security/unittest/credentialresource.cpp b/resource/csdk/security/unittest/credentialresource.cpp
index 5aad7ac..731a8db 100644 (file)
--- a/resource/csdk/security/unittest/credentialresource.cpp
+++ b/resource/csdk/security/unittest/credentialresource.cpp
@@ -25,7 +25,6 @@
 #include "oic_string.h"
 #include "resourcemanager.h"
 #include "credresource.h"
-#include "securevirtualresourcetypes.h"
 #include "srmtestcommon.h"
 #include "srmutility.h"
 #include "psinterface.h"

diff --git a/resource/csdk/security/unittest/crlresourcetest.cpp b/resource/csdk/security/unittest/crlresourcetest.cpp
index bf40619..f5b11ea 100644 (file)
--- a/resource/csdk/security/unittest/crlresourcetest.cpp
+++ b/resource/csdk/security/unittest/crlresourcetest.cpp
@@ -27,7 +27,6 @@
 #include "oic_string.h"
 #include "resourcemanager.h"
 #include "crlresource.h"
-#include "securevirtualresourcetypes.h"
 #include "srmtestcommon.h"
 #include "srmutility.h"
 #include "psinterface.h"

diff --git a/resource/csdk/security/unittest/doxmresource.cpp b/resource/csdk/security/unittest/doxmresource.cpp
index c2855ee..57d9883 100644 (file)
--- a/resource/csdk/security/unittest/doxmresource.cpp
+++ b/resource/csdk/security/unittest/doxmresource.cpp
@@ -24,7 +24,6 @@
 #include "oic_string.h"
 #include "oic_malloc.h"
 #include "resourcemanager.h"
-#include "securevirtualresourcetypes.h"
 #include "srmresourcestrings.h"
 #include "doxmresource.h"
 #include "security_internals.h"

diff --git a/resource/csdk/security/unittest/policyengine.cpp b/resource/csdk/security/unittest/policyengine.cpp
index 4480af5..2c9eafa 100644 (file)
--- a/resource/csdk/security/unittest/policyengine.cpp
+++ b/resource/csdk/security/unittest/policyengine.cpp
@@ -22,7 +22,6 @@
 #include "ocstack.h"
 #include "cainterface.h"
 #include "srmresourcestrings.h"
-#include "securevirtualresourcetypes.h"
 
 using namespace std;
 

diff --git a/resource/csdk/stack/include/internal/ocstackinternal.h b/resource/csdk/stack/include/internal/ocstackinternal.h
index a86a2de..afb9d4e 100644 (file)
--- a/resource/csdk/stack/include/internal/ocstackinternal.h
+++ b/resource/csdk/stack/include/internal/ocstackinternal.h
@@ -42,7 +42,7 @@
 
 #include "cacommon.h"
 #include "cainterface.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/resource/csdk/stack/include/ocpayload.h b/resource/csdk/stack/include/ocpayload.h
index a674517..23a37f9 100644 (file)
--- a/resource/csdk/stack/include/ocpayload.h
+++ b/resource/csdk/stack/include/ocpayload.h
@@ -34,7 +34,7 @@
 #include "platform_features.h"
 
 #if defined(__WITH_TLS__) || defined(__WITH_DTLS__)
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #endif
 
 #ifdef __cplusplus

diff --git a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
index 8d670ad..058261f 100644 (file)
--- a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
+++ b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
@@ -103,9 +103,9 @@ cp -f %{BUILD_DIR}/libmbedtls.a %{buildroot}/%{_libdir}
 cp -f %{BUILD_DIR}/libmbedx509.a %{buildroot}/%{_libdir}
 %endif
 
+install -d  %{DEST_INC_DIR}/experimental
 cp -rf resource/csdk/stack/include/ocstack.h* %{DEST_INC_DIR}/
-cp -rf resource/csdk/security/include/securevirtualresourcetypes.h* %{DEST_INC_DIR}/
-cp -rf resource/c_common/byte_array.h* %{DEST_INC_DIR}/
+cp resource/csdk/security/include/experimental/*.h* %{DEST_INC_DIR}/experimental/
 cp -rf resource/csdk/stack/include/ocstackconfig.h* %{DEST_INC_DIR}/
 cp -rf resource/csdk/include/octypes.h* %{DEST_INC_DIR}/
 cp -rf resource/csdk/logger/include/logger.h* %{DEST_INC_DIR}/
@@ -121,6 +121,7 @@ cp resource/csdk/stack/include/ocpayload.h %{DEST_INC_DIR}
 cp resource/c_common/platform_features.h %{DEST_INC_DIR}
 cp resource/c_common/iotivity_config.h %{DEST_INC_DIR}
 cp resource/c_common/*/include/*.h %{DEST_INC_DIR}
+cp resource/c_common/experimental/*.h* %{DEST_INC_DIR}/experimental/
 cp resource/csdk/stack/include/payload_logging.h %{DEST_INC_DIR}
 cp extlibs/tinycbor/tinycbor/src/cbor.h %{DEST_INC_DIR}
 cp -f com.oic.ri.pc %{DEST_LIB_DIR}/pkgconfig/

diff --git a/resource/include/OCProvisioningManager.hpp b/resource/include/OCProvisioningManager.hpp
index 7fdb50b..be7e83d 100644 (file)
--- a/resource/include/OCProvisioningManager.hpp
+++ b/resource/include/OCProvisioningManager.hpp
@@ -28,7 +28,7 @@
 #include "OCApi.h"
 #include "OCPlatform_impl.h"
 #include "oxmverifycommon.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 namespace OC
 {

diff --git a/resource/provisioning/examples/cloudAuth.cpp b/resource/provisioning/examples/cloudAuth.cpp
index 64e67f0..7c8182c 100644 (file)
--- a/resource/provisioning/examples/cloudAuth.cpp
+++ b/resource/provisioning/examples/cloudAuth.cpp
@@ -24,7 +24,7 @@
 #include "ocstack.h"
 #include "ocpayload.h"
 //#include "psinterface.h"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "doxmresource.h"
 #include "oic_malloc.h"
 #include "oic_string.h"

diff --git a/service/easy-setup/mediator/richsdk/inc/ESRichCommon.h b/service/easy-setup/mediator/richsdk/inc/ESRichCommon.h
index 2a29bd6..41715d7 100644 (file)
--- a/service/easy-setup/mediator/richsdk/inc/ESRichCommon.h
+++ b/service/easy-setup/mediator/richsdk/inc/ESRichCommon.h
@@ -32,7 +32,7 @@
 #include "ocstack.h"
 #include "octypes.h"
 #ifdef __WITH_DTLS__
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 #include "OCProvisioningManager.hpp"
 #include "ocrandom.h"
 #endif

diff --git a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp
index 5ac203e..08084a0 100755 (executable)
--- a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp
+++ b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp
@@ -24,7 +24,7 @@
 #include "OCPlatform.h"
 #include "OCApi.h"
 #include "OCProvisioningManager.hpp"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #include "EasySetup.hpp"
 #include "ESRichCommon.h"

diff --git a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/submediator.cpp b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/submediator.cpp
index b01688f..795b9fd 100644 (file)
--- a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/submediator.cpp
+++ b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/submediator.cpp
@@ -24,7 +24,7 @@
 #include "OCPlatform.h"
 #include "OCApi.h"
 #include "OCProvisioningManager.hpp"
-#include "securevirtualresourcetypes.h"
+#include "experimental/securevirtualresourcetypes.h"
 
 #include "EasySetup.hpp"
 #include "ESRichCommon.h"

diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec
index d0897e6..6338e9c 100755 (executable)
--- a/tools/tizen/iotivity.spec
+++ b/tools/tizen/iotivity.spec
@@ -267,6 +267,7 @@ mkdir -p %{ex_install_dir}/provision-sample
 
 
 cp ./resource/csdk/security/include/*.h %{buildroot}%{_includedir}
+cp ./resource/csdk/security/include/*/*.h %{buildroot}%{_includedir}
 cp ./resource/csdk/connectivity/api/*.h %{buildroot}%{_includedir}/
 cp ./resource/csdk/security/provisioning/include/oxm/*.h %{buildroot}%{_includedir}
 cp ./resource/csdk/security/provisioning/include/internal/*.h %{buildroot}%{_includedir}