resource: Don't log error of oc_mutex_free

IOT-2177 Don't log error if oc_mutex_free is called with null.

Change-Id: I1e589304f9bce866f5ba18800292204c78d43590
Signed-off-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19433
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit 36525788ca27c32354accc504f6dcc5875e1c902)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21141

[IOT-2461] Fix acl2 reverting

With this patch CTT 1.5.11 test CT 1.7.7.1
successfully reverts acl2 and it finally passes

Change-Id: I24e0d9d47a3c148a8626482fee22a4504f711270
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21393
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Aleksey Volkov <a.volkov@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

[IOT-2404] Implement "aceid" Update/Delete logic

Implemented:
1. Fully implemented Delete behaviour
2. Fully implemented Update behaviour

Change-Id: Ia5018e52845c944ee465754af0f539f4afd34345
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21275
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

build_common: Removing redundant env configuration

Moving global environment configuration common for all
platforms into build_common/SConscript and removing repeated
lines from build_common/[platform]/SConscript.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: Ic127e2c432ee50b0ba4aa91a460259d83d0b6b7d
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21287
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Reformat SConstruct to Python code style

This is the last important build script that did not get reformatted:
  clarify some things in comments
  4-space indents
  python style: should use "is" and "is not" comparisons to None
  use clearer test for service/java depend (java_build was just calculated)
  use list-of-dirs form to call list of projects

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Id260c2e55d62cb824d1e23e62df4ca8df5ce2b80
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21157
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

notification: Enable SECURED build of unit tests.

The notification consumer and provider tests didn't include
the "SECURED" macros for builds with security turned on, even
though it seems clear from the code, that it expected that macro
to be present in some cases.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: I1166a60c2ad821a7d6002e22a8c9e8bda7321800
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21329
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

tizen: Update doc about not downloading sqlite

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ie2d729e17e97a2fe364ff6a37926ff67fdf0abd3
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20441
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Youngman Jung <yman.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
(cherry picked from commit 2df9c51767694548149665181801b66cb2a89b83)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20787
Reviewed-by: Dave Thaler <dthaler@microsoft.com>

service-manager: Fix files permissions

Change-Id: I5ba2bb29ce1de8160142ee832f3fd40888e3f534
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21221
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

security: Fix logging crash due to end of strings

Fix logging crash due to reading past end of non-null terminated strings

Change-Id: I596c7cf7889017e46aefff9d68f08955a399e942
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19595
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
(cherry picked from commit 4266b7ecccce97d14e9e9cafb1e5cc86a8352e4f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21131
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

SVR DB Editor

This tool provides following features :
 [Doxm]
  - Print Doxm data
  - Modify Doxm data (T.B.D)

 [Pstat]
  - Print Pstat data
  - Modify Pstat data (T.B.D)

 [ACL]
  - Print ACL/ACE data
  - Modify ACL/ACE data (T.B.D)
  - Insert ACE to ACL
  - Remove ACE from ACL

 [Credential]
  - Print Credential data (Not fully supported yet)
  - Modify Credential data (T.B.D)
  - Insert credential to credential list (Not fully supported yet)
  - Remove credential from credential list

 [Generate default SVR DB]
  - (T.B.D)

New Feature: https://jira.iotivity.org/browse/IOT-2378
Change-Id: Ibf530c055207aced5270c5f8e1fb8019adc7243a
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Signed-off-by: sangjoon.je <sangjoon.je@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17365
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Youngman Jung <yman.jung@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit f43943b5ca63b3bc9c060ea2b7b17cfe4226e39c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21333
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Revert "[IOT-2068] EP payload creation function"

This reverts commit d4353319adbaa5f93c558b4ac3f68a01b3e21bc0.

It seems this patch breaks discovery (in provisioning via UDP)

Change-Id: I026e8a9f3988e0b09d2b9b9422ed7843a32db8df
Reviewed-on: https://gerrit.iotivity.org/gerrit/21353
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

[IOT-2392] Fix json2cbor

json2cbor failed to convert cred field of oic_svr_db_server_mfg.json
and oic_svr_db_client.json

Bug: https://jira.iotivity.org/browse/IOT-2392
Change-Id: Ib5a4c3bdc83a7156b63d899bc109bdf2dc58fb5a
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20539
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

build: define mbedtls_version before use

A recent change tried to centralize the mbedtls version into one
setting, but the setting is currently done after it is used in
an error message.  Move the assignment up above first use.

Change-Id: I3887c3f036fb0d22c4f4f60436ff75306fd7eb73
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21331
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Removed extra space

Change-Id: I2e75bae1bb7bcf0036173b32e2b3ce0435e72b23
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21089
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Use 1+ aceid values + properly duplicate them

Change-Id: I144f989c15b0b04e17815e241fbf108397bc86cd
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21229
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-by: Aleksey Volkov <a.volkov@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

IOT-2489 build: fix android arm64-v8a build

Fix boost build when building for arm64.

Bug: https://jira.iotivity.org/browse/IOT-2489
Change-Id: I8224b2a6c30a8517f3a9334b6aaf8145c695494f
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21317
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

resource: Fix files permissions

Change-Id: I7428f234a629135c80b172b3df06af2e4d8d8dfe
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21225
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

[IOT-2405] Enable building generic java in Windows

Changed the name of the iotivity-linux folder to
iotivity-java. Update the build scripts to account
for the name change of the folder. The name of the
output jar file is no longer iotivity-linux.jar it
is now iotivity.jar.

The JNI code links against the static librarys not
the shared librarys for oc, oc_logger, octbstack,
and connectivity_abstraction. Not all libraries are
have a dll built for windows, they must be statically
linked. This insures the Java code is identical for
all platforms. This also greatly reduces the number
of dependencies for the java code on native libraries.
The code now only needs to import ocstack-jni for the
IoTivity stack and ca-interface for security.

Other small updates to address compiler warnings.

Bug: https://jira.iotivity.org/browse/IOT-2405
Change-Id: I98392a6d0c2a5299746fa7dd6540724b0f5a4bc8
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21061
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

[IOT-2068] EP payload creation function

This is internal function which can be used to other function.

Change-Id: I6e1f70a801bca14bd9651395a0e29c9ba0fa6ce2
Signed-off-by: uzchoi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20981
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

[IOT-2378] .json and .dat matching

Bug: https://jira.iotivity.org/browse/IOT-2378
Change-Id: I2f5fc880f2f5ef324566adead3e8b5822278e2a3
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20481
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

[IOT-2086]Fix FTBFS when WITH_MQ,

the incorrect use of OICFree macro is removed

Change-Id: Ib9fdb7e994850475b233c914a71d4b94346e0c01
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20801
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20929
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Tweak provisioning unittest sconscript

New version (addressing [IOT-2396]) was pushed, which undid some of
  the "new" formatting style, restore
Refactor slightly, use src_dir and out_dir which are already
  defined, instead of re-fetching from env
Define an action for Popen on separate line, for readability

Change-Id: Id90944a50d7ec626d2e29a1822208c67b2c7b438
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21165
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Reformat extlibs SConscripts to be more Pythonic

There are not intended to be any functional changes.

Minor additonal changes:
  starred error/notice boxes trimmed to not be so wide, drop trailing stars
  minor language cleanup in a few messages
  a little reorg of comments in mbedtls
  instead of "print MESSAGE; Exit(1)" now do "msg = MESSAGE; Exit(msg)"
    to send error messages to the error stream instead of the output stream

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I9d7da2559eee30c8a3e076aeeae7b5a5f2c40843
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21199
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

tizen: Add support for Tizen:4:Unified (x86_64)

To use on x86_64:
gbsarch=x86_64 gbsprofile=tizen_4_0_unified_x86_64 ./gbsbuild.sh

Other arch might come later, if needed.

x86_64 was preferred, because that way,
we could run units tests on build hosts (TBC).

Change-Id: Ie827470e85b5eeacdcc3c35a1e596768f74e1e58
Bug: https://jira.iotivity.org/browse/IOT-2397
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20667
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
(cherry picked from commit 71e39d052c37c6fbc85deedb041ff32bf3db417d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20785
Reviewed-by: Youngman Jung <yman.jung@samsung.com>

build: Fix permissions fo extlibs build files

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ied0d6b123f99be4f076a814080949893e98eeb80
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21197
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>

build: Replace SCons.Error with exit message

The build would crash if JAVA_HOME was not specified
because SCons.Error was not imported into the script.
This replaces the error with an exit message.

Change-Id: Ic950ae3dc0d0c3308d7bbd90ab965b17f4563f0f
Signed-off-by: George Nash <george.nash@intel.com>
Bug: https://jira.iotivity.org/browse/IOT-1745
Reviewed-on: https://gerrit.iotivity.org/gerrit/20947
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
(cherry picked from commit 369d43b707cabcf715f50ff4827670196c4f425f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21159
Reviewed-by: Mats Wichmann <mats@linux.com>

[IOT-2412]Segment faults in ResourceContainerImpl

function is calling erase on the map container which will invalidate it. Hence, added guard calls.

Change-Id: I555895089d8dfa0a3a7f0d804dd5ccef8e4e1ece
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21097
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

[IOT-2414]Segment faults in RemoteSceneList.

Access to pointers are addressed by adding checks to ensure Segmentation fault errors

Change-Id: I024455adbf7d9f6fd887059a7361557e4907598d
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21047
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

zigbee_wrapper: Fix types and bitmasks mistakes

I am assuming author wanted to use bit mask (& operator)
and not "boolean or" (|| operator).

This change wasn't tested on device, so double check welcome.

Observed warnings using clang on GNU/Linux:

  plugins/zigbee_wrapper/src/zigbee_wrapper.c:871:27: \
  warning: implicit conversion from enumeration type 'OCEntityHandlerResult' to different enumeration type 'OCStackResult' [-Wenum-conversion]
  stackResult = OC_EH_ERROR;
                        ~ ^~~~~~~~~~~
  plugins/zigbee_wrapper/src/zigbee_wrapper.c:1034:39: \
  warning: use of logical '||' with constant operand [-Wconstant-logical-operand]
  if (attributeList.CIEMask || CIE_MOVE_TO_LEVEL)

Change-Id: Ieb8f20f121cdd11d5b697c8f8e199bd00ae295ea
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18403
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
(cherry picked from commit cc58983e9d2a050e529ecab9ff04afbea463afa4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/19625
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>

bridging: Return false boolean instead of enum

Small Fix to support g++-7.1.0

It was tested on yocto poky master on iotivity-1.3.0 (and later):

  bridging/plugins/nest_plugin/nest_objects/nest.cpp: \
  In member function 'bool Nest::isAuthorized()':
  bridging/plugins/nest_plugin/nest_objects/nest.cpp:95:16: \
  error: enum constant in boolean context [-Werror=int-in-bool-context]

Change-Id: Ib53aa7be0198cd926b6901b173001910a324633e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21071
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>

provisioning: Support python 2 or 3

Change-Id: I92cd2266e46c7f1b81de92ad4b6a0ad3fdf6f27d
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19277
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit fd1d81adcc42bf36f1a8d8ac63420aa660e0baa5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21107
Reviewed-by: George Nash <george.nash@intel.com>

[IOT-2441] Initialize OCByteString.

OCByteStringCopy tries to free any existing
buffer.  When OCByteString is not initialized it
is possible to free an invalid pointer.

Bug: https://jira.iotivity.org/browse/IOT-2441
Change-Id: Ic5ebf559f4a33ffed7864163238bb304342b794a
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20959
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

SConscript android cleanups

Rewrite if cmp()...elif cmp() sequence to not use slicing
  no more "magic numbers" referring to substring lengths
Update some comments
Update resource/csdk/connectivity/build/android/SConscript to
  be closer to build_common/android one
Pass error message to Exit instead of doing Exit(1) - this
  sends the error msg to stderr instead of stdout (convention)

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I094cd6ecc6fecd1055f8742dd33f45d4134c2876
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21153
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

[IOT-2396] fix security provisioning unittest

Enable provisioning unittest for linux and windows

Change-Id: Ia3134247a4e5f7ede45b06f59e02e560794585ab
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20639
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Fixed typo on JniCaInterFace

Fixed typo on JniCaInterFace

Change-Id: If8d1adbed2da8a29ce8f232e34db10d91d1506d4
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19815
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit b4256fb7f3f51255642cb23db8ba79f29b1220f2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21143
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

security: Refactor json2cbor for error checking

Detect JSON type and make json2cbor fail on error.
IoTivity JSON are "upgraded" by default,
Swagger files are just converted.
Json2cbor report not zero on failure.
This prevents silent failure when generating CBOR from JSON.
Many MLK fixed.

Bug: https://jira.iotivity.org/browse/IOT-2310
Change-Id: I905b7d2ba1021686e3794167266b1853ad0f9872
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20795
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit 48dfc99470067336f65ed2e7570b041805cd6d81)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21145

Logging improvements

[Dan Mihai]

1. Define OC_LOG_PRIVATE_DATA bit that can be added to any of the
   DEBUG, INFO, WARNING, ERROR, or FATAL log levels.

2. Don't log OC_LOG_PRIVATE_DATA messages unless they have been enabled
   explicitly, by calling OCSetLogLevel.

3. Use a single OC_LOG_LEVEL instead of the old SET_LOG_INFO,
   SET_LOG_ERROR, SET_LOG_WARNING and SET_LOG_FATAL macros.

4. Always honor the value of g_level - e.g., don't log WARNING messages
   when g_level == ERROR.

5. Windows: add support for specifying the value of LOG_LEVEL in run.bat.

.

[Philippe Coval]

Ported from master to 1.3-rel

Change-Id: I85f6e7a8cb9798708344250ba2cbb278a0e6e7f6
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18279
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21149

tizen: Drop TARGET_ARCH from gbsbuild.sh

Instead rely on gbs -a arg to select desired arch

Revert "tizen: Use TARGET_ARCH in samples"

This reverts commit 4be7601cb4b0747132b5ae04ceaeea7541976b93.
https://gerrit.iotivity.org/gerrit/#/c/19055/

Bug: https://jira.iotivity.org/browse/IOT-2032
Change-Id: I4be7601cb4b0747132b5ae04ceaeea7541976b93
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21099
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

service/scene-manager: SConscript cleanup

This is a scons scripts cleanup left after fixing /W4 warnings for Windows.

Preparing SConscript files for removal of arbitrary global "env"
modifications in script files outside build_common/ directory.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: Ifc31a5a429f336b4fa17243e65eb5212d6253968
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21151
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

service/simulator: SConscript cleanup

This is a scons scripts cleanup left after fixing /W4 warnings for Windows.

Preparing SConscript files for removal of arbitrary global "env"
modifications in script files outside build_common/ directory.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: I6f6e01d1c95b28637aba494feed2801670a7947f
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19565
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
(cherry picked from commit c8c8213b861b7400f66c03f4671db1bbf5b02f69)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21109
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

simulator: Disable SECURED mode

Simulator will be built only in Unsecured mode on IP transport.

Bug: https://jira.iotivity.org/browse/IOT-2239
Change-Id: I1bf19643c7ffe53ea995ca4b1dfd5a713fbe864a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20703
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
(cherry picked from commit d398ef7e4d4c41ce739c18d18012a88c7cbc7c3d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21091
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

bridging: Cleaning up SConscript files.

Removing settings already present in the global "env" variable
along with any modifications to that global environment to get rid
of cross dependencies between scripts and forcing them to be executed
in a specific order.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: I383e01dcfaf23a323d51199e5d091e57751659bc
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20943
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

resource: Include functional header for g++-7.1.0

It was tested on yocto poky master on iotivity-1.2.1 (and later):

  resource/include/OCUtilities.h: \
  In function 'OCStackResult OC::nil_guard(PtrT&&, FnT&&, ParamTs&& ...)':
  resource/include/OCUtilities.h:85:21: \
  error: 'bind' is not a member of 'std'
  return std::bind(fn, p, std::ref(params)...)();

  resource/include/OCApi.h: At global scope:
  resource/include/OCApi.h:362:18: \
  error: 'function' in namespace 'std' does not name a template type
  typedef std::function<void(std::shared_ptr<OCResource>)> FindCallback;

Change-Id: Ie1cab497c33fde394f77490a1d636eb36a563396
Origin: https://gerrit.iotivity.org/gerrit/#/c/21069/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21067
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
(cherry picked from commit 26c2798188497da22e0a70efebc47991dd755db2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21065
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

service/resource-container: SConscript cleanup

This is a scons scripts cleanup left after fixing /W4 warnings for Windows.

Preparing SConscript files for removal of arbitrary global "env"
modifications in script files outside build_common/ directory.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: I637d27e2debfd184a19755eea56fbdeb083cd0b6
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21095
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Remove 'using namespace' keyword from JNI headers

The use of the 'using namespace OC' was causing an
ambiguous symbol between the C++ OC::OCResource and
the C OCResource when including ocpayload.h.

It is bad practice to use 'using namespace' key words in
header files because any code that includes that header
also imports the namespace, whether they want it or not.

This defeats the purpose of namespaces and can cause name
collisions.

This is part of the work for IOT-2405

Bug: https://jira.iotivity.org/browse/IOT-2405
Change-Id: I8e7e01b1bf645b6333166bd4624a82e9f0345bf8
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20767
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit ef076e24c7e81742b80c048a76a4023c635062d9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21059

tizen: Guess TARGET_ARCH from gbs param

I noticed that previously arm binary where built into out/x86
Even if this is not harmful, It's better to rely on gbs's %{_arch}.

Change-Id: I1968c8d3c0705c536a2b055090ea142100f91bc2
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20309
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 5c26449ec8c725cdc8f4f7a99f6ac9c664400760)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21003
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>

build: Reformat resource/csdk to be more Pythonic

[Mats Wichmann]

Reformat resource/csdk SConscripts to be more Pythonic 2/4

These are the resource/csdk/stack subset

There are not intended to be any functional changes, with a minor
exception: in resource/csdk/stack/samples/linux/secure/SConscript,
the samples are now assigned to an appropriately constructed list,
which is assigned an Alias, rather than two similar but different
conditional Alias lines with the list inline.

There is no consistently "pretty" way to fold long lines,
the choices were made by a tool (yapf) but occasionally
overridden to be a little more consistent

The test harness is now consistently imported as:
  from tools.scons.RunTest import run_test
rather than import * - should normally avoid importing whole
namespace unqualified unless it is really needed

[Philippe Coval]

Merge from master to 1.3-rel

Conflicts:
resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript
resource/csdk/stack/samples/tizen/build/SConscript
resource/csdk/stack/samples/tizen/build/scons/SConscript
resource/csdk/stack/test/SConscript

Change-Id: I0e15b375a052ef792b2a1c4470552e5e0e4fb3fc
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20697
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Origin: master
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20909
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>

build: Reformat resource/c_common SConscripts

[Mats Wichmann]

Reformat all of the resource/c_common SConscripts to be more Pythonic

There are not intended to be any functional changes
The test harness is now consistently imported as:
  from tools.scons.RunTest import run_test
rather than import * - should normally avoid importing whole
  namespace unqualified unless it is really needed

[Philippe Coval]

Ported to 1.3-rel from master

Conflicts:
resource/c_common/unittests/SConscript

Change-Id: I7957659932535f63f7e3e98a786b997c6a0dca3b
Signed-off-by: Mats Wichmann <mats@linux.com>
Origin: master
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20573
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

build: Reformat build_common SConscripts (follow)

[Mats Wichmann]

build: Reformat all of the build_common SConscripts to be more Pythonic

There are not intended to be any functional changes.
The help variable definitions are split into multi-line,
in anticipation of later improving the descriptions and using
keyword-argument style to make the purpose of other args more clear.

Also included two files at the top level in this set,
as they seem to have the same intent as build_common.

In build_common/android/SConscript, an identical 4-line stanza, beginning:
  elif cmp(flags[0:9], 'PLATFORM=') == 0:  # get target platform: android-x
appears three times, the second and third were dropped in this change.

[Philippe Coval]

Port from master to 1.3-rel to help mergeback

Conflicts:
build_common/SConscript
build_common/android/SConscript
build_common/windows/SConscript

Change-Id: I0077e7350754fef25e75621fdb4a41cf00000002
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20545
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Origin: master
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21073
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Modification as per SVACE result for Java layer

Change-Id: If26f219c2e137efa292dae87468eb4fc8abe987b
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21033
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>

build: Reformat build_common SConscripts

[Mats Wichmann]

build: Reformat all of the build_common SConscripts to be more Pythonic

There are not intended to be any functional changes.
The help variable definitions are split into multi-line,
in anticipation of later improving the descriptions and using
keyword-argument style to make the purpose of other args more clear.

Also included two files at the top level in this set,
as they seem to have the same intent as build_common.

In build_common/android/SConscript, an identical 4-line stanza, beginning:
  elif cmp(flags[0:9], 'PLATFORM=') == 0:  # get target platform: android-x
appears three times, the second and third were dropped in this change.

[Philippe Coval]

Port from master to 1.3-rel to help mergeback

Conflicts:
build_common/SConscript
build_common/android/SConscript
build_common/external_builders.scons
build_common/linux/SConscript

Change-Id: I0077e7350754fef25e75621fdb4a41cfcf28ef2a
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20545
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Origin: master
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20923
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

build: Reformat the service SConscripts

[Mats Wichmann]

These reformattings are not supposed to change any behavior,
but they are not all purely whitespace. For example, consecutive
lines of Append(LIBS=  or Append(CPPPATH= were collapsed into
one call with multiple entries in the list.

A few comments were beefed up, as were occasional informative messages.

Import of run_test moved to top (Python style), except the two scripts
where the unittest code is not isolated to a subdirectory - the import
has to be protected so it is only called for targets that support
the tests - the import fails on Tizen for some reasons.  Change this
when separate patches to isolate unit test building/running are merged.

[Philippe Coval]

Ported to 1.3-rel from master

Conflicts:
service/easy-setup/enrollee/unittests/SConscript
service/easy-setup/mediator/richsdk/unittests/SConscript
service/notification/cpp-wrapper/unittest/SConscript
service/notification/unittest/SConscript
service/resource-container/unittests/SConscript
service/resource-encapsulation/src/common/SConscript
service/resource-encapsulation/src/serverBuilder/SConscript
service/resource-encapsulation/unittests/SConscript

Change-Id: Ifaf3eb2d837e773a06e59b50132f0d3c8881fdd8
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20553
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21001
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

tizen: install library from variant dir

This change is imported from this json build change in master:
https://gerrit.iotivity.org/gerrit/#/c/20363/

Change-Id: I4f65b3947db8ffd37c687c5583b602f37d61ed3a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21021
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

build: Fail on unsupported argument

Also use same sys.exit everywhere

1.3-rel should fail un tizen_unsecured
because that component is not yet merged

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I98e14eff713a6434d0521bc2235d127826a45acf
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20781
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
(cherry picked from commit ae20072dc07ad11d770bbeccdcbefee685aeb504)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21007
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Revert "[IOT - 2386] Fix for NULL reference..."

This reverts commit 2819a9def15e8b401ee21ab1f941fa2af8a3f41e.

LL_FOREACH_SAFE already checks for NULL list entry, so there is no
need to check a second time inside the loop.

Change-Id: Ia7a33ce6a3c6bb88cd529831af07010729a2badb
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20963
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>

[IOT-2426] Update IPCA ElevatorServer files

Update the JSON and DAT files to comply with the recent security changes.

Change-Id: I8b5f70a4f3153b4000eba9f5569ed54bc28529e9
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20961
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

easy-setup: Add missing path for android ndk-r13b

[IOT-1863]force to include missing  header for build with ndk-r13b

current android build script using ndk-r10d
when update ndk as ndk-r13b,
it showing build fail due missing header file.
So, force to include missing header file

Change-Id: Ic23ab789f907c4e576e83bccc0c26f41350a6446
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17525
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit 73b39d4c5450f0863fce16743ee424b5cb95ddfd)
Bug: https://jira.iotivity.org/browse/IOT-1863
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21019

[IOT-1917]Fix memory leak: cert/key/CRL

Fix memory leak: cert/key/CRL information returned by cred resource
https://jira.iotivity.org/browse/IOT-1917

Change-Id: Ic563b5e5b79ccac8855ebb5b215e475d1b4e57be
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18057
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
(cherry picked from commit dba44fd8ce7219897966054446c992184369fbfa)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20933
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

build: Improve target message in build_common

Improve the text of host/target unsup message in build_common

No operational changes

Change-Id: I6a8b95fac210a8f80132bebab148a67dfa76d51d
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19637
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 570d343aa00bb5b503c7c6cea904eb52691a42e0)
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20579
Reviewed-by: Habib Virji <habib.virji@samsung.com>

build: Use sys.exit instead of exit

This change is to fix conflict between master and 1.3-rel

Reviewed-on: https://gerrit.iotivity.org/gerrit/19955

Bug: https://jira.iotivity.org/browse/IOT-2237
Change-Id: Ib000a648b889d7d9956d6b26a9dc2111e7b96200
Origin: https://gerrit.iotivity.org/gerrit/#/c/20877/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20877
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit f99878445ce793627a4af92e26c9b1ce797b8949)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21005
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

[IOT-2424] Fixed non-UUID subject rowner.

Also added additional debug logging to rowner check.

Change-Id: Ic6c2849ebe9519568e789b2a4b34e40252746474
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20977
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>

[IOT-2395] security: tcp provisioning fix

Security provisioning samples via tcp fixed

Change-Id: Iff96834af80413053dee9318a352132eeaf60ebb
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20641
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Switch to preferred Python method for checking sys.platform

Older Pythons can set linux or linux2 in sys.platform.
The suffix is meaningless, deprecated, and no longer happens as of Python 3.3.
The preferred idiom (from Python docs) is:

    if sys.platform.startswith('linux'):

Twiddled a few other things, "imports at the top" rule,
and a couple of related error msgs, and a few strings

In a few places, more could have been done to clean up, but skipped
to keep the patches small

Change-Id: Iccdfa9eb77ff4bc1429e3b38837a8732455a5dfd
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19641
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit 39f1ec664b3abc4e9d58b48a2e281a66ef11a153)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20925
Reviewed-by: Ossama Othman <ossama.othman@intel.com>

build: Add a way for auto_build.py to print actions without executing

[Mats Wichmann]

EXEC_MODE={one of: False, false, 0} python auto_build.py args
will print what the script would do without actually running the actions
Found it hard to keep track of all the different targets,
this is a quick way to report.

[Philippe Coval]

Port from master to 1.3-rel

Conflicts:
auto_build.py

Change-Id: I6e03cc45ef4e51a5accde6f9866f7b62d3e002b7
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18635
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20789
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

resource-encapsulation: Fix typo on Destroyed word

Bug: https://jira.iotivity.org/browse/IOT-2267
Change-Id: I4f582fb992a0829de0549fd164c283726650c363
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20853
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 5f97a0d81aa2b495a4ce122ad193ec22955c8569)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20973

[IOT-2207] Update build to use android-ndk-r10e

The android-ndk-r10d is unsupported. This updates the scripts
to download and use version r10e.

Bug: https://jira.iotivity.org/browse/IOT-2207
Change-Id: I730524749f76868f81756a1f704ee761819d1891
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20561
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit 09dd38165eae5a7313cabf39ae2f817d892f1f7b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20939
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

connectivity: Fix typo on success word

Change-Id: I74042b17ef67725c42b40eb239e977c43e60ec10
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20875
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
(cherry picked from commit 62ea2a7f506ddf23ebb8985b03ad640ed361a8c4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20931
Reviewed-by: Peter Hatina <phatina@gmail.com>

build: Enable MULTIPLE_OWNER by default

Bug: https://jira.iotivity.org/browse/IOT-2241
Change-Id: Id2e1bd03d887076204117c6f7ab60e435804d886
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20699
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit 16e1df43f7f04a5c0950397f2282defb1bdb0c13)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20821
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

Removed print statments from SConscripts

The print statments were basically added in for
debugging the SCons scripts. Unless the debug messages
are expected they provide zero help and cause
confusion.

Change-Id: I96cc33e93997fb2b9b7f55c664f2e2aa059d25a3
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20777
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 673cccdd0b656158c7d35474d419c8bf40466aca)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20887

Reformat all of the bridging SConscripts to be more Pythonic

There are not intended to be any functional changes,

Change-Id: Ife37bdb04c0ff05fcf50d9f7274b71026f053fd9
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20543
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 900b6fcf57a2515880a1238ed794515f7dde9372)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20569
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>

Reformat all of the cloud SConscripts to be more Pythonic

There are not intended to be any functional changes, and
this set of changes turned out to be relatively minor.

Change-Id: I738b2f2f43d3edd069426daa06ba29f7aaa33bef
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20535
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit b3aa625df006bb6c0a5d6269e6a82219d0bffefc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20575
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

build: Reformat resource/csdk SConscripts to be more Pythonic 4/4

These are the resource/csdk/security subset

There are not intended to be any functional changes, with a minor exception:
in resource/csdk/security/provisioning/sample/SConscript, the samples are
now assigned to an appropriately constructed list, which is extended
in the case of MULTIPLE_OWNER, this list is then assigned an Alias.
This is done to avoid having two parallel lists and needing to keep
in sync.

Header lines with doubled comment styles were changed to just Python,
that is, change this style (quoted so git doesn't strip the lines):

"# // Copyright 2015 Samsung Electronics All Rights Reserved."

to this:

"# Copyright 2015 Samsung Electronics All Rights Reserved."

There is no consistently "pretty" way to fold long lines,
the choices were made by a tool (yapf) but occasionally overridden
to be a little more consistent

The test harness is now consistently imported as:
  from tools.scons.RunTest import run_test
rather than import * - should normally avoid importing whole
namespace unqualified unless it is really needed

Change-Id: If1876589b2cad83c1c4795dae5e3ddc59c78fca1
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20805
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Origin: master
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20907
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Improve the frustrating gtest SConscript

Define gtest version in a single variable, for future-proofing
Fix to "python style" (except long lines and constant names) - indents, etc.
Fix redefinition of builtin name 'var' (windows section)
Quit right away if target does not need gtest, and remove extra checks
  for this elsewhere
Add checks for help and clean targets: should not unpack/config/build in
  these cases, and actually clean if clean is called
Split configure and build targets for non-windows:
  may still need to build even if already configured (due to clean target)

Change-Id: Ic9818fdd221eb2d3d7fead8c9585c41db80b3d5a
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18633
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Origin: master
Reviewed-on: https://gerrit.iotivity.org/gerrit/20905
Reviewed-by: Peter Hatina <phatina@gmail.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

[CHP] Unit test fixes for the Coap-http proxy.

Some build failure seen at:
https://build.iotivity.org/ci/job/iotivity-verify-unit_tests/16257/console

Reason : In the test cases we are sending the http request to the http server.
There is a possibility if http server does not respond, test case may fail.

Change-Id: I0a0a823779c8c30819af3973393d3fb744cc9d7f
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20913
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

[RE] Added print statement in the rcs_common_test for fixing mocking crash.

There is a crash on the specific ubuntu 16.04 [64-bit]version, while running the
rcs_common_test. Added the print statement to fix it,

Issue seems to be of mocking framework support for 16.04 [64-bit] as same code
is working on 14.04 [32-bit and 64-bit].
Moreover, I tried to remove the print statement in other services mocking calls
it also results in the crash.

bug: https://jira.iotivity.org/browse/IOT-2416
Change-Id: Ic848e889aa3985567dad2d88b4945efdcd0733fd
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20803
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

easy-setup: Drop unnecessary gtest flags

This will help for upgrading gtest to latest release

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ic807bfcd7356aa807671e0b378fcda2a558c24b2
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20239
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>

[NS] Notification consumer valgrind invalid read/write fix.

Bug: https://jira.iotivity.org/browse/IOT-2373
Change-Id: Ifd3789538c3d368b7ca3da52d274bb7ed531c126
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20831
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit bdc2263c344879854b914ec5efd0e232137c49c2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20663
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>

Reformat all of the java SConscripts to be more Pythonic

There are not intended to be any functional changes

Some reformatting after initial comments

Change-Id: I2db5b04e2498974396ff3ba6033b521ebd3ab61a
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20537
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit 44c0f9d561e356d685544f15134999bf90184d9e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20901

[IOT-2097][IOT-2098] Cleanup of base64 code

[IOT-2097] According to RFC4648 Base64 can accept empty data.
Fixed error for input containing no data for b64Encode and
b64Decode.

[IOT-2098] Add error checking to b64Decode. The original code
would decode any string even if it contained characters that are
invalid for base 64 encoding. Code now checks that all
characters found in the encoded string are [A-Z][a-z][0-9]+/=

The padding character '=' is checked to only be at the end of
the encoded string.

Unit tests improved. They now include test vectors from RFC4648
Unit tests now cover failure cases. Not just pass cases.

Improved documentation
 - Add file documentation for base64.h file
 - Add reference to RFC4648.
 - Documented all B64Result enum values
 - Add [in],[out] markup for b64Encode function
 - Add code example for b64Encode function
 - Add [in],[out] markup for b64Decode function
 - Add code example for b64Decode function

Bug: https://jira.iotivity.org/browse/IOT-2097
Bug: https://jira.iotivity.org/browse/IOT-2098

Change-Id: I3d6167c85a766ae8200339f00ef5c978f0ec55b7
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19187
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

build: Install csdk to resource/stack

To avoid to mix C and C++ headers
As iotivity.pc suggests (and aligned to Yocto)

Change-Id: Ib7294d8cae27c3e9a496f06fe293d77a087c860e
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20671
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit bdf5c0ecb075c5664755fe77f4b31a7c347cb5e3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20851
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

build: Include gtest header using system path

Change-Id: If22cffaa199d1057497019fd45c502b8ae69b8de
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20341
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit 4ec6ab957de7fe29db51e66586f00e40fde6519a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/19833

security: Apply code style to json2cbor.c code

There is not functionnal change,
It was done to make upcoming changes easier to review.

Bug: https://jira.iotivity.org/browse/IOT-2310
Change-Id: I6f8cd3ed7cd0a6e3c9d9879996964de8e8aa3a99
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20879
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
(cherry picked from commit 837d2ee9b23e24ca47651cbaa5ceb6b6d6beebf6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20883
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

IOT-1583: Removing /W4 warnings - part 6.

Removing remaining /W4 warnings and enabling /W4 along
with /WX globally.

Change-Id: I521f17e36038e0cc74c14afbb7e6a7a2cee6c45e
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19691
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

tizen: Change permission for scripts to executable

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ife97d14d33dc8321913765e4b5ffca2c71e1a3ee
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20435
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
(cherry picked from commit 22e4be493821d9a538de5e0995d3982daec194da)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20783

build: Windows: Work around coap.h race

Build coap.h before everything else, to work around an apparent
multi-threaded build race condition.

Bug: https://jira.iotivity.org/browse/IOT-2376
Change-Id: Ic112cfea42dfa1ac12735b4af882dc45a74c853d
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20891
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ibrahim Esmat <iesmat@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Omar Maabreh <omarm@microsoft.com>

IOT-1583: Removing /W4 warnings - part 5.

Removing variable type and size mismatch warnings.

Change-Id: Ic0c2f4935faf5136c93c79f58f58cb0f3f59d2ab
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20731
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

resource/examples: Removing /W4 warnings

Removing "unreachable code" warnings due to infinite waits.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: I8d057494e39540f35f1ec447217d70eff556d1c0
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20727
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

RD: Removing /W4 warnings

Making sure variables are always initialized before they get used.
This was an issue in case we'd hit an error and use "goto" to skip
parts of the code.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: I35a114585371c61dab94a67d957f0b01a98938a5
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20723
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

oc_logger: Removing /W4 warnings

Disabling "unreachable code" warning for a known issue
inside a boost header.

See: https://svn.boost.org/trac/boost/ticket/5904.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: Ic313fd1debc9df73eca2d747d6eda1b883b7b9be
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20729
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

build: Reformat the examples SConscript to be more pythonic.

There are no functional changes.  A comment was updated.

Change-Id: I9200be3cc66559de0c40c0d3c99c09f15a039291
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20571
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

stack/samples: Removing /W4 warnings.

Removing variable shadowing warnings: there were a few
variables using the same name in one scope and thus one
overwritten the other.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: I9b20da2c4ebea8bdb4bbc3b64c7d308060bf258e
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20735
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

resource/examples: Removing /W4 warnings.

Removing variable shadowing warnings: there were a few
variables using the same name in one scope and thus one
overwritten the other.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: Ifb3d1237bea27faa4b94739c13607c48cb0de46a
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20737
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

connectivity: Fix permission of sources

Change-Id: Ibc63061b15d67481370214fc322c7db302537018
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20657
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
(cherry picked from commit 98f5dc539f79f02615791397d4827480e2cc05f4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20675

resource/unittests: Removing /W4 warnings.

Removing variable shadowing warnings: there were a few
variables using the same name in one scope and thus one
overwritten the other.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: I6405fd2119722b24c3a29c7f8478d1b801d0c1d4
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20741
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

RD: Removing /W4 warnings.

Removing variable shadowing warnings: there were a few
variables using the same name in one scope and thus one
overwritten the other.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: I13a8e9456f280347e2035cc80a9c7818facc51e9
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20733
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

[IOT-2409] IUT rejects /acl2 Update from CTT

The CTT was posting an Update to /acl2 that included only
rowneruuid in the payload.  The IUT was rejecting because it
could not determine that the payload was /acl2 (vs. /acl v1).

This is wrong behavior by IUT because such a payload is actually
valid /acl2 and/or /acl v1 payload.

This patch changes the logic so that it only rejects an Update
based on version if it can determine it is an incompatible version -
in this case, v1 - and accepts it otherwise.

A similar problem exists in the /cred Update handler, which
(in a particular state) treats a payload containing just rowneruuid
as a failed attempt to Update the Owner credential.

This patch changes that logic too, to no longer treat a "NO_SECURITY_MODE"
credType as an Owner credential.

Change-Id: Ica9bde112cb87bd6ad6ee014cf7526928545d786
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20779
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

resource/src: Removing /W4 warnings.

Removing variable shadowing warnings: there were a few
variables using the same name in one scope and thus one
overwritten the other.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: Ic30ecba67a98154eb506929ef23b1fabb560a42a
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20739
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

build: Enable WITH_PROXY by default

Bug: https://jira.iotivity.org/browse/IOT-2240
Change-Id: Iabf0f5bbff2c2c9fbb284a0614c206b66e3cd1bd
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20819
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

build: Set executables mode on extlibs scriptlets

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I767a9c68b0270b71ca4bd814526e51ddd4dad990
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20433
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
(cherry picked from commit 1191376d2ae3ccdf9888c105f21e8d9d68934638)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20577
Reviewed-by: Habib Virji <habib.virji@samsung.com>

notification: Drop unnecessary gtest flags

This will help for upgrading gtest to latest release

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I4ddf3bb98ad257d8bb21b5e0ef388405d574131c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19775
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>