Commit 28c09f73 authored by Philippe Coval's avatar Philippe Coval Committed by Randeep

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: default avatarPhilippe Coval <philippe.coval@osg.samsung.com>
Signed-off-by: default avatarDan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21549Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: default avatarZiran Sun <ziran.sun@samsung.com>
Reviewed-by: default avatarMats Wichmann <mats@linux.com>
Reviewed-by: George Nash's avatarGeorge Nash <george.nash@intel.com>
Reviewed-by: Martin Roesch's avatarMartin Rösch <martin.roesch@kistler.com>
Reviewed-by: Randeep's avatarRandeep Singh <randeep.s@samsung.com>
parent 09d0121a
......@@ -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)
......
......@@ -29,7 +29,7 @@
#include "cacommon.h"
#include "byte_array.h"
#include "experimental/byte_array.h"
#ifdef __cplusplus
extern "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"
......
......@@ -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')
......@@ -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
......
......@@ -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"
......
......@@ -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>
......
......@@ -22,7 +22,7 @@
#define CRL_LOGGING_H_
#include "logger.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "C"
......
......@@ -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__)
......
......@@ -22,7 +22,7 @@
#define DEVICEONBOARDINGSTATE_H_
#include "octypes.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -24,7 +24,7 @@
#include <stdbool.h>
#include "ocstack.h"
#include "pmtypes.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "C"
......
......@@ -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>
......
......@@ -23,7 +23,7 @@
#include <stdlib.h>
#include "ocstack.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -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
......
......@@ -21,7 +21,7 @@
#ifndef SECURITYRESOURCEMANAGER_H_
#define SECURITYRESOURCEMANAGER_H_
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#include "cainterface.h"
#ifdef __cplusplus
......
......@@ -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" {
......
......@@ -23,7 +23,7 @@
#ifndef OCCERTUTILITY_H_
#define OCCERTUTILITY_H_
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -21,7 +21,7 @@
#ifndef _OXM_VERIFY_COMMON_
#define _OXM_VERIFY_COMMON_
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#include "casecurityinterface.h"
#ifdef __cplusplus
......
......@@ -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
......
......@@ -22,7 +22,7 @@
#define IOTVT_SRM_UTILITY_H
#include "ocstack.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "C"
{
......
......@@ -21,7 +21,7 @@
#define OC_CLOUD_PROVISIONING_H
#include "octypes.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -22,7 +22,7 @@
#define PM_CREDENTIAL_GENERATOR_H
#include "ocstack.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -24,7 +24,7 @@
#include "pmtypes.h"
#include "ocstack.h"
#include "octypes.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -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
......
......@@ -24,7 +24,7 @@
#include "pmtypes.h"
#include "ocstack.h"
#include "octypes.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -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"
......
......@@ -22,7 +22,7 @@
#define SRP_SECURERESOURCEPROVIDER_H
#include "ocstack.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#include "pmtypes.h"
#include "octypes.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
......
......@@ -22,7 +22,7 @@
#define OXM_JUST_WORKS_H_
#include "ocstack.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#include "ownershiptransfermanager.h"
#ifdef __cplusplus
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -22,7 +22,7 @@
#define OC_PROVISIONING_TYPES_H
#include <stdbool.h>
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -28,7 +28,6 @@
#include "ocrandom.h"
#include "srmutility.h"
#include "stdbool.h"
#include "securevirtualresourcetypes.h"
#define TAG "OIC_SRPAPI_CG"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -20,7 +20,6 @@
#include <string.h>
#include "resourcemanager.h"
#include "securevirtualresourcetypes.h"
#include "aclresource.h"
#include "pstatresource.h"
#include "doxmresource.h"
......
......@@ -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"
......
......@@ -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;
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -22,7 +22,6 @@
#include "ocstack.h"
#include "cainterface.h"
#include "srmresourcestrings.h"
#include "securevirtualresourcetypes.h"
using namespace std;
......
......@@ -42,7 +42,7 @@
#include "cacommon.h"
#include "cainterface.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -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
......
......@@ -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/
......
......@@ -28,7 +28,7 @@
#include "OCApi.h"
#include "OCPlatform_impl.h"
#include "oxmverifycommon.h"
#include "securevirtualresourcetypes.h"
#include "experimental/securevirtualresourcetypes.h"
namespace OC
{
......
......@@ -24,7 +24,7 @@
#include "ocstack.h"