Merge pull request #20 from OSGP/feature/fdp-2208-revert-cipher-suite…

…-change-for-pentest FDP-2208 ~ Reverts cipher suite change for pen-test
OSGP · May 30, 2024 · d1ee37a · d1ee37a
2 parents 0ca048f + ebfe4ef
commit d1ee37a
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/.../org/gxf/standalonenotifyinggateway/coaphttpproxy/coap/configuration/CoapConfiguration.kt b/.../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.pskstore.AdvancedPskStore
 import org.gxf.standalonenotifyinggateway.coaphttpproxy.coap.configuration.properties.CoapProperties
@@ -74,13 +73,8 @@ class CoapConfiguration(
         config
             .set(DtlsConfig.DTLS_ROLE, DtlsRole.SERVER_ONLY)
             .set(DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY, false)
-            // TODO revert after pentest is complete: FDP-2197
-            .set(
-                DtlsConfig.DTLS_PRESELECTED_CIPHER_SUITES,
-                listOf(TLS_PSK_WITH_AES_128_CBC_SHA256, CipherSuite.TLS_PSK_WITH_AES_128_CCM_8))
-            .set(
-                DtlsConfig.DTLS_CIPHER_SUITES,
-                listOf(TLS_PSK_WITH_AES_128_CBC_SHA256, CipherSuite.TLS_PSK_WITH_AES_128_CCM_8))
+            .set(DtlsConfig.DTLS_PRESELECTED_CIPHER_SUITES, listOf(TLS_PSK_WITH_AES_128_CBC_SHA256))
+            .set(DtlsConfig.DTLS_CIPHER_SUITES, listOf(TLS_PSK_WITH_AES_128_CBC_SHA256))
             .set(DtlsConfig.DTLS_CLIENT_AUTHENTICATION_MODE, CertificateAuthenticationMode.NONE)
     }