diff --git a/application/src/integrationTest/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/IntegrationTestCoapClient.kt b/application/src/integrationTest/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/IntegrationTestCoapClient.kt index 395987b..ba6671f 100644 --- a/application/src/integrationTest/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/IntegrationTestCoapClient.kt +++ b/application/src/integrationTest/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/IntegrationTestCoapClient.kt @@ -56,9 +56,7 @@ class IntegrationTestCoapClient { return Configuration.getStandard() .set(CoapConfig.COAP_SECURE_PORT, coapsPort.toInt()) .set(DtlsConfig.DTLS_ROLE, DtlsConfig.DtlsRole.CLIENT_ONLY) - .set( - DtlsConfig.DTLS_CIPHER_SUITES, - cipherSuites) + .set(DtlsConfig.DTLS_CIPHER_SUITES, cipherSuites) } private fun getUri(): String = diff --git a/application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/CoapConfiguration.kt b/application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/CoapConfiguration.kt index ed464ef..0120bfb 100644 --- a/application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/CoapConfiguration.kt +++ b/application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/CoapConfiguration.kt @@ -17,7 +17,6 @@ import org.eclipse.californium.scandium.MdcConnectionListener import org.eclipse.californium.scandium.config.DtlsConfig import org.eclipse.californium.scandium.config.DtlsConfig.DtlsRole import org.eclipse.californium.scandium.config.DtlsConnectorConfig -import org.eclipse.californium.scandium.dtls.cipher.CipherSuite import org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA256 import org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_WITH_AES_128_GCM_SHA256 import org.eclipse.californium.scandium.dtls.pskstore.AdvancedPskStore @@ -78,9 +77,7 @@ class CoapConfiguration( .set( DtlsConfig.DTLS_PRESELECTED_CIPHER_SUITES, listOf(TLS_PSK_WITH_AES_128_CBC_SHA256, TLS_PSK_WITH_AES_128_GCM_SHA256)) - .set( - DtlsConfig.DTLS_CIPHER_SUITES, - coapProps.cipherSuites) + .set(DtlsConfig.DTLS_CIPHER_SUITES, coapProps.cipherSuites) .set(DtlsConfig.DTLS_CLIENT_AUTHENTICATION_MODE, CertificateAuthenticationMode.NONE) } diff --git a/application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/properties/CoapProperties.kt b/application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/properties/CoapProperties.kt index 7de2697..8fa830c 100644 --- a/application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/properties/CoapProperties.kt +++ b/application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/properties/CoapProperties.kt @@ -3,8 +3,8 @@ // SPDX-License-Identifier: Apache-2.0 package org.gxf.standalonenotifyinggateway.coaphttpproxy.coap.configuration.properties -import org.eclipse.californium.scandium.dtls.cipher.CipherSuite import java.time.Duration +import org.eclipse.californium.scandium.dtls.cipher.CipherSuite import org.springframework.boot.context.properties.ConfigurationProperties @ConfigurationProperties(prefix = "config.coap")