iotivity.git
9 days agobuild: Apply OCF patch if needed 05/23605/1 1.2-rel
Philippe Coval [Fri, 1 Dec 2017 15:45:56 +0000 (16:45 +0100)]
build: Apply OCF patch if needed

Ported from master branch

Conflicts:
extlibs/mbedtls/SConscript

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I2928fed0a97b51f358a0f87f35b164317b4d7b9d
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/16967/
Reviewed-on: https://gerrit.iotivity.org/gerrit/16967
Reviewed-by: Mats Wichmann <mats@linux.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
9 days agoconnectivity: Link unitest to ocsrm 03/23603/1
Philippe Coval [Fri, 1 Dec 2017 16:36:42 +0000 (17:36 +0100)]
connectivity: Link unitest to ocsrm

Problem was observed while building with clang on GNU/Linux or gcc-6.3

  clang++-3.5 \
  -o out/linux/x86_64/release/resource/csdk/connectivity/test/catests \
  (...)
  /usr/bin/ld: \
  out/linux/x86_64/release/liboctbstack_internal.a(ocpayloadparse.o): \
  undefined reference to symbol 'cbor_value_leave_container'
  liboctbstack.so: error adding symbols: DSO missing from command line

Conflicts: from master
resource/csdk/connectivity/test/SConscript

Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Change-Id: I13aceaa9817b77991a316888efe7cf761bcd2266
Reviewed-on: https://gerrit.iotivity.org/gerrit/19303
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
9 days agobuild: Add cstack logger to iotivity.pc.in 37/23537/4
Philippe Coval [Sat, 8 Oct 2016 12:16:12 +0000 (14:16 +0200)]
build: Add cstack logger to iotivity.pc.in

If using iotivity from outside it prevents errors like:

  resource/OCApi.h:34:21: fatal error: \
  octypes.h: No such file or directory
  resource/OCApi.h:38:25: fatal error: \
  oc_logger.hpp: No such file or directory

Change-Id: I4aa09152e26435ecf9564f839ebfdf6c8ab66db8
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
9 days agombedtls: Display exceptions on issue 87/19887/5
Philippe Coval [Wed, 22 Feb 2017 01:33:02 +0000 (02:33 +0100)]
mbedtls: Display exceptions on issue

To help to understand instability issues:

https://build.iotivity.org/ci/job/iotivity-verify-tizen/8815/

Observed message is:

  mbedtls SConscript: cannot copy
  /home/abuild/rpmbuild/BUILD/iotivity-1.2.0/extlibs/mbedtls/config-iotivity.h
  to
  /home/abuild/rpmbuild/BUILD/iotivity-1.2.0/extlibs/mbedtls/mbedtls/include/mbedtls/config.h

Change-Id: I08504251bd7768ff237bb757b82fc6d17d8f6dde
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17417
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
9 days agoeasy-setup: Link to tls lib in secured mode 89/23589/3
Philippe Coval [Fri, 1 Dec 2017 19:30:41 +0000 (20:30 +0100)]
easy-setup: Link to tls lib in secured mode

Failed to build while building on secured mode on debian

Change-Id: I638f24695e2974f0b083bffe5bb55a30d8b0cd33
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
9 days agotizen: Ship resource_directory in main subpackage 37/23137/3
Philippe Coval [Fri, 10 Nov 2017 08:16:56 +0000 (09:16 +0100)]
tizen: Ship resource_directory in main subpackage

It's part of resource, not service.

Bug: https://jira.iotivity.org/browse/IOT-524
Origin: https://gerrit.iotivity.org/gerrit/#/c/23131/
Change-Id: I502591a8db1c48bc21d9dd0b768c46efb353b6c3
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
13 days agoAdd CONTRIBUTING.md 43/23543/1
Mats Wichmann [Wed, 13 Sep 2017 17:53:02 +0000 (11:53 -0600)]
Add CONTRIBUTING.md

github evaluates the maturity of a project in part by whether it has
certain things set up: a readme, a license, a contributions document
and a code of conduct.  There's no cost to adding the CONTRIBUTING.md
which the github mirror will pick up - it's the content from a web page
(and points to that page as well).

Change-Id: Idb77d3b822482ddc430cf500eca0a6bae5ccc955
Signed-off-by: Mats Wichmann <mats@linux.com>
(cherry picked from commit 140f1b9f0ca98661c582e03289610da3ad77316c)

4 weeks agoresource-encapsulation: Fix permissions of sources 39/17939/6
Philippe Coval [Mon, 6 Mar 2017 15:40:25 +0000 (16:40 +0100)]
resource-encapsulation: Fix permissions of sources

resource-encapsulation: Remove exec permission on sources

Change-Id: Iabb87176a2a6d13fe74e7b92697a3273e8bf9f0c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17697
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
(cherry picked from commit 2c85048af8f0c2cc77fe897018485f174095af17)

4 months agocsdk: Use OIC_LOG for logging single string 05/21405/2
Philippe Coval [Wed, 22 Feb 2017 18:31:40 +0000 (19:31 +0100)]
csdk: Use OIC_LOG for logging single string

csdk: Use OIC_LOG instead of OIC_LOG_V for logging single string

This was creating mess with arduino macros (using VA lists).
An other patch to come later
.
Conflicts:
resource/csdk/connectivity/src/caprotocolmessage.c
resource/csdk/connectivity/util/src/cautilinterface.c
resource/csdk/resource-directory/src/rd_client.c
resource/csdk/security/src/policyengine.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/stack/src/ocresource.c

Change-Id: I9657e11c96e84f375408e732917a275c7c3c1fb0
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17439
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21405
Reviewed-by: Taekyu Kang <bestbefore@naver.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
4 months agoarduino: Display context for OIC_LOG_V 09/21409/2
Philippe Coval [Wed, 22 Feb 2017 17:56:28 +0000 (18:56 +0100)]
arduino: Display context for OIC_LOG_V

Some errors were silently ignored,
now they will at least appear partially.

Change-Id: I426b173848cf3ef19bc732be8c462b74e6a02840
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21409
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
5 months agoresource: Include functional header for g++-7.1.0 69/21069/3
Philippe Coval [Wed, 28 Jun 2017 02:54:05 +0000 (04:54 +0200)]
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/21069
Reviewed-by: Sudarsana Babu Nagineni <sudarsana.nagineni@intel.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
8 months agoSSL adapter unit tests update 05/17805/2
ol.beketov [Thu, 9 Mar 2017 12:59:31 +0000 (14:59 +0200)]
SSL adapter unit tests update

Unit tests for various cipher suites updated in
correspondence to changes from the patch 16251
"Support for multiple ciphersuites".

Change-Id: Ie65bb0df79cb9a17d88d41fde9f791c75a04db17
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17805
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 months agoMinor change - make log info for format options more specific. 57/15757/3
Ziran Sun [Fri, 9 Dec 2016 15:00:45 +0000 (15:00 +0000)]
Minor change - make log info for format options more specific.

Change-Id: Ib3e524d452e5b6df2255820fcd8f06c61805c70a
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15367
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 70aa3942c5f7694c87cb81c16be1a12708252363)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15757
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
8 months agoClose the socket file descriptor when pthread_create() is failed 17/16717/2
hyuna0213.jo [Tue, 24 Jan 2017 06:07:35 +0000 (15:07 +0900)]
Close the socket file descriptor when pthread_create() is failed

Change-Id: If1ef1a96140b0de756797b38cf2f51ae1d76cd02
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16717
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
9 months agoIOT-1877 : start presence issue 23/17623/2
ChaJiWon [Thu, 2 Mar 2017 12:06:00 +0000 (21:06 +0900)]
IOT-1877 : start presence issue

When called OCStartPresence() second, OCStartPresence() returns error.
Fixed presenceState variable to OC_PRESENCE_UNINITIALIZED.

Change-Id: I089c826f4105eb3aaf835a8feda4c10b848ebd5d
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17623
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
9 months agoChange the name of 'tcp' of 'p' property 09/17209/3
hyuna0213.jo [Mon, 13 Feb 2017 08:12:44 +0000 (17:12 +0900)]
Change the name of 'tcp' of 'p' property

The name of "tcp" key was changed from "tcp" to
"x.org.iotivity.tcp".

Change-Id: I200c9a32116b5740ec8994d4b6600ad54b5f102e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17209
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
9 months agoCorrect the errata in docs related to security 21/16721/3
Youngman [Tue, 24 Jan 2017 05:24:41 +0000 (14:24 +0900)]
Correct the errata in docs related to security

Change-Id: I3f16e16cd4fff4fce1006672478337965e2f9d11
Signed-off-by: Youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16721
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
9 months agoAdding Android API's for Multiple Owner Transfer (MOT) 01/15001/12
Randeep Singh [Thu, 8 Dec 2016 11:57:12 +0000 (17:27 +0530)]
Adding Android API's for Multiple Owner Transfer (MOT)
Patch2:Minor issue fixed

Change-Id: I23375562abbb41760abb942aafea2c8c83fe8a9c
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15001
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
9 months agoMoved a requestId declaration in OCServerRequest 15/17015/3
hyuna0213.jo [Thu, 2 Feb 2017 07:48:37 +0000 (16:48 +0900)]
Moved a requestId declaration in OCServerRequest

we should not add attributes after payload as they get overwritten
when payload content gets copied over.

Change-Id: I0c8a430f92c2196d3f9c816e9ba9d16fd44d88e4
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17015
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
9 months agoResolving svace issues 43/17043/3
amar [Thu, 2 Feb 2017 04:54:47 +0000 (13:54 +0900)]
Resolving svace issues

Change-Id: I9086e50f802d93dbacf45858646ddfd828791296
Signed-off-by: Amar Srivastava <amar.sri@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17043
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
9 months agoResolved svace issues 41/17041/2
amar [Wed, 1 Feb 2017 08:49:18 +0000 (14:19 +0530)]
Resolved svace issues

Change-Id: Id3aa9a857756a0cda216a12dbef42d9e326998c2
Signed-off-by: amar srivastava <amar.sri@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17041
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
9 months agosolved svace issues 37/17037/2
amar [Wed, 1 Feb 2017 08:03:02 +0000 (13:33 +0530)]
solved svace issues

Change-Id: I617f405bbbf88d4567be0f024c60873e851dcb46
Signed-off-by: amar <amar.sri@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17037
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
9 months agoSecurity and connectivity defects fix 39/17039/10
Oleksii Beketov [Fri, 3 Feb 2017 08:47:47 +0000 (10:47 +0200)]
Security and connectivity defects fix

Some minor defects (NULL checks and double frees) fixed

Change-Id: I066a238a9379d45d1f377cc5a144c0bc0a97ccb7
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17039
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
9 months agoAdd API to set a MOT status. 85/16585/3
Chul Lee [Thu, 19 Jan 2017 15:50:50 +0000 (00:50 +0900)]
Add API to set a MOT status.

Change-Id: I08ab5b4c0d07034d71429ac8698e5ed4763ced2c
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16585
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
9 months agoModify SetResult() to handle reset usecase 75/16375/3
Jongmin Choi [Fri, 13 Jan 2017 09:09:00 +0000 (18:09 +0900)]
Modify SetResult() to handle reset usecase

SetResult() modified to handle reset usecases
- SecurePort used for closing secure connection
- doxm and pstat properties reset after failed ownership transfer

Patch #1: initial upload
Patch #2: Null check added

Change-Id: I674aa195ed1f10c04baef47fd7f5192945f78a65
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16375
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
9 months agoSupport for multiple ciphersuites 51/16251/4
Jongmin Choi [Mon, 9 Jan 2017 10:54:05 +0000 (19:54 +0900)]
Support for multiple ciphersuites

SetupCipher() modified to support multiple ciphersuites
rather than using a fixed one

Patch #1: initial upload
Patch #2: Rebased and SetupCipher() related changes applied
Patch #3: Rebased

Change-Id: I6cb57605984c273bcdb98c5130da9a9995ae50db
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16251
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
9 months agoFixed memory leak on OCSetDeviceInfo and CARetransmissionDestroy 67/17167/3
jihwanseo [Fri, 10 Feb 2017 07:26:51 +0000 (16:26 +0900)]
Fixed memory leak on OCSetDeviceInfo and CARetransmissionDestroy

Change-Id: Ic53ae0759020fa26f5f70425d3dab09ff5e7d375
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17167
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
10 months agoUpdated SSL_CHECK_FAIL macro to ignore bad client hello message. 67/16367/3
Chul Lee [Fri, 13 Jan 2017 05:12:58 +0000 (14:12 +0900)]
Updated SSL_CHECK_FAIL macro to ignore bad client hello message.

Change-Id: I317e63d192af372844e672650c261578508e9331
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16367
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoModify CreateResetProfile() to preserve the original profile 37/16237/3
Jongmin Choi [Mon, 9 Jan 2017 00:31:16 +0000 (09:31 +0900)]
Modify CreateResetProfile() to preserve the original profile

CreateResetProfile() modified to preserve the original profile
created at first

Patch #1: Initial upload

Change-Id: I3420d83a8c8a8b17f947dd244bb03ce7926159bb
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16237
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoUpdate sample SVR DB for MOT 63/17063/3
Chul Lee [Mon, 6 Feb 2017 08:28:20 +0000 (17:28 +0900)]
Update sample SVR DB for MOT
according to https://gerrit.iotivity.org/gerrit/#/c/16791/

Change-Id: Ia765112faa639e40770f35e3a34bcd51db60a340
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17063
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoAdd NULL check across the ca_adapter_net_ssl.c 87/16487/4
Chul Lee [Tue, 17 Jan 2017 09:19:23 +0000 (18:19 +0900)]
Add NULL check across the ca_adapter_net_ssl.c

Change-Id: If2f43c0150afcb344c290f8bcb21f7647b0daa01
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16487
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoChange the cred usage according to CR33(MfgCertOTMClarifications) 15/16515/3
Chul Lee [Wed, 18 Jan 2017 00:44:06 +0000 (09:44 +0900)]
Change the cred usage according to CR33(MfgCertOTMClarifications)

Change-Id: I042a93cd8acc6c0ec5f6e77f24ecb78b667b9912
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16515
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoFix selected ciphersuite info of established session 69/16569/2
Joonghwan Lee [Thu, 19 Jan 2017 04:25:46 +0000 (13:25 +0900)]
Fix selected ciphersuite info of established session

Fixed selected ciphersuite infomation to get from
the session object when session established.
This patch will be needed in case of multiple (D)TLS session are initiating.

Patch 1:Initial upload

Change-Id: I245443f9e1216da72c742fe7eafaf24445050dfa
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16569
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoFix crash in ssl retransmission thread 75/16575/2
Joonghwan Lee [Thu, 19 Jan 2017 08:33:20 +0000 (17:33 +0900)]
Fix crash in ssl retransmission thread

It is possible to happen segmentation fault if retransmission thread
lock a mutex during CAdeinitSslAdapter function is called

Patch 1: Initial upload

Change-Id: I446aeb2cc9d6cd07d2683984ba2783ab72020c58
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16575
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months ago[IOT-1592] Fix unit test of notification service. 41/16341/14
KIM JungYong [Thu, 12 Jan 2017 06:22:32 +0000 (15:22 +0900)]
[IOT-1592] Fix unit test of notification service.

Dependency of hippomocks is removed in notificaiton service

Bug: https://jira.iotivity.org/browse/IOT-1562
Change-Id: I4d8b44b1c06c1abcc73a15fa87db94056a642b9d
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16341
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
10 months agoChange property names for IoTivity only security features 91/16791/3
Jongmin Choi [Thu, 26 Jan 2017 04:10:22 +0000 (13:10 +0900)]
Change property names for IoTivity only security features

IoTivity only security property names changed to use "x.org.iotivity"

Patch #1: initial upload

Change-Id: Iee08b3e0a4d862d90fec5c6be738e8e70bf9d037
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16791
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoApplied HW PKI wrapper for manufacturer cert handler. 71/16471/2
Chul Lee [Tue, 17 Jan 2017 05:36:51 +0000 (14:36 +0900)]
Applied HW PKI wrapper for manufacturer cert handler.

Change-Id: If7987aa3d3764a80fb7bd81cb2ddbc2596de4c3d
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16471
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoGetDerCrl() fix 39/16439/2
Oleksii Beketov [Mon, 16 Jan 2017 16:14:08 +0000 (18:14 +0200)]
GetDerCrl() fix

Memory leak in GetDerCrl() fixed

Change-Id: Iddf0628c73d69ce8beafa66b09b4b2f2e61e8006
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16439
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoLogs added for confirmation callbacks 89/16189/4
Jongmin Choi [Fri, 6 Jan 2017 06:43:35 +0000 (15:43 +0900)]
Logs added for confirmation callbacks

Logs added for confirmation callbacks

Patch #1: initial upload
Patch #2: Additional logs added
Patch #3: Rebased

Change-Id: I0b42eeaccb21c9b11d1c8effecd8797ee80c2929
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16189
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoUpdate PDM 87/16187/11
Chul Lee [Fri, 6 Jan 2017 06:06:25 +0000 (15:06 +0900)]
Update PDM

This patch addresses the following exceptional cases :
 1. The PT terminates unexpectedly.
    - Start the OTM process
    - Device information will be changed to INIT state.
    - PT terminated while OTM.
    - Restart the PT process.
    - Retry the OTM process.
    * OTM start will be failed due to device info already save as INIT state.

  2. Timeout is occured PT side while OTM.
    - Start the OTM process
    - Device information will be changed to INIT state.
    - OTM timeout is occured at the application side.
    - PT retry the OTM.
    * OTM start will be failed due to device info already save as INIT state.

I've added defence code and
added cleanup API that can be used when timeout occurs.

Patch #1 : Initial upload
Patch #2 : Retrigger
Patch #3 : Fix the bug for incorrect PIN inputed while random PIN OxM.
Patch #4-5 : Retrigger
Patch #6 : minor bug fix
Patch #7-8 : Retrigger
Patch #9 : Fix the incorrect log
Patch #10 : Retrigger

Change-Id: I7781c0d864db6fdac93fa41acbcbf1ac123d15da
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16187
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoBuild: Remove CSDK oc and boost dependency 69/15869/4
Gabriel Schulhof [Wed, 18 Jan 2017 07:48:26 +0000 (09:48 +0200)]
Build: Remove CSDK oc and boost dependency

Bug: https://jira.iotivity.org/browse/IOT-1694
Change-Id: Ib77261260d3597986f461f23af311b479dad56c8
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15869
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
10 months agotizen: Use mediator richsdk lib 63/16963/3
Philippe Coval [Wed, 1 Feb 2017 14:15:31 +0000 (15:15 +0100)]
tizen: Use mediator richsdk lib

Change-Id: Ib63db28697925b02349da82c5feabc1334a39ba2
Forwarded: https://gerrit.iotivity.org/gerrit/#/q/Ib63db28697925b02349da82c5feabc1334a39ba2
Origin: https://review.tizen.org/gerrit/112583
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16963
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
10 months agotizen: Enable CLOUD and ship ES lib 65/16965/2
Philippe Coval [Wed, 1 Feb 2017 14:15:31 +0000 (15:15 +0100)]
tizen: Enable CLOUD and ship ES lib

Change-Id: I84ce3dd94e1a90f13f0ff875221ca5061828618e
Forwarded: https://gerrit.iotivity.org/gerrit/#/q/I84ce3dd94e1a90f13f0ff875221ca5061828618e
Origin: https://review.tizen.org/gerrit/112583
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16965
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
10 months agoeliminate [-Wcomment] warning 41/16041/3
Gregg Reynolds [Sun, 3 Jul 2016 21:28:26 +0000 (16:28 -0500)]
eliminate [-Wcomment] warning

The JNI files mix C and C++ comments, so we get tons of annoying
warnings: "/*" within comment [-Wcomment]

Since the JNI layer is in C++ we remove the C comments.

Change-Id: I7fb5b2009a787e62de0b9b62ff7d06de4f33b699
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9109
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Petre Eftime <petre.p.eftime@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 77d6c342a2971a42be78487386966d2cc764837e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16041
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
10 months ago /oic/res error response for query handling 81/15881/15
Habib Virji [Tue, 6 Dec 2016 17:51:04 +0000 (17:51 +0000)]
 /oic/res error response for query handling

- Stop the error response on invalid multicast /oic/res request.
- An error message is sent in case of unicast.
- In case of empty query for interface and resource type,, it sends an error message.
- Add unit tests to test the callback returned value.

BUG: https://jira.iotivity.org/browse/IOT-1650
Change-Id: I2f5902f46030d28ebcc8dc28c7e2f4fbcb6a1716
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15881
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
10 months agoAdding Android wrapper to set a seed value for UUID generation 93/16493/4
saurabh.s9 [Tue, 17 Jan 2017 11:33:51 +0000 (17:03 +0530)]
Adding Android wrapper to set a seed value for UUID generation

Change-Id: Id123f745b4409bebbd5cccf9b0d7d8b7e3b7a08d
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16493
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoAdding C++ wrapper and test case to set a seed value for UUID generation 35/16435/5
saurabh.s9 [Mon, 16 Jan 2017 11:55:05 +0000 (17:25 +0530)]
Adding C++ wrapper and test case to set a seed value for UUID generation

Change-Id: I14d20ce49b87741dfbef34631cb8f728f3c33b41
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16435
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agofix ocpmapi lib option for iotivity.pc 27/16627/2
Youngman [Fri, 20 Jan 2017 08:24:25 +0000 (17:24 +0900)]
fix ocpmapi lib option for iotivity.pc
- because the default value of EXC_PROV_SUPPORT is 0, a script related to it should be modified

Change-Id: I44cd08856687b2c8606145aeade9002fcf3db108
Signed-off-by: Youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16627
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agomodify dtls define for iotivity.pc 29/16129/5
Youngman [Thu, 5 Jan 2017 03:54:59 +0000 (12:54 +0900)]
modify dtls define for iotivity.pc

Change-Id: I202ddf448b3e36d142aff20a62ac4f9286c1829c
Signed-off-by: Youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16317
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 717e5146ba51c164c96b00c28014cccaf05426f1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16129
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoFixed double free issue when destroying endpoint 67/16567/4
hyuna0213.jo [Thu, 19 Jan 2017 03:52:31 +0000 (12:52 +0900)]
Fixed double free issue when destroying endpoint

- after destroying memory, set NULL value to prevent double free
- add the usage of oc_mutex_lock() when block data is updated

Change-Id: I78d0d46e37333e099ec737ac4500a2f388d58c4e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15447
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16567
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: byonggon chun <bg.chun@samsung.com>
10 months agoFix OCParseArray passed value treated as array 61/15761/5
Habib Virji [Fri, 9 Dec 2016 12:43:08 +0000 (12:43 +0000)]
Fix OCParseArray passed value treated as array

OCParseArray was incremented the passed CborValue. The passed value was incrementd by one.

BUG: https://jira.iotivity.org/browse/IOT-1660
Change-Id: I96fcd27714989732278627b0d61fb68683112b8a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15361
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit ecece3db80424dbb3274264b4af4a411351b28c2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15761
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
10 months agotizen: Use easy-setup mediator 45/16545/2
Philippe Coval [Wed, 18 Jan 2017 14:06:18 +0000 (15:06 +0100)]
tizen: Use easy-setup mediator

Change-Id: I2b0681b70218613c0df0d82e0f46fdc61668296e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16545
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jooseok Park <jooseok.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
10 months agoUpdate StartMultipleOwnershipTransfer to prevent unnecessary communications 89/16489/2
Chul Lee [Tue, 17 Jan 2017 09:32:41 +0000 (18:32 +0900)]
Update StartMultipleOwnershipTransfer to prevent unnecessary communications

Change-Id: I151244bed344640fdcb396cd4d2be1f82a64ca0e
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16489
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months ago[Hotfix] Add DTLS handshake callback invocation after DTLS handshake done. 85/16485/3
Chul Lee [Tue, 17 Jan 2017 09:14:30 +0000 (18:14 +0900)]
[Hotfix] Add DTLS handshake callback invocation after DTLS handshake done.

Change-Id: I482f3d56dc1528c1287691d168b5272878065bbe
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16485
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoSsladapter unit tests update 23/16323/2
Oleksii Beketov [Wed, 11 Jan 2017 13:46:38 +0000 (15:46 +0200)]
Ssladapter unit tests update

Ssladapter unit tests updated to correspond new ciphersuites list

Change-Id: I0f4a6327f0eb9aa6038974db89a8b3bb2c6814c3
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16323
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoFix mutex unlock in case of dtls retransmit fail 39/16339/3
Joonghwan Lee [Thu, 12 Jan 2017 04:45:17 +0000 (13:45 +0900)]
Fix mutex unlock in case of dtls retransmit fail

Patch 1: Initial upload
Patch 2: Build retrigger

Change-Id: I50bfe828a7522d245b7382f0252e465ca31eaff1
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16339
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoFix to access dereferenced object memory in OCSecure class 69/16369/5
Joonghwan Lee [Fri, 13 Jan 2017 06:11:44 +0000 (15:11 +0900)]
Fix to access dereferenced object memory in OCSecure class

This patch fix below invalid memory access in OCSecure class
- invalid DisplayNumContext object access
- invalid UserConfirmNumContext object access
- minor fix : prevent duplicated call of SetResult()

Change-Id: I623c856f7086cf7fe7333e69f682070434961fbe
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16369
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoAdding Android Interface API saveACL() and doSelfOwnershiptransfer() 35/15835/5
Randeep Singh [Wed, 18 Jan 2017 09:50:56 +0000 (15:20 +0530)]
Adding Android Interface API saveACL() and doSelfOwnershiptransfer()

Change-Id: Ia19bb669d073868a1ca74b1e98968383256a62aa
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15835
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
10 months agobuild: Install provisioning ESException.h 39/16539/2
Jihun Ha [Wed, 18 Jan 2017 08:28:59 +0000 (17:28 +0900)]
build: Install provisioning ESException.h

Add ESException.h to 'inc' folder and a list of install target headers

Change-Id: Ib0b7e7bbab9cf5d8f7cc0c69e223d966e4b055b0
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/16521/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16539
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
10 months agoeasy-setup: Rename header to EasySetup.hpp 81/16481/4
Philippe Coval [Tue, 17 Jan 2017 08:48:05 +0000 (09:48 +0100)]
easy-setup: Rename header to EasySetup.hpp

Prevent potential name clash on case insensitive filesystems:

./service/easy-setup/mediator/richsdk/inc/EasySetup.h
./service/easy-setup/enrollee/inc/easysetup.h

Mediator one is C++ so we rename it to .hpp

Change-Id: I6d784378b5065b162d06abb2338bf70e0147d864
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16479
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 98b92dae54a9244e1947937fcf7432ac38956659)
Origin: https://gerrit.iotivity.org/gerrit/#/c/16481/
Reviewed-on: https://gerrit.iotivity.org/gerrit/16481

10 months agobuild: Ship provisionning headers 31/16531/3
Philippe Coval [Wed, 18 Jan 2017 12:03:56 +0000 (13:03 +0100)]
build: Ship provisionning headers

New headers should be installed if part of public API:

- OCProvisionningManager.hpp
- OCCloudProvisioning.hpp

Change-Id: I29a322f2dae9b0d978cdd05d4ca3ad71729d1923
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16533
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit b47123f262c22afba170feec0abd4d56c827b5ea)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16531

10 months agobug fixed for log4j 19/16519/2
Jung Seungho [Wed, 18 Jan 2017 08:05:16 +0000 (17:05 +0900)]
bug fixed for log4j

Change-Id: I8dad768f634071ce2a6ba4224085d4dc8c88f34c
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16519
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
10 months agoAdd API to set a seed value for UUID generation, 59/16259/14
Chul Lee [Mon, 9 Jan 2017 12:04:05 +0000 (21:04 +0900)]
Add API to set a seed value for UUID generation,
to ensure that a device always uses the same UUID.
If the seed value is not set, a UUID is generated randomly.

Patch #1 : Initial upload
Patch #2 : add header file include on srmutility.c.
Patch #3 : Updated according to comments.
Patch #4 : Fix build error
Patch #5 : rebase
Patch #6 : Fix coredump
Patch #7-8 : Retrigger
Patch #9-10 : Updated according to comments.
Patch #11-13 : Retrigger

Change-Id: I6ce668866b5881386a52ef8cb9de5226b8595749
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16259
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agofix the build error when appcliation build resource encapsulation 61/16461/3
Jooseok Park [Tue, 17 Jan 2017 04:16:25 +0000 (13:16 +0900)]
fix the build error when appcliation build resource encapsulation

 - add the missing header file in installed target header

Change-Id: I71b65d6df422bd758e543118c2580ac770213399
Signed-off-by: JooseokPark <jooseok.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16461
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
10 months agoFix the notification service SConscript 59/16459/2
Jooseok Park [Mon, 16 Jan 2017 07:53:23 +0000 (16:53 +0900)]
Fix the notification service SConscript

 - when application use the notification service, build error occurs.
 - i.e) /usr/include/service/notification/NSConsumerInterface.h:35:22: fatal error: NSCommon.h: No such file or directory
 - Although NSConsumerInterface.h includes NSCommon.h, NSCommon.h file is not installed in SConscript.
 - So, need to add NSCommon.h in installed header

Change-Id: I2f28f84504d68c5506c89513d74adcdf32d2bbfc
Signed-off-by: JooseokPark <jooseok.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16427
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit e4eca38246a40013530b7df74c1b369960c88897)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16459
Tested-by: Uze Choi <uzchoi@samsung.com>
10 months agotizen: avoid to duplicate headers 49/16449/2
Philippe Coval [Mon, 16 Jan 2017 20:01:50 +0000 (21:01 +0100)]
tizen: avoid to duplicate headers

Rely on pkg-config instead.

Change-Id: Ieff754b33a21015a17fc9a8d107ee29f1376dfa1
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16449
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
10 months agobuild: Add ES NS paths to pkg-config 47/16447/2
Philippe Coval [Mon, 16 Jan 2017 20:01:50 +0000 (21:01 +0100)]
build: Add ES NS paths to pkg-config

Public easy-setup and notification headers,
are copied in 2 level depths directory.

Change-Id: I7c9fd3a4bd1143c5ea05e7902292af23cf5e8934
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16447
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
10 months agobuild: Install notification headers 43/16443/2
Philippe Coval [Mon, 16 Jan 2017 20:01:49 +0000 (21:01 +0100)]
build: Install notification headers

It look like project public headers
 are installed to 2 level depth
 subdirectories (service/$domain/*.h*)

Change-Id: I36ab613ff6aaf7d960e6ba1e94263f8cfdf7c559
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16443
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
10 months agobuild: Install easy-setup headers 45/16445/2
Philippe Coval [Mon, 16 Jan 2017 20:01:50 +0000 (21:01 +0100)]
build: Install easy-setup headers

It look like project public headers
 are installed to 2 level depth
 subdirectories (service/$domain/*.h*)

Change-Id: Ia7a66caf5381d24b56f0c5ac1a91929eff9ba7d7
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16445
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
10 months agoAdd PEM support to credential publicData 45/15945/4
Andrii Shtompel [Mon, 26 Dec 2016 17:04:13 +0000 (19:04 +0200)]
Add PEM support to credential publicData

Change-Id: Id5bfd6b1a08c295b49981bd7b938ec5d23522db4
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15945
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agoAdded Android interface API setPinType(). 07/16307/4
Sandeep Sharma [Wed, 11 Jan 2017 06:37:23 +0000 (12:07 +0530)]
Added Android interface API setPinType().

Change-Id: I98ba58c440d252cc3f32dd589e1a0eed3935b675
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
10 months agomodified log property and certificate path 21/16421/2
Jung Seungho [Mon, 16 Jan 2017 04:08:10 +0000 (13:08 +0900)]
modified log property and certificate path

Change-Id: I8a0322b946e324afcdda32520bf90f7859dbcdd7
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16421
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
10 months agomodified cloud samples to work in tls mode 39/16039/6
Jung Seungho [Mon, 2 Jan 2017 08:09:24 +0000 (17:09 +0900)]
modified cloud samples to work in tls mode

- add TLS ciphersuites logic in samples
- add libraries related to TLS ciphersuites in SConscript

Change-Id: If1b7e95552deab984c4ac8f3432e31bd63dbd286
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16039
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
10 months agotizen: exit on build failures 57/16357/5
Philippe Coval [Thu, 12 Jan 2017 10:56:02 +0000 (11:56 +0100)]
tizen: exit on build failures

Change-Id: Idba6c2f3a35854d468b4e32bc3db5b4420bd94bb
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16345
Reviewed-by: Mats Wichmann <mats@linux.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 0bce63c24c9e0aea0dcad3058eb967e90c16b7ad)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16357

10 months agotizen: Support Tizen:2 by avoiding python accelerator 55/16355/3
Philippe Coval [Thu, 12 Jan 2017 10:56:02 +0000 (11:56 +0100)]
tizen: Support Tizen:2 by avoiding python accelerator

Change-Id: I8714771d36a158fafc838c8d5e71d8e563682a1b
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16347
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
(cherry picked from commit 7787a5e47df85f03d3b8d3585504d2e25af4f1d9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16355

10 months agoFix ownership transfer issues 71/16371/3
Jongmin Choi [Fri, 13 Jan 2017 06:41:34 +0000 (15:41 +0900)]
Fix ownership transfer issues

Fix issues related to ownership transfer
- Port change after failed ownership transfer

Patch #1: initial upload
Patch #2: build error fix

Change-Id: Ia6df0e7b862f73fab166ccb2c8ceee6c348b8189
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16371
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoParseChain update 09/15509/10
Oleksii Beketov [Thu, 12 Jan 2017 11:23:21 +0000 (13:23 +0200)]
ParseChain update

1. ParseChain modified to get rid of 0x0 termination restriction.
Upon now the certificate chain may contain mix of PEM or DER
certificates with or without any separating symbols.
2. Add unit test for ParseChain

Change-Id: I6a2d6664c323e415e79fbddf63842b29fe15e338
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15509
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoAdd NULL check in StartRetransmit function. 11/16311/5
Chul Lee [Wed, 11 Jan 2017 07:59:02 +0000 (16:59 +0900)]
Add NULL check in StartRetransmit function.

Change-Id: Ia7772c1cd574be8b001a43e7b6b482663dc2a2b4
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoModify confirmable certificate OTM 95/16295/4
Jongmin Choi [Wed, 11 Jan 2017 02:22:50 +0000 (11:22 +0900)]
Modify confirmable certificate OTM

- In case of user denial, send relevant error message
- Reset in case of confirmation failure

Patch #1: initial upload
Patch #2: OC_STACK_NOT_ACCEPTABLE added

Change-Id: I9fe67488f4d19bab1b2cf222547e799be762f5f8
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16295
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoRemove duplicated deviceID check in PM_Discovery 97/16297/5
js126.lee [Wed, 11 Jan 2017 02:34:27 +0000 (11:34 +0900)]
Remove duplicated deviceID check in PM_Discovery

Patch 1: upload
Patch 2,3: If self reply, discard it.
Patch 4: Retriger jenkins build

Change-Id: Ife6bf2a802aa17da63899ad904a1df085696340e
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16297
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoAdding NULL checking input parameter in SRMRequestHandler 99/16299/2
js126.lee [Wed, 11 Jan 2017 04:48:25 +0000 (13:48 +0900)]
Adding NULL checking input parameter in SRMRequestHandler

Patch 1: upload patch

Change-Id: I869fd8d2d3198033be3cb36fe4fa1e7f602ba823
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16299
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoFix the build error for MOT. 57/16257/2
Chul Lee [Mon, 9 Jan 2017 11:29:56 +0000 (20:29 +0900)]
Fix the build error for MOT.

This error was caused by https://gerrit.iotivity.org/gerrit/#/c/16137/ (remove tinydtls)

Change-Id: I48a68c9de65fdd1816904be3accb94e78381be40
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16257
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoyocto: Use tools from sysroot before system PATH (again) 23/16223/4
Philippe Coval [Fri, 16 Sep 2016 18:22:03 +0000 (20:22 +0200)]
yocto: Use tools from sysroot before system PATH (again)

Reintroduce existing change that was (wrongly?) removed in:

https://gerrit.iotivity.org/gerrit/#/c/12029/64/build_common/SConscript

Original review at:

https://gerrit.iotivity.org/gerrit/11935

To ensure reproductibily Scons avoids to rely on environment
 but some systems like Yocto are defining their own cross compiling env.

To deal with those orthogonal paradigms,
 a new CONFIG_ENVIRONMENT_IMPORT variable has been introduced,
 It enables import of needed variables (PATH and pkg-config's ones).

Without this change, system tools might be used by scons
 instead of looking into yocto's sysroot.
 This is not not wanted and may be less reproductible.

This problem was noticed when building Ostro OS
 (on a system without all Yocto dependencies)
 reported error messages were:

  | sh: gdbus-codegen: command not found
  | /bin/sh: 1: pkg-config: not found

More information about using SCONS along Yocto, check some notes at:

https://bitbucket.org/scons/scons/wiki/Notes

Bug: https://jira.iotivity.org/browse/IOT-1219
Change-Id: I6af59a590f8be489398623d29cf85c2f00000002
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/on/master/mine
Thanks-to: Mikko Ylinen <mikko.ylinen@intel.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16225
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kishen Maloor <kishen.maloor@intel.com>
(cherry picked from commit 1085512bc103e987d95a43063e6552f39acd40f2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16223

11 months agoCloud provisioning modification in listener return type. 65/15865/5
Sunil Kumar K R [Wed, 21 Dec 2016 06:07:23 +0000 (11:37 +0530)]
Cloud provisioning modification in listener return type.

patch2: Cloud provisioning Listener modification
patch3: Signout bug fix

Change-Id: Ibf43255ff82891b3ef7026763b5d2796fe839abf
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15865
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoRemove tinydtls library. 37/16137/5
Chul Lee [Thu, 5 Jan 2017 06:07:09 +0000 (15:07 +0900)]
Remove tinydtls library.

Change-Id: I78f470af822587f2cd50eac6e9b1fb4ff5b87219
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16137
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months ago[IOT-1697]Destory unhandled payload after OCDoResponse() on sample. 05/15905/4
bg.chun [Tue, 20 Dec 2016 07:48:50 +0000 (16:48 +0900)]
[IOT-1697]Destory unhandled payload after OCDoResponse() on sample.

below is list of fixed smaple.
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp
resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
resource/csdk/stack/samples/tizen/SimpleClientServer/ocserver.cpp

Change-Id: I276d38bffa69e67e8567275b4497d82291bcb01f
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit f649d997fa1f43b0c5b89304a98277667e7276a5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15905
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
11 months agoRemove unnecessary code to unset a given fd in catcpserver 41/15941/2
hyuna0213.jo [Fri, 16 Dec 2016 00:47:47 +0000 (09:47 +0900)]
Remove unnecessary code to unset a given fd in catcpserver

After reading data from file descriptor, we set the readFds again.
so it is not required to remove a given file descriptor from a set.

Change-Id: I8c7a72b14bcce2f1a513cc6085d4113fa8fea9b1
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15731
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit c27192f8bbb7c6039c06283caf8f1a4cbb89ed84)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15941
Reviewed-by: Uze Choi <uzchoi@samsung.com>
11 months agoFixed keepalive to send ping request only when host mode is client 39/15939/3
hyuna0213.jo [Thu, 15 Dec 2016 07:34:53 +0000 (16:34 +0900)]
Fixed keepalive to send ping request only when host mode is client

ping message should be sent when host mode is client

Change-Id: I2ac94e1340c1607969391b86577b9101ddc013b5
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15675
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 092aa11fa418d577bac3509e679f236b2d62aea9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15939
Reviewed-by: Uze Choi <uzchoi@samsung.com>
11 months agotizen: Replace speedpython by python-accel 15/16015/2
Philippe Coval [Mon, 19 Dec 2016 09:23:47 +0000 (10:23 +0100)]
tizen: Replace speedpython by python-accel

Tizen toolchain provide same functionality with python-accel's macro

Also Chan Lee from Tizen toolchain project reported:
{
Speedpython macro sometimes cause some build problem

Speedpython macro is parsed when spec parsing time
and it includes other macro in its own.
(I mean, %{build_hostarch} macro)

And when the OBS project config updates,
OBS sometimes cannot sync-up the changes perfectly.

It this case, build error occurs when we use speedpython macro.

It seems OBS limitation but,
we can avoid this problem by using other macro
which provides same functionality.
}

Change-Id: I265220b5e1f2dcb1956ef546a799a94eb460dd88
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Origin: https://review.tizen.org/gerrit/#/c/105925/
Reviewed-on: https://gerrit.iotivity.org/gerrit/15833
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
(cherry picked from commit b066c0e9637b724af1d9c8554fd5a3e9420d8b22)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16015

11 months agobuild: Bypass unstable notification test (workaround) 93/16193/2
Philippe Coval [Fri, 6 Jan 2017 09:37:35 +0000 (10:37 +0100)]
build: Bypass unstable notification test (workaround)

This needs to be fixed in separate patch and all supported modes

Bug: https://jira.iotivity.org/browse/IOT-1562
Change-Id: I9ed216d6188da9d51695af622520582c6133ee01
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
11 months agoTLS suites 43/15443/19
Oleksii Beketov [Thu, 5 Jan 2017 11:42:25 +0000 (13:42 +0200)]
TLS suites

1. Added:
   TLS_RSA_WITH_AES_256_CBC_SHA256          0x3D
   TLS_RSA_WITH_AES_128_GCM_SHA256          0x009C
   TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256  0xC02B
   TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384  0xC024
   TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384  0xC02C
   TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_256   0xC027
2. Removed:
   TLS_RSA_WITH_AES_256_CBC_SHA             0x35
   TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA     0xC009
3. SSL code refactored
4. Added unit tests for new cipher suites
5. CAsslGenerateOwnerPsk modified to support all suites

Change-Id: If22925d175751a08121c66b90cc2907dd27ebee5
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15443
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoNULL pointer check in cbor_test 67/15767/2
Habib Virji [Fri, 9 Dec 2016 13:55:46 +0000 (13:55 +0000)]
NULL pointer check in cbor_test

cbor_test directly uses value returned by OCRepPayloadGetPropeString in memcmp .

The value is not checked before calling memcmp.

BUG: https://jira.iotivity.org/browse/IOT-1662
Change-Id: Ia998ab4154d0b2efb69dff232532d2b8b7f4f5de
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15365
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit eff5b1879523483e90d02474cd19dfd125cfe3ea)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15767
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
11 months agoFix wrong size argument 03/15903/4
George Nash [Tue, 6 Dec 2016 19:08:59 +0000 (11:08 -0800)]
Fix wrong size argument

The second argument for OICStrcpy is the destination size
not the sizeof the char* for the string being copied.

The code should have been copying the string '/oic/res'
over to the szQueryUri but it was only copying '/oic/re'

Found using static analysis tool

Change-Id: I3b6c2f7b6c67db4d84010e9e90fe7dd54f14fcee
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15201
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit 6a2e79502fa4e0d2228137db8b6c58e21f955686)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15903
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
11 months agoFix for patchset 15853 01/16001/5
Dmitriy Zhuravlev [Fri, 30 Dec 2016 07:28:14 +0000 (09:28 +0200)]
Fix for patchset 15853

Fixed OTM error caused by patchset 15853.
Added close notify alert sending to DeletePeerList()

Change-Id: Ib5363f8d16358a388df0f003e9111f1d56ccca62
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16001
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoFix the messageID handling issue in SVR's request handler. 67/15867/6
Chul Lee [Wed, 21 Dec 2016 08:07:31 +0000 (17:07 +0900)]
Fix the messageID handling issue in SVR's request handler.

CoAP over UDP is supported messageID to support duplicate message detection.
(Please see RFC 7252)

BTW, other transport adapter does not support message ID.
So we should check message ID to prevent duplicate request handling
in case of CoAP over UDP only.

Also, This patch includes random PIN restart bug fix.

Change-Id: I6b0de7d455a1423e0156806d97a86e3c9af258c4
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15867
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoRemoved compiler warnings for security modules. 45/15045/7
Chul Lee [Fri, 2 Dec 2016 01:36:01 +0000 (10:36 +0900)]
Removed compiler warnings for security modules.

Patch #1 : initial upload.
Patch #2 : retrigger.
Patch #3~4 : update according to comments.
Patch #5 : rebase

Change-Id: Ie5009c484f50d40c8a2e2f9ac7c361cd9a712d93
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15045
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months ago[IOT-1699]Fix memory leak on collection 07/15907/3
bg.chun [Wed, 21 Dec 2016 02:47:46 +0000 (11:47 +0900)]
[IOT-1699]Fix memory leak on collection

Fix memory leak on DefaultCollectionEntityHandler

Change-Id: I4070d3f8feae9596f646ecbc24de471eb99a1e8c
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15859
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit a38e747f515113178a8e17ce839628a13f872b18)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15907
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
11 months agoModify Reset Profile to include cred resource 11/16111/3
Jongmin Choi [Tue, 3 Jan 2017 10:05:00 +0000 (19:05 +0900)]
Modify Reset Profile to include cred resource

Reset Profile modified to include cred resource

Patch #1: Initial upload
Patch #2: ResetSecureResourceInPS() modified

Change-Id: I5ed286ac43b32f3e04d33a9d0f1428a7443d7c08
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16111
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
11 months agoAdd gitreview File 45/16045/2
Trevor Bramwell [Sat, 23 Jul 2016 15:11:14 +0000 (08:11 -0700)]
Add gitreview File

This is used by the 'git-review' to specify the upstream gerrit server.

Change-Id: I5823a86f1eb0d0a8b6d2ed39fc0927347ea2ca94
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9655
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 096373ae4a589f5f12951afdbd3d8004ae549f9f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16045
Reviewed-by: Kevin Kane <kkane@microsoft.com>
11 months ago Adding C++ api for configuring SVR db for self-ownership 89/15589/9
amar [Wed, 14 Dec 2016 07:54:27 +0000 (13:24 +0530)]
 Adding C++ api for configuring SVR db for self-ownership

Change-Id: I0a65b0a1b1a65c8659b0bc253c4d74087612e75d
Signed-off-by: amar <amar.sri@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15589
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>