Unverified Commit 6b6057b9 authored by Javier Guerra's avatar Javier Guerra Committed by GitHub

Merge pull request #14 from openconnectivity/develop

Merge develop into master
parents 255dc70a 7f46bdc2
......@@ -11,7 +11,7 @@
# Constants
PROJECT_NAME="otgc"
VERSION="2.4.0"
VERSION="2.5.0"
program=$0
......
diff --git a/include/oc_pki.h b/include/oc_pki.h
index acbab8c..c16b512 100644
index acbab8c7..c16b512b 100644
--- a/include/oc_pki.h
+++ b/include/oc_pki.h
@@ -45,6 +45,9 @@ int oc_pki_add_trust_anchor(size_t device, const unsigned char *cert,
......@@ -13,10 +13,10 @@ index acbab8c..c16b512 100644
}
#endif
diff --git a/security/oc_pki.c b/security/oc_pki.c
index a9306c2..c9b3b15 100644
index a9306c23..52755576 100644
--- a/security/oc_pki.c
+++ b/security/oc_pki.c
@@ -354,6 +354,16 @@ oc_pki_add_trust_anchor(size_t device, const unsigned char *cert,
@@ -354,6 +354,17 @@ oc_pki_add_trust_anchor(size_t device, const unsigned char *cert,
return pki_add_trust_anchor(device, cert, cert_size, OC_CREDUSAGE_TRUSTCA);
}
......@@ -27,6 +27,7 @@ index a9306c2..c9b3b15 100644
+ if (cred)
+ {
+ oc_sec_remove_cred(cred, device);
+ oc_sec_dump_cred(device);
+ }
+}
+
......@@ -34,7 +35,7 @@ index a9306c2..c9b3b15 100644
typedef int dummy_declaration;
#endif /* !OC_PKI */
diff --git a/swig/swig_interfaces/oc_pki.i b/swig/swig_interfaces/oc_pki.i
index 2765e56..9910770 100644
index 2765e562..9910770c 100644
--- a/swig/swig_interfaces/oc_pki.i
+++ b/swig/swig_interfaces/oc_pki.i
@@ -105,4 +105,6 @@ void jni_pki_set_security_profile(size_t device,
......
......@@ -6,7 +6,7 @@
<groupId>otgc</groupId>
<artifactId>otgc</artifactId>
<version>2.4.0</version>
<version>2.5.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......
......@@ -45,7 +45,8 @@ public class GetTrustAnchorUseCase {
List<OcCredential> trustAnchorList = new ArrayList<>();
for (OcCredential cred : credentials.getCredList()) {
if (cred.getCredusage() != null
&& cred.getCredusage() == OcfCredUsage.OC_CREDUSAGE_TRUSTCA) {
&& (cred.getCredusage() == OcfCredUsage.OC_CREDUSAGE_MFGTRUSTCA
|| cred.getCredusage() == OcfCredUsage.OC_CREDUSAGE_TRUSTCA)) {
trustAnchorList.add(cred);
}
}
......
......@@ -114,7 +114,7 @@ public class ToolbarView implements FxmlView<ToolbarViewModel>, Initializable {
Platform.runLater(() -> {
ChoiceDialog alertDialog = new ChoiceDialog(options.get(0), options);
alertDialog.setTitle(resourceBundle.getString("dialog.title.select_oxm"));
alertDialog.setHeaderText("OXM: ");
alertDialog.setHeaderText("OTM: ");
Optional<String> result = alertDialog.showAndWait();
if (result.isPresent()) {
......
......@@ -28,6 +28,7 @@ public class TrustAnchorViewCell extends ListCell<OcCredential> {
private GridPane gridPane = new GridPane();
private Label credId = new Label();
private Label credSubject = new Label();
private Label credUsage = new Label();
public TrustAnchorViewCell() {
configureGrid();
......@@ -42,6 +43,7 @@ public class TrustAnchorViewCell extends ListCell<OcCredential> {
private void addControlsToGrid() {
gridPane.add(credId, 0, 0);
gridPane.add(credSubject, 0, 1);
gridPane.add(credUsage, 0, 2);
}
@Override
......@@ -65,6 +67,7 @@ public class TrustAnchorViewCell extends ListCell<OcCredential> {
credId.setText("Credential ID: " + String.valueOf(cred.getCredid()));
credSubject.setText("UUID: " + cred.getSubjectuuid());
credSubject.setText("Usage: " + cred.getCredusage().getValue());
setGraphic(gridPane);
}
......
......@@ -165,7 +165,7 @@ linkdevices.label.role_id=Role ID
linkdevices.label.role_authority= Role authority
## Dialog
dialog.title.select_oxm=Select OXM
dialog.title.select_oxm=Select OTM
dialog.title.set_device_name=Set device name
dialog.title.confirm_reset_mode=Reset device
dialog.message.confirm_reset_mode=Are you sure you want to delete all linked devices?
......@@ -173,4 +173,4 @@ dialog.message.confirm_reset_mode=Are you sure you want to delete all linked dev
## Iotivity
oxm.just_works=Just Works
oxm.random_pin=Random Pin
oxm.manufacturer_certificate=Manufacturer Certificate
\ No newline at end of file
oxm.manufacturer_certificate=PKI
\ No newline at end of file
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