From 8a3ddbf8f05db207bb17cd63ce789b34bc7948b9 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Wed, 21 Sep 2016 16:11:02 +0200 Subject: [PATCH] build: Enable security by default From now on, developer will need to disable security explicitly: scons SECURED=0 Bug: https://jira.iotivity.org/browse/IOT-1295 Change-Id: Ic09acf3996b47799020730fc34cd382325a981d8 Origin: https://gerrit.iotivity.org/gerrit/#/c/12073/ Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/12073 Tested-by: jenkins-iotivity Reviewed-by: George Nash Reviewed-by: Dan Mihai Reviewed-by: Nathan Heldt-Sheller --- resource/csdk/connectivity/build/SConscript | 2 +- resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript | 2 +- .../easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript | 2 +- .../sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/SConscript | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resource/csdk/connectivity/build/SConscript b/resource/csdk/connectivity/build/SConscript index b8a864c..c697fff 100644 --- a/resource/csdk/connectivity/build/SConscript +++ b/resource/csdk/connectivity/build/SConscript @@ -59,7 +59,7 @@ help_vars.Add(BoolVariable('LOGGING', 'Enable stack logging', False)) help_vars.Add(EnumVariable('TARGET_OS', 'Target platform', host, host_target_map[host])) help_vars.Add(ListVariable('TARGET_TRANSPORT', 'Target transport', 'ALL', ['ALL', 'BT', 'BLE', 'IP'])) help_vars.Add(EnumVariable('TARGET_ARCH', 'Target architecture', default_arch, os_arch_map[target_os])) -help_vars.Add(EnumVariable('SECURED', 'Build with DTLS', '0', allowed_values=('0', '1'))) +help_vars.Add(EnumVariable('SECURED', 'Build with DTLS', '1', allowed_values=('0', '1'))) help_vars.Add(BoolVariable('UPLOAD', 'Upload binary ? (For Arduino)', require_upload)) help_vars.Add(EnumVariable('ROUTING', 'Enable routing', 'EP', allowed_values=('GW', 'EP'))) help_vars.Add(EnumVariable('BUILD_SAMPLE', 'Build with sample', 'ON', allowed_values=('ON', 'OFF'))) diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript b/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript index 637bdbe..7d05e4b 100644 --- a/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript +++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript @@ -54,7 +54,7 @@ help_vars.Add(BoolVariable('RELEASE', 'Build for release?', True)) # set to 'no' help_vars.Add(EnumVariable('TARGET_OS', 'Target platform', host, host_target_map[host])) help_vars.Add(ListVariable('TARGET_TRANSPORT', 'Target transport', 'ALL', ['ALL', 'IP', 'BT', 'BLE'])) help_vars.Add(EnumVariable('TARGET_ARCH', 'Target architecture', default_arch, os_arch_map[target_os])) -help_vars.Add(EnumVariable('SECURED', 'Build with DTLS', '0', allowed_values=('0', '1'))) +help_vars.Add(EnumVariable('SECURED', 'Build with DTLS', '1', allowed_values=('0', '1'))) help_vars.Add(EnumVariable('ROUTING', 'Enable routing', 'EP', allowed_values=('GW', 'EP'))) help_vars.Add(BoolVariable('WITH_PROXY', 'CoAP-HTTP Proxy', False)) # set to 'no', 'false' or 0 for debug help_vars.Add(ListVariable('WITH_MQ', 'Build with MQ publisher/subscriber/broker', 'OFF', ['OFF', 'SUB', 'PUB', 'BROKER'])) diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript index 672e20c..5315f4f 100644 --- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript +++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript @@ -74,7 +74,7 @@ help_vars.Add(BoolVariable('RELEASE', 'Build for release?', True)) # set to 'no' help_vars.Add(EnumVariable('TARGET_OS', 'Target platform', host, host_target_map[host])) help_vars.Add(ListVariable('TARGET_TRANSPORT', 'Target transport', 'ALL', ['ALL', 'IP', 'BT', 'BLE'])) help_vars.Add(EnumVariable('TARGET_ARCH', 'Target architecture', default_arch, os_arch_map[target_os])) -help_vars.Add(EnumVariable('SECURED', 'Build with DTLS', '0', allowed_values=('0', '1'))) +help_vars.Add(EnumVariable('SECURED', 'Build with DTLS', '1', allowed_values=('0', '1'))) help_vars.Add(EnumVariable('ROUTING', 'Enable routing', 'EP', allowed_values=('GW', 'EP'))) ###################################################################### diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/SConscript b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/SConscript index 77bd237..b59d4ae 100644 --- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/SConscript +++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/SConscript @@ -73,7 +73,7 @@ help_vars.Add(BoolVariable('LOGGING', 'Enable stack logging', False)) help_vars.Add(EnumVariable('TARGET_OS', 'Target platform', host, host_target_map[host])) help_vars.Add(ListVariable('TARGET_TRANSPORT', 'Target transport', 'ALL', ['ALL', 'BT', 'BLE', 'IP', 'TCP'])) help_vars.Add(EnumVariable('TARGET_ARCH', 'Target architecture', default_arch, os_arch_map[target_os])) -help_vars.Add(EnumVariable('SECURED', 'Build with DTLS', '0', allowed_values=('0', '1'))) +help_vars.Add(EnumVariable('SECURED', 'Build with DTLS', '1', allowed_values=('0', '1'))) help_vars.Add(BoolVariable('UPLOAD', 'Upload binary ? (For Arduino)', require_upload)) help_vars.Add(EnumVariable('ROUTING', 'Enable routing', 'EP', allowed_values=('GW', 'EP'))) help_vars.Add(EnumVariable('BUILD_SAMPLE', 'Build with sample', 'ON', allowed_values=('ON', 'OFF'))) -- 2.7.4