Unverified Commit 5c1ac910 authored by Javier Guerra's avatar Javier Guerra Committed by GitHub

Merge pull request #12 from openconnectivity/develop

Merge develop into master
parents 8ba69aa8 2952e9ac
......@@ -46,7 +46,7 @@ mvn install:install-file \
-DgeneratePom=true
```
6. Add the following command, to link the previous libraries with iotivity.jar, in the run/debug configuration:
To run or to debug the OTGC application in an IDE, the following command as to be added as VM argument to link iotivity-lite library to the project:
```
-Djava.library.path=<otgc-linux>/lib/jni
```
......
......@@ -11,7 +11,7 @@
# Constants
PROJECT_NAME="otgc"
VERSION="2.2.0"
VERSION="2.3.0"
program=$0
......
......@@ -6,7 +6,7 @@
<groupId>otgc</groupId>
<artifactId>otgc</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......
......@@ -89,18 +89,12 @@ public class InitOicStackUseCase {
if (OCPki.addMfgTrustAnchor(device, kyrioRootcaCertificate) == -1) {
throw new Exception("Add root certificate error");
}
if (OCPki.addTrustAnchor(device, kyrioRootcaCertificate) == -1) {
throw new Exception("Add root certificate error");
}
/* EonTi root cert */
byte[] eontiRootcaCertificate = ioRepository.getBytesFromFile(OtgcConstant.EONTI_ROOT_CERTIFICATE).blockingGet();
if (OCPki.addMfgTrustAnchor(device, eontiRootcaCertificate) == -1) {
throw new Exception("Add root certificate error");
}
if (OCPki.addTrustAnchor(device, eontiRootcaCertificate) == -1) {
throw new Exception("Add root certificate error");
}
OCObt.shutdown();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment