-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[knx] Allow decoding of KNX Data Secure frames
* add passive (listening only) access for KNX Data Secure frames, #8872 * add config options for KNX keyring file and password * ease setup if IP Secure, as required parameters can be read from keyring * add tests for security functions * update user documentation Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
- Loading branch information
1 parent
ba6cef3
commit 48488cd
Showing
23 changed files
with
932 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
...knx/src/main/java/org/openhab/binding/knx/internal/client/CustomManagementClientImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /** | ||
| * Copyright (c) 2010-2024 Contributors to the openHAB project | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0 | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| */ | ||
| package org.openhab.binding.knx.internal.client; | ||
|
|
||
| import org.eclipse.jdt.annotation.NonNullByDefault; | ||
|
|
||
| import tuwien.auto.calimero.link.KNXLinkClosedException; | ||
| import tuwien.auto.calimero.link.KNXNetworkLink; | ||
| import tuwien.auto.calimero.mgmt.ManagementClientImpl; | ||
| import tuwien.auto.calimero.mgmt.SecureManagement; | ||
|
|
||
| /** | ||
| * This class is to provide access to protected constructors in the Calimero library. | ||
| * Reason is to provide custom KNX keyring data. | ||
| * | ||
| * @author Holger Friedrich - initial contribution | ||
| * | ||
| */ | ||
| @NonNullByDefault | ||
| public class CustomManagementClientImpl extends ManagementClientImpl { | ||
| public CustomManagementClientImpl(final KNXNetworkLink link, final SecureManagement secureManagement) | ||
| throws KNXLinkClosedException { | ||
| // super(link, secureManagement) is available since Calimero 2.5.1 | ||
| super(link, secureManagement); | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
...src/main/java/org/openhab/binding/knx/internal/client/CustomManagementProceduresImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /** | ||
| * Copyright (c) 2010-2024 Contributors to the openHAB project | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0 | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| */ | ||
| package org.openhab.binding.knx.internal.client; | ||
|
|
||
| import org.eclipse.jdt.annotation.NonNullByDefault; | ||
|
|
||
| import tuwien.auto.calimero.link.KNXLinkClosedException; | ||
| import tuwien.auto.calimero.mgmt.ManagementClient; | ||
| import tuwien.auto.calimero.mgmt.ManagementProceduresImpl; | ||
| import tuwien.auto.calimero.mgmt.TransportLayer; | ||
|
|
||
| /** | ||
| * This class is to provide access to protected constructors in the Calimero library. | ||
| * Reason is to provide custom KNX keyring data. | ||
| * | ||
| * @author Holger Friedrich - initial contribution | ||
| * | ||
| */ | ||
| @NonNullByDefault | ||
| public class CustomManagementProceduresImpl extends ManagementProceduresImpl { | ||
| public CustomManagementProceduresImpl(final ManagementClient mgmtClient, final TransportLayer transportLayer) | ||
| throws KNXLinkClosedException { | ||
| // super(mgmtClient, transportLayer) is protected | ||
| super(mgmtClient, transportLayer); | ||
| } | ||
| } |
Oops, something went wrong.