iotivity.git
2 years ago[IOT-2539] Clean sign-compare warnings 99/22199/3
George Nash [Mon, 31 Jul 2017 21:12:13 +0000 (14:12 -0700)]
[IOT-2539] Clean sign-compare warnings

It is common to do a compair with a const value in unit
tests. For example EXPECT_EQ(3, value).  If `value` is an
unsigned type this will produce the sign-compare compiler
warning. The compiler defaults to treating constant
numbers as a signed data type.  Adding a sufix u (i.e. 3u)
will tell the compiler to treat the constant as an
unsigned data type.

In other cases the type is cast to an unsigned or signed
value before the comparison.

In aclresourcetest.cpp the return type for GetNumberOfResource
function was updated to return size_t since in all the test
conditions it is compared with variable of size_t or a
constant number.

Bug: https://jira.iotivity.org/browse/IOT-2539
Change-Id: I7e47bfb9f027304abd975eb0d8e577cbd484545a
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21689
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit 65cc1e5d3b263c13fd6d784303d8e3640c88ef56)

2 years agoeasy-setup: Removing redundant env configuration 25/21325/10
Pawel Winogrodzki [Thu, 6 Jul 2017 23:31:48 +0000 (16:31 -0700)]
easy-setup: Removing redundant env configuration

Moving global environment configuration common for all
platforms into build_common/SConscript and removing repeated
lines from service/easy-setup/*.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: I76cf82bacb36d95574f5d716c01cd1d7fb7e4f5f
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21325
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years ago[IOT-2639] pstat.tm doesn't saved 41/22041/2
Aleksey Volkov [Thu, 24 Aug 2017 05:35:56 +0000 (08:35 +0300)]
[IOT-2639] pstat.tm doesn't saved

Change-Id: I175349cfe008d8544a35e15a98d7d401de9d064c
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/22041
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2338] Update unittest json to use acl2 39/22039/7
Aleksey Volkov [Thu, 24 Aug 2017 04:15:52 +0000 (07:15 +0300)]
[IOT-2338] Update unittest json to use acl2

Change-Id: I7e3f9a71c962ec7b5971b24988bf01961149f4bb
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/22039
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2642] DELETE /roles succeeds if no entry 13/22113/2
Nathan Heldt-Sheller [Thu, 24 Aug 2017 16:35:18 +0000 (09:35 -0700)]
[IOT-2642] DELETE /roles succeeds if no entry

The DELETE request to /roles is meant to remove all /roles entries
corresponding to the current peer.  In the case of no /roles entries
existing, IoTivity was returning error, but should return "deleted"
instead.

Change-Id: Ib98c64822fe77eb7457bd734b168f1b26efd0d61
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/22113
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Ibrahim Esmat <iesmat@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agostatic check: noti test unterminated strings 85/21885/2
Mats Wichmann [Fri, 11 Aug 2017 16:12:55 +0000 (10:12 -0600)]
static check: noti test unterminated strings

The test strncpy'd three strings using the strlen of the string,
leaving the destination buffer without the string terminator.
strcpy will do the right thing here since in this case the source is
declared as a string which is sure to be terminated.

Change-Id: I85a15ab92b311481015c898f44b034fe49bf55f4
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21885
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>
2 years ago[IOT-2430][IOT-2418] Add eps from default col E.H 27/21227/29
uzchoi [Tue, 4 Jul 2017 08:29:03 +0000 (17:29 +0900)]
[IOT-2430][IOT-2418] Add eps from default col E.H

Previous default collection Entity Handler return the payload
without eps info in links parameter and with tls and tcp port info
for OCF1.0 request.
By using updated OCLinksPayloadValueCreate, links payload can be filled
accordingly with eps info for OCF1.0 request and tls/tcp for OIC1.1.

Change-Id: I07081e43d77bd8ff8e7922daa7fcc17844f22cac
Signed-off-by: uzchoi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21227
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoextlibs: Removing redundant configuration 41/21441/11
Pawel Winogrodzki [Thu, 6 Jul 2017 23:50:37 +0000 (16:50 -0700)]
extlibs: Removing redundant configuration

Moving global environment configuration common for all
platforms into build_common/SConscript and removing repeated
lines from extlibs/*.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: Iacd5905d3c221d3d1a142f08a5ea61a899ad08b1
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21299
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 038ec8e2d700d06722c9db43b41b8c534deb42ce)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21441
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
2 years agorsc-enc: Removing redundant env configuration 43/21943/5
Pawel Winogrodzki [Tue, 15 Aug 2017 19:49:07 +0000 (12:49 -0700)]
rsc-enc: Removing redundant env configuration

Moving global environment configuration common for all
platforms into build_common/SConscript and removing repeated
lines from service/resource-encapsulation/*.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: Id3ee5108c07fa22c77dd5998d7b311fbd6fed491
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21943
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
2 years agoservice/resource-encapsulation: SConscript cleanup 91/21291/9
Pawel Winogrodzki [Thu, 22 Jun 2017 21:41:10 +0000 (14:41 -0700)]
service/resource-encapsulation: 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: I39296e61753562a037d7a33f8e1dd3c9803d9843
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21291
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agonotification: Removing redundant env configuration 41/21941/5
Pawel Winogrodzki [Tue, 15 Aug 2017 19:41:39 +0000 (12:41 -0700)]
notification: Removing redundant env configuration

Moving global environment configuration common for all
platforms into build_common/SConscript and removing repeated
lines from service/notification/*.

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

Change-Id: I7ab34095456499e6d84f0c6f1c6da02887b271e3
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21941
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agowksxmppxep: Add scriptlet to clone before scons 65/22065/2
Philippe Coval [Wed, 19 Jul 2017 09:34:09 +0000 (11:34 +0200)]
wksxmppxep: Add scriptlet to clone before scons

Bug: https://jira.iotivity.org/browse/IOT-1760
Change-Id: Icb301bb46ca5faab46576deea35ac623646a1ade
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21533
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit 399d88deae071c5fa742bc4f1cc1cb43b07d6989)
Reviewed-on: https://gerrit.iotivity.org/gerrit/22065
Reviewed-by: Mats Wichmann <mats@linux.com>
2 years agoresource: Removing redundant env configuration 47/21947/6
Pawel Winogrodzki [Tue, 15 Aug 2017 21:52:16 +0000 (14:52 -0700)]
resource: Removing redundant env configuration

Moving global environment configuration common for all
platforms into build_common/SConscript and removing repeated
lines from resource/*.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: I8383c7d2f14b1c9fea286e0836db50b45b45acb2
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21947
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoByte arrays are not zero-terminated. 35/22035/3
Dan Mihai [Wed, 23 Aug 2017 20:23:44 +0000 (13:23 -0700)]
Byte arrays are not zero-terminated.

Change-Id: I03413c8fc86f871a1609920e2f0ec6e6e6c43455
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Bug: https://jira.iotivity.org/browse/IOT-2647
Reviewed-on: https://gerrit.iotivity.org/gerrit/22035
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agoAdd secure property in RD resource. 73/21973/2
Ziran Sun [Thu, 17 Aug 2017 13:02:13 +0000 (14:02 +0100)]
Add secure property in RD resource.

Bug: https://jira.iotivity.org/browse/IOT-2614
Change-Id: I719e609baff6a6726e945f38a8102f7865070cbc
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21973
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
2 years ago[IOT-2430] add eps from OCLinksPayloadValueCreate 87/20987/45
uzchoi [Mon, 26 Jun 2017 09:18:07 +0000 (18:18 +0900)]
[IOT-2430] add eps from OCLinksPayloadValueCreate

Previous OCLinksPayloadValueCreate function just create the payload
without eps info in links parameter and with tls and tcp port info
for cbor as media format request.
If user input the OCEntityHandleRequest from entity handler callback,
this function will parse whether this is request from vnd.ocf/cbor or
cbor media format using newly created function OCRequestIsOCFContentFormat
here, and create the links payload accordingly with eps info for vnd.ocf
media format request and tls/tcp for legacy cbor type request.

This patch has the seperated handling logic according to ll interface
and baseline interface in HandleLinkListInterface function.
ll interface requires links array payload instead of object with links.

OCLinksPayloadValueCreate API is changed as below.
:return type has PayloadValue to align to other create API.
:ehRequest is added as param. to receive the request media format and so on.

This change also include the fix to exclude the parent node from links
and the fix for tcp and tls property fill-in logic in vnd.ocf/cbor case.

This change add CreateEndpointPayloadList API change to add *epCount
param to return the count of endpoint.

Change-Id: I8f4c5905f35a7ed2286514926385921e407ff674
Signed-off-by: uzchoi <uzchoi@samsung.com>
Signed-off-by: Uze <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20987
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agosecurity: Fix valgrind output file 21/22021/4
Philippe Coval [Fri, 18 Aug 2017 13:06:23 +0000 (15:06 +0200)]
security: Fix valgrind output file

It was generated into iotivity/ut instead of .memcheck file.

Bug: https://jira.iotivity.org/browse/IOT-2599
Change-Id: Ib96a6378513df77e7415378cd37a864fa0cbebb9
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/22021
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoUpdate RD DB link parsing. 91/21991/2
Todd Malsbary [Thu, 17 Aug 2017 22:30:56 +0000 (15:30 -0700)]
Update RD DB link parsing.

- "lt" in RD publish is now "ttl".
- "pri" defaults to 1 in links where it is not present.
- Remove all references to oic.wk.rdpub (except definition in header
  files).

Bug: https://jira.iotivity.org/browse/IOT-2616
Change-Id: I7a55398ab1c8b60166730f33cbce83e0bf193999
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21991
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
2 years agoCoverage & Unit Test Reports automation. 71/21871/4
Sushil Yadav [Fri, 11 Aug 2017 09:58:42 +0000 (15:28 +0530)]
Coverage & Unit Test Reports automation.

The Coverage Report generation has been human effort.
This patch adds the needed script and changes to automate
this process as much as possible.

It is two step process:
1. Build the IoTivity code for all modules.
2. Run the script for generating Coverage Reports.

Also Unit Test Reports generation in XML format
The Unit Test Reports are generated in
UnitTestReport directory module wise.

Commit# of code merged from master to 1.3-rel:
  6e78c768af2ad0986ba595654641952476fb4ff6
  4ddfa0f967b3deec7728f6c89fe4be3234d5619b
  227e3c061fc377e59ba65609b329e20bdc7ad1c5

Change-Id: Iec36cf48008479996ee9316120ddc6506d416e9c
Signed-off-by: Sushil Yadav <sushil.ky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21871
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>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[RE] Synced changes from master to 1.3-rel branch. 17/22017/2
Jay Sharma [Tue, 22 Aug 2017 06:22:37 +0000 (11:52 +0530)]
[RE] Synced changes from master to 1.3-rel branch.

bug: https://jira.iotivity.org/browse/IOT-2267
Change-Id: If1fdd8d20e7a67b917e14bcf8090e8070eb2e5ed
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/22017
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years ago[IOT-2447] Support Multiple Ownership 77/21577/15
Oleksii Beketov [Tue, 22 Aug 2017 00:40:53 +0000 (03:40 +0300)]
[IOT-2447] Support Multiple Ownership

Enable MOT

Change-Id: I4cfd4e456d5ae53596cffb6648f1a1d265ed6868
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21577
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Aleksey Volkov <a.volkov@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agombedtls: Avoid parsing error 87/21987/7
Dan Mihai [Fri, 18 Aug 2017 04:24:55 +0000 (21:24 -0700)]
mbedtls: Avoid parsing error

Missing public key was already detected by checking for an
MBEDTLS_ERR_ASN1_UNEXPECTED_TAG error code. But, (p == end) also means
that the public key is missing.

Change-Id: I22861c73fca83bb3d92986e56fadf1778b4c404c
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Bug: https://jira.iotivity.org/browse/IOT-2623
Reviewed-on: https://gerrit.iotivity.org/gerrit/21987
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years agosecurity: fix mbedtls_x509_crt_parse error 85/21985/4
Dan Mihai [Thu, 17 Aug 2017 20:20:16 +0000 (13:20 -0700)]
security: fix mbedtls_x509_crt_parse error

Add null terminator at the end of the cert, required by
mbedtls_x509_crt_parse.

This patch allows CT1.7.8.5 to make progress with its DTLS handshake.
Handshake fails later on, for different reasons, being investigated.

Change-Id: Iebfcf17be2661f080499961fbd259cef3b1c06d8
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
https://jira.iotivity.org/browse/IOT-2622
Reviewed-on: https://gerrit.iotivity.org/gerrit/21985
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2537] Filter eps returned from RD queries. 03/21603/6
Todd Malsbary [Wed, 19 Jul 2017 23:07:54 +0000 (16:07 -0700)]
[IOT-2537] Filter eps returned from RD queries.

When resources in the RD are hosted on the same host as the RD server,
the eps returned in the /oic/res response may be filtered identically
to resources hosted by the RD server itself.  This ensures the
response from either the RD or the publishing device is identical.

Bug: https://jira.iotivity.org/browse/IOT-2537
Change-Id: I655fce9919e09305d1a09f2b6a286427e302e606
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21603
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoignore: Gcov generated files 43/21843/2
Philippe Coval [Sun, 30 Jul 2017 11:13:41 +0000 (13:13 +0200)]
ignore: Gcov generated files

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Id528461dcc6c07551554a07def899f612df97be6
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21711
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit bd34290526ec305b6899bd303c2e3f97a76f3147)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21843
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
2 years ago[IOT-2605] Update java samples to have SCT: 9 25/21925/2
Alex Kelley [Tue, 15 Aug 2017 19:23:30 +0000 (12:23 -0700)]
[IOT-2605] Update java samples to have SCT: 9

Change-Id: If0380c6cf4bb781f8c86aa986ae2e6ae3a530f73
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21925
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years agosecurity: CA cert arrives in publicData 83/21983/3
Dan Mihai [Thu, 17 Aug 2017 19:57:41 +0000 (12:57 -0700)]
security: CA cert arrives in publicData

GetCaCert must pick up this cert from the publicData of the credential
sent by CTT/OBT, rather than optionalData.

This behavior is clarified by OCF Security WG CR1938.

This patch allows CT1.7.8.5: DTLS handshake to make progress. The
handshake still fails later on, for different reasons that are being
investigated.

Change-Id: I76962e9f116ad7acb80a6da6c85fb089ebba3481
https://jira.iotivity.org/browse/IOT-2621
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21983
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years agosecurity: Fix "GetPkixInfo: empty key" 37/21937/4
Dan Mihai [Wed, 16 Aug 2017 00:35:59 +0000 (17:35 -0700)]
security: Fix "GetPkixInfo: empty key"

mbedtls_pem_read_buffer doc specifies that the data must be null
terminated.

This patch allows CT1.7.8.5 to make progress with DTLS handshake.
The handshake still fails later on, due to different reasons that
are being investigated.

Change-Id: I46c89f8cb0eec6156202a9ae3ef3e7b73c85a0f5
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
https://jira.iotivity.org/browse/IOT-2620
Reviewed-on: https://gerrit.iotivity.org/gerrit/21937
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2605] Update Service samples to have SCT: 9 35/21935/2
Alex Kelley [Tue, 15 Aug 2017 21:18:07 +0000 (14:18 -0700)]
[IOT-2605] Update Service samples to have SCT: 9

Change-Id: I008588e1479e4bd55c4ca58d3227e670dc35e9ed
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21935
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2605] Update c++ samples to have SCT: 9 33/21933/2
Alex Kelley [Tue, 15 Aug 2017 21:09:05 +0000 (14:09 -0700)]
[IOT-2605] Update c++ samples to have SCT: 9

Change-Id: I3ef65a1f14329ac53c0050b0f168f95d09cdcc6d
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21933
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2605] Update stack samples to have SCT: 9 31/21931/2
Alex Kelley [Tue, 15 Aug 2017 20:57:00 +0000 (13:57 -0700)]
[IOT-2605] Update stack samples to have SCT: 9

Change-Id: Id636475a93e234182b869398fb3bbb7e7cfce624
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21931
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2605] Update security samples to have SCT: 9 29/21929/2
Alex Kelley [Tue, 15 Aug 2017 20:44:58 +0000 (13:44 -0700)]
[IOT-2605] Update security samples to have SCT: 9

Change-Id: I653b5bc4c467a01c03f0222a8765edf50fe4283e
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21929
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2605] Update cloud samples to have SCT: 9 23/21923/2
Alex Kelley [Tue, 15 Aug 2017 19:08:44 +0000 (12:08 -0700)]
[IOT-2605] Update cloud samples to have SCT: 9

Change-Id: I1cea62c57899352600224b78f5c6767a29347fcc
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21923
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2605] Update IPCA sample to use SCT=9 21/21921/3
Alex Kelley [Tue, 15 Aug 2017 18:57:16 +0000 (11:57 -0700)]
[IOT-2605] Update IPCA sample to use SCT=9

Change-Id: Iaf8c40d8043b9b559f488a6f2774d23cf99d369a
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21921
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2561] provision a certificate 01/21901/11
Oleksandr Dmytrenko [Mon, 14 Aug 2017 12:41:24 +0000 (15:41 +0300)]
[IOT-2561] provision a certificate

child from [IOT-2263]: 'dos' feature enabling
4) CERT

Change-Id: I0006b0dd357023a3892a0fb6385157cd66274ab1
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21901
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Oleh Vasyliev <o.vasyliev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoIOT-2533 Build java with scons 65/21965/3
George Nash [Wed, 2 Aug 2017 00:33:32 +0000 (17:33 -0700)]
IOT-2533 Build java with scons

When building generic_java stop using gradle.
Gradle is required to build aar and apk files
for android but scons is capable of building
the java code without using gradle.

This also has the side effect that we can add
a more complete manifest file that makes running
the samples simpler. We no longer need to run
long commandline java commands to start the
samples.

example:
cd <ouput_dir>/java
java -Djava.library.path=.. -jar simplerserver.jar

See IOT-2419 for SECURED=1 build
Bug: Bug: https://jira.iotivity.org/browse/IOT-2419

Bug: https://jira.iotivity.org/browse/IOT-2533
Change-Id: I8bf5228173745d26114e612a0d82d1f28060d801
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21965
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years ago[IOT-2610] CRL empty query fix 59/21959/4
Aleksey Volkov [Wed, 16 Aug 2017 09:38:49 +0000 (12:38 +0300)]
[IOT-2610] CRL empty query fix

Don't return an error if the query string is empty or has unknown parameters.

Change-Id: I96aca3983a446a97ed695552d1a213bfa1700b3e
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21959
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[RE] Fixed indentation of Android Sample Apps. 87/21887/2
Jay Sharma [Sun, 13 Aug 2017 10:22:03 +0000 (15:52 +0530)]
[RE] Fixed indentation of Android Sample Apps.

Change-Id: I9ef3d14f39831b7c110daed8b07bc867256a3f89
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21887
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years ago[IOT-2494] SVR DB Editor : Add pstat edit features 97/21897/2
Sangjoon Je [Tue, 8 Aug 2017 23:46:41 +0000 (08:46 +0900)]
[IOT-2494] SVR DB Editor : Add pstat edit features

Add pstat add remove modify
Cleanup svrdbeditoracl.c

New Feature: https://jira.iotivity.org/browse/IOT-2494
Signed-off-by: Sangjoon Je <sangjoon.je@samsung.com>
Change-Id: I851e8555f5a1d14332399f0c9aedc53bfa302bb3
Reviewed-on: https://gerrit.iotivity.org/gerrit/21799
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Youngman Jung <yman.jung@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 10fb135447cb2cb192f686b33cb407699de2fbab)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21897
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years ago[JIRA 2545] Adapter control issue. 79/21679/2
arya.k [Mon, 31 Jul 2017 11:27:03 +0000 (16:57 +0530)]
[JIRA 2545] Adapter control issue.

Change-Id: I3ddbeaf91b117dbdcfd5f64ad89a13d55d1f003f
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21679
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>
2 years agojava: Removing redundant configuration 69/21869/4
Pawel Winogrodzki [Thu, 6 Jul 2017 23:51:13 +0000 (16:51 -0700)]
java: Removing redundant configuration

Moving global environment configuration common for all
platforms into build_common/SConscript and removing repeated
lines from java/*.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: I96966e81f52bd9995eab54afbf63091a4a9f62b2
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21869
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years ago"self" URIs are no longer fully-qualified. 75/21775/3
Todd Malsbary [Mon, 7 Aug 2017 19:19:53 +0000 (12:19 -0700)]
"self" URIs are no longer fully-qualified.

Bug: https://jira.iotivity.org/browse/IOT-2592
Change-Id: I1ea6c0d8418971afe6caf710faa52b189b22eaad
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21775
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoRemove oic.wk.rdpub from RD server. 73/21773/4
Todd Malsbary [Mon, 7 Aug 2017 19:02:21 +0000 (12:02 -0700)]
Remove oic.wk.rdpub from RD server.

Bug: https://jira.iotivity.org/browse/IOT-2591
Change-Id: Icb9127e1cfe8d72b17d42e59018bfeb67f42c662
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21773
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2610] Fix response for CRL baseline query 05/21905/3
Aleksey Volkov [Mon, 14 Aug 2017 15:42:23 +0000 (18:42 +0300)]
[IOT-2610] Fix response for CRL baseline query

Change-Id: I369b810b8759115107da0446cff014eeec43fc05
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21905
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years agoFix static analysis issues in CA layer 07/21507/3
Veeraj Khokale [Mon, 3 Jul 2017 10:19:18 +0000 (15:49 +0530)]
Fix static analysis issues in CA layer

Fix issues reported by static analysis tool in
connectivity abstraction layer

Change-Id: I49b10536e65219d5f28ebd5acc0c83ffa833d3da
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21209
Reviewed-by: Sushil Kumar Yadav <sushil.ky@samsung.com>
Reviewed-by: koushik girijala <g.koushik@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 8be7f4f9d8bdd4356318e1a258945b451c09276d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21507
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agosecurity: Store all incoming credentials 67/21867/4
Dan Mihai [Fri, 11 Aug 2017 04:00:07 +0000 (21:00 -0700)]
security: Store all incoming credentials

CBORPayloadToCred returns a list of creds, but list entries other
than the head were being ignored (and leaked) by HandlePostRequest.

Also, go back to LL_APPEND in AddCredential(). Commit
0d511009c8c2e0082ed66359c11cc1f1967b5896 changed that recently to
LL_PREPEND, but the gCred->rownerID update below LL_PREPEND
dosn't make sense anymore (because gCred points to newCred).

The remaining gCred->rownerID updates still look fragile, so it's
very possible those still don't work well.

This patch allows CT1.7.8.5 to find a common ciphersuite with
the target device, when trying to connect using cert credentials.
The target device did not have proper cert creds before this patch -
and therefore the ciphersuites did not match.

CT1.7.8.5 still fails later on, during DTLS handshake - to be
investigated later.

Change-Id: I8205925ca5d30619fdd306847847026a32c8b749
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
bug: https://jira.iotivity.org/browse/IOT-2606
Reviewed-on: https://gerrit.iotivity.org/gerrit/21867
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2583] Fix crash on POST request to crl 97/21797/5
Aleksey Volkov [Tue, 8 Aug 2017 16:18:22 +0000 (19:18 +0300)]
[IOT-2583] Fix crash on POST request to crl

Change-Id: Ifb06926c8ccc716d2e86fa73b34122745c3204e6
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21797
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years agowksxmppxep: Fix path detections for RA 45/21845/3
Philippe Coval [Wed, 19 Jul 2017 09:34:09 +0000 (11:34 +0200)]
wksxmppxep: Fix path detections for RA

Note for later "if with_ra_ibb" should be in caller scripts

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

2 years ago[IOT-2411] Attemtping double-free 91/21791/3
akk0rd [Tue, 8 Aug 2017 13:53:52 +0000 (16:53 +0300)]
[IOT-2411] Attemtping double-free

Attemtping double-free in otmunittest.cpp

Change-Id: I38d3dfe4e26ae048683cf86d9bdff96bba71e18b
Signed-off-by: akk0rd <v.riznyk@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21791
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Aleksey Volkov <a.volkov@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoRD resource should not be observable. 77/21777/2
Todd Malsbary [Mon, 7 Aug 2017 22:29:26 +0000 (15:29 -0700)]
RD resource should not be observable.

All of the resource's properties are hard-coded.

Bug: https://jira.iotivity.org/browse/IOT-2593
Change-Id: I6729596e94494fb4715dbb5ab4ad6ef6fcd551b2
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21777
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2 years ago[IOT-2594] Add 'throws' to native api declaration 39/21839/2
Larry Sachs [Wed, 9 Aug 2017 16:53:57 +0000 (09:53 -0700)]
[IOT-2594] Add 'throws' to native api declaration

getLinkedDevices() native api declaration in OcSecureResource.java
requires a throws clause in order to catch a possible exception
from the jni implementation layer.

Change-Id: Ic1e02b0d0f2980c1fd10d59ed48575ea2d7e6734
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21839
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agotizen: Run gsbuild.sh using shebang (bash) 29/21829/3
Philippe Coval [Fri, 26 May 2017 11:39:41 +0000 (13:39 +0200)]
tizen: Run gsbuild.sh using shebang (bash)

That script use BASH advanced features ([[ tests ]])

.

Ported from master to 1.3-rel

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I87bc5677c502c86ad7b4fdca630c6dee9c28e335
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20443
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21829

2 years agoexamples: Removing redundant configuration 77/21477/7
Pawel Winogrodzki [Thu, 6 Jul 2017 23:49:49 +0000 (16:49 -0700)]
examples: Removing redundant configuration

Moving global environment configuration common for all
platforms into build_common/SConscript and removing repeated
lines from service/examples/*.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: Icc1661f2e54c27efbaa9787d082a0e2e121e0e20
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21477
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agosecurity: Advertise certificate creds support 65/21865/2
Dan Mihai [Fri, 11 Aug 2017 00:28:01 +0000 (17:28 -0700)]
security: Advertise certificate creds support

Allow the OBT to discover that the current device/app supports certificate
based credentials.

Note that this is an improvement just for those devices/apps generating a
default *.dat file when they start for the first time. Similar work will be
required for the IoTivity sample apps that use custom-made *.dat files.

CT1.7.4.2 is passing after this change.

Change-Id: Ia63d63e74bf637c376055b5c14ac4620304eb799
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
bug: https://jira.iotivity.org/browse/IOT-2604
Reviewed-on: https://gerrit.iotivity.org/gerrit/21865
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2609] Setup /oic/sec/crl as non-observable 75/21875/2
Aleksey Volkov [Fri, 11 Aug 2017 11:40:11 +0000 (14:40 +0300)]
[IOT-2609] Setup /oic/sec/crl as non-observable

Change-Id: I0f23d2c777405946c090a6eff51650ab96a24bc0
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21875
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years agoWindows: Change UWP_APP variable to match SCons 71/21671/5
Ibrahim Esmat [Fri, 28 Jul 2017 00:54:45 +0000 (17:54 -0700)]
Windows: Change UWP_APP variable to match SCons

We recently added our changes to the SCons repository
to allow us to build UWP Store compatible DLLs from SCons.
Rename the UWP_APP variable to be MSVC_UWP_APP to match
what is used in the SCons repository for building UWP DLLs.

Change-Id: I944afd0077c8690e49f8c03b2edd988c9d77b636
Signed-off-by: Ibrahim Esmat <iesmat@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21671
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoAdded system tests for security 23/21423/6
Oleh Vasyliev [Thu, 13 Jul 2017 13:44:11 +0000 (16:44 +0300)]
Added system tests for security

Fixed permissions and whitespaces

Change-Id: I94fac7b50dbaa653fb3bf5efa6440e94cee49870
Signed-off-by: Oleh Vasyliev <o.vasyliev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21423
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2494] SVR DB Editor : Add Acl Edit features 01/21801/2
Sangjoon Je [Mon, 24 Jul 2017 02:50:39 +0000 (11:50 +0900)]
[IOT-2494] SVR DB Editor : Add Acl Edit features

Print info for ACL_V2
Support Modify ACL
Split svrdbeditor.c into several files
Fix svace issue
Fix valgrind mem leak issue
Fix wrong error msg

New Feature: https://jira.iotivity.org/browse/IOT-2494
Change-Id: I02636ed59e293108a4e5cf6bf7e75a19dafeb455
Signed-off-by: Sangjoon Je <sangjoon.je@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21585
Reviewed-by: Youngman Jung <yman.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 32d88bf618d358d8d5cbd1fb7191824c43c051a0)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21801

2 years agoClean unittest query building slightly 99/21699/2
Mats Wichmann [Thu, 20 Jul 2017 13:40:34 +0000 (07:40 -0600)]
Clean unittest query building slightly

In two unit tests a string used to build another string,
and thus read-only, is marked const.

In one instance, for consistency the malloc/strcpy sequence to
build the actual query is replaced with the single strdup call used
elsewhere.

In one instance the declaration of a query string is moved to
where it is used.

Change-Id: Iddc0317d446b5bdc099e0045eba4bb1c87062640
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21699
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years ago[IOT-2555] Update path in ProvisioningTest.py 13/21713/4
Alex Kelley [Tue, 1 Aug 2017 23:07:56 +0000 (16:07 -0700)]
[IOT-2555] Update path in ProvisioningTest.py

Change-Id: If6aead88b0958237df73da77c41123755c7e4ee9
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21713
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2536] Fix regression with RD delete. 01/21601/3
Todd Malsbary [Mon, 24 Jul 2017 17:32:34 +0000 (10:32 -0700)]
[IOT-2536] Fix regression with RD delete.

Bug: https://jira.iotivity.org/browse/IOT-2536
Change-Id: Ib3760af5db55bfb464daf692100e8731a7d52092
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21601
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2428] Ownership Transfer support 21/21621/4
Alex Kelley [Thu, 20 Jul 2017 23:50:29 +0000 (16:50 -0700)]
[IOT-2428] Ownership Transfer support

Update OCClient and OCServer to support ownership transfer.

Change-Id: Iab48685ca4fe6a8b19d6b8cba597a5e25833a7d4
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21621
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>
2 years ago[IOT-2560] ProvClient return -1 on timeout 41/21741/2
Alex Kelley [Thu, 3 Aug 2017 00:11:25 +0000 (17:11 -0700)]
[IOT-2560] ProvClient return -1 on timeout

This change updates ProvisioningClient's waitCallbackRet to return -1 if it
times out waiting for a callback to indicate the operation has finished.

Change-Id: I904e41fa7fc5fbed73344b08c30c45235678b646
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21741
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>
2 years agologger: Fix OCLogv by testing EOL 55/21555/3
Philippe Coval [Wed, 22 Feb 2017 00:54:43 +0000 (01:54 +0100)]
logger: Fix OCLogv by testing EOL

Change-Id: Ie070f4d01c9a665373221d6924453b7da50cfa4f
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17411
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
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 4f456acd2e564c5f271832b6519e1b634f41c60f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21555
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years ago[IOT-2530] Security provisioning crash fix 13/21613/5
Aleksey Volkov [Tue, 25 Jul 2017 09:29:10 +0000 (12:29 +0300)]
[IOT-2530] Security provisioning crash fix

Change-Id: I456a0d09266561c7b6d6f6912e234aac2ca550c0
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21613
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2343] Fix ignoring send failure 75/20475/5
Dmitriy Zhuravlev [Tue, 30 May 2017 07:12:31 +0000 (10:12 +0300)]
[IOT-2343] Fix ignoring send failure

CATCPPacketSendCB changed to synchronous completion

Change-Id: I4ed43d5c580ba4beee510d0e0475481c57e571c6
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20475
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoConvert href, if, rt on links payload 29/21629/9
uzchoi [Wed, 26 Jul 2017 09:04:47 +0000 (18:04 +0900)]
Convert href, if, rt on links payload

Previously OCPayloadConvert logic in sever side only convert uri,
types and interfaces for the top level element.
Even if a RepPayload exists in the RepPayload, uri and so on are not
converted.

This patch move the uri, type and interface convert logic into
OCConvertSingleRepPayload which is recrsively called function.

Previous code skipped to convert href in case array payload size is 1
on the top level payload. This logic should be removed at least
considering collection resource with linked-list interface request.
Furthermore, this skip logic is not mandatory code for certification
as of now.

Change-Id: I17b1cc02aed37e9af55126d3af2d28310a3ae733
Signed-off-by: uzchoi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21629
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years ago[IOT-2066] refactoring ConvertUuidToStr() 69/21669/7
v.riznyk [Fri, 28 Jul 2017 14:39:56 +0000 (17:39 +0300)]
[IOT-2066] refactoring ConvertUuidToStr()

Change-Id: If5543c617c3f40193604349ea42df82be5645055
Signed-off-by: v.riznyk <v.riznyk@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21669
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoCatch up 1.3-rel on resource scons reformats 61/21461/6
Mats Wichmann [Sun, 16 Jul 2017 15:33:08 +0000 (09:33 -0600)]
Catch up 1.3-rel on resource scons reformats

Some sconscripts got missed pulling reformats over from master.
This changeset is the scripts in resource (except third_party_libs.scons
which was submitted as a separate changeset)

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: If7e0010a29fec3b73812901916726e425c42df1d
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21461
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoReformat third_party scons in resource 25/21425/6
Mats Wichmann [Sun, 16 Jul 2017 15:37:59 +0000 (09:37 -0600)]
Reformat third_party scons in resource

This one somehow escaped the pull of reformats from master to 1.3-rel

Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Mats Wichmann <mats@linux.com>
Change-Id: Ia7b8e007f038e31c2bfd21ae9ce86509bebda1c0
Reviewed-on: https://gerrit.iotivity.org/gerrit/21425
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoConsistency change to one service scons script 65/21465/3
Mats Wichmann [Sun, 16 Jul 2017 21:24:17 +0000 (15:24 -0600)]
Consistency change to one service scons script

Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Mats Wichmann <mats@linux.com>
Change-Id: I63dc5476662aa8795748b0eb0c7abd78fb86ae79
Reviewed-on: https://gerrit.iotivity.org/gerrit/21465
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years ago[IOT-2463] Fix CTT failure for Get /oic/sec/roles 33/21733/2
Ibrahim Esmat [Tue, 1 Aug 2017 22:47:29 +0000 (15:47 -0700)]
[IOT-2463] Fix CTT failure for Get /oic/sec/roles

Currently the GET request to the /oic/sec/roles resource will fail
with a 400 Bad Request code if the client doesn't have a Public Key
(non-certificate auth) or if the Public Key doesn't match any roles
certificates.

However, that is incorrect since the GET request to the
/oic/sec/roles resource was correct, it just doesn't have any roles
associated with it.

Changed the /oic/sec/roles resource to return an empty "roles" array
if the client doesn't have a Public Key or if the Public Key doesn't
match any roles certificates. At minimum, the return should be:

{
  "roles": [ ],
  "rt": ["oic.r.roles"],
  "if": ["oic.if.baseline"]
}

Testcase: CT1.7.9.1 Verify Security Virtual Resources conform to OIC
Schema

Change-Id: Id71c233875a6ef9e251f2adccd48907e5dedb1a1
Signed-off-by: Ibrahim Esmat <iesmat@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21733
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agosecurity: publish securevirtualresourcetypes.h 49/21549/8
Philippe Coval [Wed, 19 Jul 2017 19:47:36 +0000 (12:47 -0700)]
security: publish securevirtualresourcetypes.h

Designate securevirtualresourcetypes.h
as a "Public Experimental" header.

Those headers are needed for C applications in secured mode
(using OCRepPayloadCreate from ocpayload.h)

  Observed error is:
  .../resource/stack/ocpayload.h:42:40: \
  fatal error: securevirtualresourcetypes.h: \
  No such file or directory

For C++ app there is no such requierements

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I6a37fa82e3a1065541dba8be541ff4ac90e3294a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21549
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Martin Rösch <martin.roesch@kistler.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2494] SVR DB Editor : Improve code 73/21573/2
sangjoon.je [Tue, 11 Jul 2017 07:47:09 +0000 (16:47 +0900)]
[IOT-2494] SVR DB Editor : Improve code

Apply c, c++ code standards
Make printf macros

New Feature: https://jira.iotivity.org/browse/IOT-2494
Signed-off-by: sangjoon.je <sangjoon.je@samsung.com>
Change-Id: Iae65b1284d426244c9d9ac3f10691bbda63ac39b
Reviewed-on: https://gerrit.iotivity.org/gerrit/21373
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Youngman Jung <yman.jung@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 8d09aa7a65b9206d02104fe4f105cd59b9a0bcc7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21573

2 years agoAllow empty array in OCRepPayloadSetIntArray 91/21591/6
Abhishek Pandey [Mon, 24 Jul 2017 12:00:14 +0000 (17:30 +0530)]
Allow empty array in OCRepPayloadSetIntArray

[IOT-2458] OCRepPayloadSetIntArray() did not allow empty
array.  Fixed by not returning false when dimTotal is 0
and instead letting the function to get executed when input
array is NULL & dimTotal is 0.

Also fixed the usage of API in easy setup enrollee code.
Now using OCRepPayloadSetIntArrayAsOwner() instead of
OCRepPayloadSetIntArray() as the later duplicates the
memory which can be avoided "by giving payload ownership
to stack".

Added unit test in cbortests to test new API behavior.

Change-Id: If5352b1faf5a9355dd0f8a22882a6af545df6d29
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21591
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years ago[IOT-2464][IOT-2525] Fix UPDATE impl for cred 95/21595/5
Andrii Shtompel [Mon, 24 Jul 2017 16:01:46 +0000 (19:01 +0300)]
[IOT-2464][IOT-2525] Fix UPDATE impl for cred

Change-Id: If167119a1f5c3e49ebc0e01600adb992e79ddbe6
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21595
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2422] Add unimplemented crl GET handler 99/21599/6
Aleksey Volkov [Mon, 24 Jul 2017 16:34:12 +0000 (19:34 +0300)]
[IOT-2422] Add unimplemented crl GET handler

- This change adds only missing GET query handler to fix CT1.7.9.1 crl related error.

Change-Id: Icff644dba7df6701c4d3e0cabfc6d2f7cb630825
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21599
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2538] Add NONSECURE to the ResourceProperty 05/21605/2
George Nash [Mon, 24 Jul 2017 20:02:50 +0000 (13:02 -0700)]
[IOT-2538] Add NONSECURE to the ResourceProperty

This matches the OCResourceProperty value OC_NONSECURE
from octypes.h.

Bug: https://jira.iotivity.org/browse/IOT-2538
Change-Id: I9e536dbb4c3db5c8be9f219a8b95df1176859138
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21605
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agoRevert "Revert "[IOT-2068] EP payload ..."" 71/21371/5
uzchoi [Mon, 26 Jun 2017 05:45:20 +0000 (14:45 +0900)]
Revert "Revert "[IOT-2068] EP payload ...""

including invalid function parameter input

Change-Id: I9af1142ed5fc28794e14dd29d599b7089d167df5
Signed-off-by: uzchoi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21371
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoTweak main build_common scripts 11/21311/16
Mats Wichmann [Fri, 7 Jul 2017 18:15:37 +0000 (12:15 -0600)]
Tweak main build_common scripts

build_common/SConscript:
  * list of supported target-os not general enough for helpmsg, updated
  * send error msg to stderr by passing it to Exit instead of doing print
  * Use simpler python slicing in Yocto tool setup
  * pull most Add(somekind of construction variable) into one big call
    to AddVariables; name some more arguments for better clarity
  Removed temporarily while chasing Jenkins fails:
  * turn all variables which behave like booleans actually into BoolVariable
build_common/external_libs.scons:
  * a bad combination of options used to "raise" an error, but there is
    no need for a stack bracktrace here, want just a simple msg+exit
  * send error msg to stderr by passing it to Exit instead of doing print
build_common/external_libs.scons
  * send error msg to stderr by passing it to Exit instead of doing print
build_common/linux/SConscript
build_common/windows/SConscript
  * reduce repeated calls to env.get for same key
  * windows: update style to like in linux script

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I928199f005af805cad0b0657ca62411caf7a2500
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21311
Reviewed-by: Ibrahim Esmat <iesmat@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoWrong use of fflush() standard library removed 09/21509/3
Manoj Gupta [Fri, 3 Feb 2017 07:06:27 +0000 (12:36 +0530)]
Wrong use of fflush() standard library removed

Change-Id: Ic78a44f9dec3144de5a043accaa18ca2a0b38b02
Signed-off-by: Manoj Gupta <manoj.g2@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17033
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 1e713e21b54b029794a9dd4ac21df5fae8d75177)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21509
Reviewed-by: George Nash <george.nash@intel.com>
2 years ago[IOT-2476][IOT-2404] Fix issues with acl role 43/21543/6
Andrii Shtompel [Wed, 19 Jul 2017 15:49:57 +0000 (18:49 +0300)]
[IOT-2476][IOT-2404] Fix issues with acl role

Verified with CTT 1.5.12 test CT 1.7.7.1 - PASSED
Verified with CTT 1.5.12 test CTX.X.X.X_1.7.7.1 - PASSED

Change-Id: Id3eff707f36381ab8c862fccabeb4620a51a3cc5
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21543
Reviewed-by: Aleksey Volkov <a.volkov@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2421] Allow 0-length OCByteString. 55/21455/3
Todd Malsbary [Fri, 16 Jun 2017 16:55:23 +0000 (09:55 -0700)]
[IOT-2421] Allow 0-length OCByteString.

Bug: https://jira.iotivity.org/browse/IOT-2421
Change-Id: I7575340adb980facc5a9713886c194848c2c36d8
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21455
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2467] Fix issues with cred role 69/21569/3
Andrii Shtompel [Thu, 20 Jul 2017 14:43:44 +0000 (17:43 +0300)]
[IOT-2467] Fix issues with cred role

Verified with CTT 1.5.12 test CT 1.7.4.2 - PASSED

Change-Id: Iaf734e89d4bf5521814a089145d54702b215324e
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21569
Reviewed-by: Aleksey Volkov <a.volkov@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years agoWindows: UWP Sample App with WACK tests 15/21315/9
Ibrahim Esmat [Wed, 7 Jun 2017 02:22:04 +0000 (19:22 -0700)]
Windows: UWP Sample App with WACK tests

An elevator client UWP sample app using the dynamic ipca and
octbstack dlls.

The Supported APIs WACK test is run if building for Release.

Change-Id: I54b03d366a21b51cb723c355a252572b71050cd8
Signed-off-by: Ibrahim Esmat <iesmat@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21315
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2513]NS Fix for static analyzer issues 27/21527/4
abitha.s [Tue, 18 Jul 2017 10:44:10 +0000 (16:14 +0530)]
[IOT-2513]NS Fix for static analyzer issues

1. Removal of Null dereferences.
2. Adding field width specifiers.
3. removing negative checks on unsigned int.

Change-Id: I086c57f3a2473895cd424856f1e9e71af89e10d1
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21515
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 17afad03deea12a1d61e1bdc758514313109e61e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21527

2 years agoresource-directory: Fix uninitialised value 87/21387/4
Philippe Coval [Thu, 15 Jun 2017 09:13:46 +0000 (11:13 +0200)]
resource-directory: Fix uninitialised value

resource-directory: Fix condition on uninitialised value

Issue was observed using valgrind on GNU/Linux:

https://build.iotivity.org/ci/job/iotivity-verify-unit_tests/16067/valgrindResult/pid=13739,0x2/

Bug: https://jira.iotivity.org/browse/IOT-2279
Change-Id: Ide0a2cca989466fefd4a13b41cc81bf38fa8afff
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20829
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit bb85bde7d79e49580fe0c90dbcf0746f585c0ad4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21387
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoconnectivity: provide server unavailable error 39/21139/6
jihwan.seo [Tue, 11 Apr 2017 05:34:41 +0000 (14:34 +0900)]
connectivity: provide server unavailable error

provide server unavailable error(503) value in ocstack

Change-Id: Ica4956debfd8112f93beab4edd23a569ea5a3ad0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18679
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit 1dcb85b9796760b7e18dfd62ca85614d4d784e40)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21139

2 years ago[IOT-2465] Fix DELETE request impl for cred 03/21403/5
Andrii Shtompel [Wed, 12 Jul 2017 11:50:10 +0000 (14:50 +0300)]
[IOT-2465] Fix DELETE request impl for cred

Verified using CTT 1.5.11 test CT1.7.9.3
DELETE delete all credentials return PASSED

Change-Id: Ie52c6af9fb9205a650b766acf0084e0ac2dcdcf1
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21403
Reviewed-by: Aleksey Volkov <a.volkov@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agojava: cleanup build warnings 03/21503/3
George Nash [Thu, 13 Jul 2017 22:29:30 +0000 (15:29 -0700)]
java: cleanup build warnings

Thss commit cleans up the following build warnings:
 - warning incompatible-pointer-types from JniCaInterface.c
 - warning missing-field-initializers from JniCaInterface.c
 - warning reorder from JniOcPresenceHandle.cpp
 - warning unused-variable from JniOcProvisioning.cpp
 - warning unused-but-set-variable JniSecureUtils.cpp

Change-Id: I80c0df6effdff4ea089a15b53f16588c14853077
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21433
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit e25cf3641d3cdff26054a06c95d7f6ad5ab35c54)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21503

2 years agoIOT-2495 Fixed linking issue with BT connectivity 11/21411/3
George Nash [Wed, 12 Jul 2017 22:56:56 +0000 (15:56 -0700)]
IOT-2495 Fixed linking issue with BT connectivity

The library connectivity_abstraction_internal does not work
for android if bluetooth is used. It must be linked with
connectivity_abstraction.
Windows still needs to link against
connectivity_abstraction_internal.

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

Change-Id: I357969543313199615ceac3b3b5e5b9f6b7f4b48
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21411
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Md. Adnan Sami <adnan.sami@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agoCatch up 1.3-rel on plugins reformats 63/21463/2
Mats Wichmann [Sun, 16 Jul 2017 14:26:06 +0000 (08:26 -0600)]
Catch up 1.3-rel on plugins reformats

Some sconscripts got missed pulling reformats over from master.
This changeset is the scripts in plugins - these six scripts will
now be identical to their counterpart in master.

Note this does pick up the change not to locally set BUILD_DIR
into LIBPATH and to not set TB_LOG into CPPDEFINES as those are
done on a global level already.

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ib793b7eeaeda1d380b805153e82cffade7e65c80
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21463
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoCorrect misuse of resource interface for type. 51/21451/2
Ziran Sun [Fri, 14 Jul 2017 10:11:59 +0000 (11:11 +0100)]
Correct misuse of resource interface for type.

Change-Id: I0fdbee9a909e9fe0f0a7ac9a0d52fb2d0c6b7be4
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21451
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years ago[IOT - 2413] Fix for Heap-use-after-free issue. 69/21269/3
arya.k [Thu, 6 Jul 2017 06:51:51 +0000 (12:21 +0530)]
[IOT - 2413] Fix for Heap-use-after-free issue.

[AddressSanitizer] Heap-use-after-free in InProcServerWrapper.cpp fix.

 if(!interface.empty())
        {
            const string query = string("if=" + interface);
            ocEntityHandlerRequest.query = const_cast<char *>
             (query.c_str());
        }

Local variable 'query' reference after it goes out of scope
can be a cause for crash.

Change-Id: I63a2b77719caa5fe5a3cb18bdb21943ddd616da7
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21269
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Changjoon Baek <joon.c.baek@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[Resource-encapsulation] Static analyzer fixes. 89/21389/2
Jay Sharma [Mon, 3 Jul 2017 13:58:26 +0000 (19:28 +0530)]
[Resource-encapsulation] Static analyzer fixes.

Change-Id: Ia714da5a98b1b6d5acd09e9c3f5e96b8a119f955
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21213
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 95917d96cdee8675c82555c280cac4031b653cd5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21389
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
2 years agoIOT-2490 Fix JNI build using WITH_CLOUD=1 option 47/21347/2
George Nash [Mon, 10 Jul 2017 20:55:43 +0000 (13:55 -0700)]
IOT-2490 Fix JNI build using WITH_CLOUD=1 option

This build failure was a result of a recent refactor to
remove the `using namespace OC` from the header files.
Importing the name was casing name space collisions
between C and C++ code used in the JNI files when built
in Windows OS.

The WITH_CLOUD build option was missed in the refactor.

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

Change-Id: I89b4c35a5a312d3e09a69016e43762fb01359abe
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21347
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years ago[IOT-2478] pstat.cm default in SRESET is incorrect 13/21413/2
Nathan Heldt-Sheller [Thu, 13 Jul 2017 00:40:15 +0000 (17:40 -0700)]
[IOT-2478] pstat.cm default in SRESET is incorrect

Per spec, the /pstat.cm value should be 0x0000 0001 and .tm should
be 0x0000 0000.

Also fixed a similar error in RESET state values.

Change-Id: I9fae4d2e5fb8845bd51c26555dcb8c774885d6f3
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21413
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2219] Fix provisioning to support dual stack 51/20651/17
Dmitriy Zhuravlev [Thu, 8 Jun 2017 15:28:01 +0000 (18:28 +0300)]
[IOT-2219] Fix provisioning to support dual stack

1. Added ability to discover spec. version
in Provisioning Client to support OIC 1.1 in addition to OCF 1.0
2. Security version mechanism replaced by icv

Change-Id: I2c3aabe9ed78593fa97d13c1c528a571f34ffc0d
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20651
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-by: Vadym Riznyk <v.riznyk@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agosecurity: Declare variables before goto 69/21169/3
Philippe Coval [Fri, 30 Jun 2017 11:09:46 +0000 (13:09 +0200)]
security: Declare variables before goto

Change-Id: Ifce52dd9207dfdc02f66990e20acc14ef3a0f398
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21169
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agobuild: Also support android_unsecured 91/21391/2
Philippe Coval [Mon, 3 Jul 2017 10:16:21 +0000 (12:16 +0200)]
build: Also support android_unsecured

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