Revert "Temporary workaround about HELLO_VERIFY_REQUEST protocol vers…

…ion." This reverts commit a29f4c7.
eclipse-leshan · Dec 7, 2020 · 40aad7c · 40aad7c
1 parent 6f37492
commit 40aad7c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 18 deletions.
diff --git a/...an-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClientBuilder.java b/...an-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClientBuilder.java
@@ -29,7 +29,6 @@
 import org.eclipse.californium.scandium.DTLSConnector;
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig.Builder;
-import org.eclipse.californium.scandium.dtls.ProtocolVersion;
 import org.eclipse.leshan.client.engine.DefaultRegistrationEngineFactory;
 import org.eclipse.leshan.client.engine.RegistrationEngine;
 import org.eclipse.leshan.client.engine.RegistrationEngineFactory;
@@ -276,11 +275,6 @@ protected Connector createSecuredConnector(DtlsConnectorConfig dtlsConfig) {
         }
         DtlsConnectorConfig incompleteConfig = dtlsConfigBuilder.getIncompleteConfig();
 
-        // TODO probably remove this with integration of Cf-2.6.0.
-        // see : https://github.com/eclipse/californium/pull/1459
-        if (incompleteConfig.getProtocolVersionForHelloVerifyRequests() == null)
-            dtlsConfigBuilder.setProtocolVersionForHelloVerifyRequests(ProtocolVersion.VERSION_DTLS_1_2);
-
         // Handle secure address
         if (incompleteConfig.getAddress() == null) {
             if (localAddress == null) {

diff --git a/...an-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServerBuilder.java b/...an-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServerBuilder.java
@@ -34,7 +34,6 @@
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig.Builder;
 import org.eclipse.californium.scandium.dtls.CertificateType;
-import org.eclipse.californium.scandium.dtls.ProtocolVersion;
 import org.eclipse.californium.scandium.dtls.x509.BridgeCertificateVerifier;
 import org.eclipse.leshan.core.LwM2m;
 import org.eclipse.leshan.core.californium.DefaultEndpointFactory;
@@ -443,11 +442,6 @@ public LeshanServer build() {
             // Set default DTLS setting for Leshan unless user change it.
             DtlsConnectorConfig incompleteConfig = dtlsConfigBuilder.getIncompleteConfig();
 
-            // TODO probably remove this with integration of Cf-2.6.0.
-            // see : https://github.com/eclipse/californium/pull/1459
-            if (incompleteConfig.getProtocolVersionForHelloVerifyRequests() == null)
-                dtlsConfigBuilder.setProtocolVersionForHelloVerifyRequests(ProtocolVersion.VERSION_DTLS_1_2);
-
             // Handle PSK Store
             if (incompleteConfig.getAdvancedPskStore() != null) {
                 LOG.warn(

diff --git a/...in/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServerBuilder.java b/...in/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServerBuilder.java
@@ -31,7 +31,6 @@
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig.Builder;
 import org.eclipse.californium.scandium.dtls.CertificateType;
-import org.eclipse.californium.scandium.dtls.ProtocolVersion;
 import org.eclipse.californium.scandium.dtls.x509.BridgeCertificateVerifier;
 import org.eclipse.leshan.core.LwM2m;
 import org.eclipse.leshan.core.californium.DefaultEndpointFactory;
@@ -444,11 +443,6 @@ public BootstrapHandler create(BootstrapConfigStore store, LwM2mBootstrapRequest
             // Set default DTLS setting for Leshan unless user change it.
             DtlsConnectorConfig incompleteConfig = dtlsConfigBuilder.getIncompleteConfig();
 
-            // TODO probably remove this with integration of Cf-2.6.0.
-            // see : https://github.com/eclipse/californium/pull/1459
-            if (incompleteConfig.getProtocolVersionForHelloVerifyRequests() == null)
-                dtlsConfigBuilder.setProtocolVersionForHelloVerifyRequests(ProtocolVersion.VERSION_DTLS_1_2);
-
             // Handle PSK Store
             if (incompleteConfig.getAdvancedPskStore() != null) {
                 LOG.warn(