From 6aec5263d44ccef91489ca45bdf0cd3ea054a7aa Mon Sep 17 00:00:00 2001 From: youngman Date: Wed, 22 Jun 2016 16:36:27 +0900 Subject: [PATCH] Enable security and Add csdk sample for security Change-Id: Ib56e1fafc281326f0acab0781e9505d331d01565 Signed-off-by: youngman --- packaging/iotivity.spec | 17 ++++------------- resource/csdk/security/provisioning/SConscript | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/packaging/iotivity.spec b/packaging/iotivity.spec index 2a59ec1..67fd1e2 100644 --- a/packaging/iotivity.spec +++ b/packaging/iotivity.spec @@ -11,11 +11,7 @@ Source1002: %{name}-test.manifest BuildRequires: gettext-tools, expat-devel BuildRequires: python, libcurl-devel BuildRequires: scons -BuildRequires: openssl-devel BuildRequires: boost-devel -BuildRequires: boost-thread -BuildRequires: boost-system -BuildRequires: boost-filesystem BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(capi-network-wifi) @@ -35,7 +31,6 @@ Requires(post): /sbin/ldconfig %endif %{!?TARGET_TRANSPORT: %define TARGET_TRANSPORT IP} -%{!?SECURED: %define SECURED 0} %{!?LOGGING: %define LOGGING True} %{!?ROUTING: %define ROUTING GW} %{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE tizen} @@ -109,7 +104,7 @@ cp %{SOURCE1001} ./%{name}-test.manifest #VERBOSE=1 scons -j2 --prefix=%{_prefix} \ TARGET_OS=tizen TARGET_ARCH=%{RPM_ARCH} TARGET_TRANSPORT=%{TARGET_TRANSPORT} \ - RELEASE=%{RELEASE} SECURED=%{SECURED} LOGGING=%{LOGGING} ROUTING=%{ROUTING} \ + RELEASE=%{RELEASE} SECURED=1 LOGGING=%{LOGGING} ROUTING=%{ROUTING} \ ES_TARGET_ENROLLEE=%{ES_TARGET_ENROLLEE} ES_ROLE=%{ES_ROLE} ES_SOFTAP_MODE=%{ES_SOFTAP_MODE} \ LIB_INSTALL_DIR=%{_libdir} @@ -119,7 +114,7 @@ rm -rf %{buildroot} CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; scons install --install-sandbox=%{buildroot} --prefix=%{_prefix} \ TARGET_OS=tizen TARGET_ARCH=%{RPM_ARCH} TARGET_TRANSPORT=%{TARGET_TRANSPORT} \ - RELEASE=%{RELEASE} SECURED=%{SECURED} LOGGING=%{LOGGING} ROUTING=%{ROUTING} \ + RELEASE=%{RELEASE} SECURED=1 LOGGING=%{LOGGING} ROUTING=%{ROUTING} \ ES_TARGET_ENROLLEE=%{ES_TARGET_ENROLLEE} ES_ROLE=%{ES_ROLE} ES_SOFTAP_MODE=%{ES_SOFTAP_MODE} \ LIB_INSTALL_DIR=%{_libdir} @@ -154,10 +149,9 @@ cp out/tizen/*/%{build_mode}/resource/examples/simpleserverHQ %{ex_install_dir} cp out/tizen/*/%{build_mode}/resource/examples/threadingsample %{ex_install_dir} cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_server.dat %{ex_install_dir} cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_client.dat %{ex_install_dir} -%if 0%{?SECURED} == 1 mkdir -p %{ex_install_dir}/provisioning -cp out/tizen/*/%{build_mode}/resource/provisioning/examples/oic_svr_db_client.dat %{ex_install_dir}/provisioning/ -cp out/tizen/*/%{build_mode}/resource/provisioning/examples/provisioningclient %{ex_install_dir}/provisioning/ +cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/provisioningclient %{ex_install_dir}/provisioning/ +cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat %{ex_install_dir}/provisioning/ cp ./resource/csdk/security/include/pinoxmcommon.h %{buildroot}%{_includedir} cp ./resource/csdk/security/include/securevirtualresourcetypes.h %{buildroot}%{_includedir} @@ -166,7 +160,6 @@ cp ./resource/csdk/security/provisioning/include/internal/*.h %{buildroot}%{_inc cp ./resource/csdk/security/provisioning/include/*.h %{buildroot}%{_includedir} cp ./resource/csdk/connectivity/api/casecurityinterface.h %{buildroot}%{_includedir} cp ./resource/csdk/connectivity/api/cacommon.h %{buildroot}%{_includedir} -%endif %if 0%{?tizen_version_major} < 3 mkdir -p %{buildroot}/%{_datadir}/license @@ -191,10 +184,8 @@ cp service/easy-setup/enrollee/inc/*.h %{buildroot}%{_includedir} %{_libdir}/liboc_logger_core.so %{_libdir}/liboctbstack.so %{_libdir}/libconnectivity_abstraction.so -%if 0%{?SECURED} == 1 %{_libdir}/libocpmapi.so %{_libdir}/libocprovision.so -%endif %if 0%{?tizen_version_major} < 3 %{_datadir}/license/%{name} %else diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript index 329aaca..9cc456f 100644 --- a/resource/csdk/security/provisioning/SConscript +++ b/resource/csdk/security/provisioning/SConscript @@ -116,6 +116,6 @@ provisioning_env.UserInstallTargetLib(provisioningserver, 'libocpmapi') if env.get('DTLS_WITH_X509') == '1': SConscript('ck_manager/SConscript') -if target_os in ['linux']: +if target_os in ['linux', 'tizen']: SConscript('sample/SConscript') -- 2.7.4