Skip to content

Commit d1ee37a

Browse files
authored
Merge pull request #20 from OSGP/feature/fdp-2208-revert-cipher-suite-change-for-pentest
FDP-2208 ~ Reverts cipher suite change for pen-test
2 parents 0ca048f + ebfe4ef commit d1ee37a

File tree

1 file changed

+2
-8
lines changed
  • application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration

1 file changed

+2
-8
lines changed

application/src/main/kotlin/org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/CoapConfiguration.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import org.eclipse.californium.scandium.MdcConnectionListener
1717
import org.eclipse.californium.scandium.config.DtlsConfig
1818
import org.eclipse.californium.scandium.config.DtlsConfig.DtlsRole
1919
import org.eclipse.californium.scandium.config.DtlsConnectorConfig
20-
import org.eclipse.californium.scandium.dtls.cipher.CipherSuite
2120
import org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA256
2221
import org.eclipse.californium.scandium.dtls.pskstore.AdvancedPskStore
2322
import org.gxf.standalonenotifyinggateway.coaphttpproxy.coap.configuration.properties.CoapProperties
@@ -74,13 +73,8 @@ class CoapConfiguration(
7473
config
7574
.set(DtlsConfig.DTLS_ROLE, DtlsRole.SERVER_ONLY)
7675
.set(DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY, false)
77-
// TODO revert after pentest is complete: FDP-2197
78-
.set(
79-
DtlsConfig.DTLS_PRESELECTED_CIPHER_SUITES,
80-
listOf(TLS_PSK_WITH_AES_128_CBC_SHA256, CipherSuite.TLS_PSK_WITH_AES_128_CCM_8))
81-
.set(
82-
DtlsConfig.DTLS_CIPHER_SUITES,
83-
listOf(TLS_PSK_WITH_AES_128_CBC_SHA256, CipherSuite.TLS_PSK_WITH_AES_128_CCM_8))
76+
.set(DtlsConfig.DTLS_PRESELECTED_CIPHER_SUITES, listOf(TLS_PSK_WITH_AES_128_CBC_SHA256))
77+
.set(DtlsConfig.DTLS_CIPHER_SUITES, listOf(TLS_PSK_WITH_AES_128_CBC_SHA256))
8478
.set(DtlsConfig.DTLS_CLIENT_AUTHENTICATION_MODE, CertificateAuthenticationMode.NONE)
8579
}
8680

0 commit comments

Comments
 (0)