diff --git a/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj b/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
index 9d6af0e95..4f82130b1 100644
--- a/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
+++ b/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
@@ -28,7 +28,7 @@
-
+
diff --git a/source/Octopus.Tentacle/Communications/TentacleCommunicationsModule.cs b/source/Octopus.Tentacle/Communications/TentacleCommunicationsModule.cs
index 89bdc3344..169726043 100644
--- a/source/Octopus.Tentacle/Communications/TentacleCommunicationsModule.cs
+++ b/source/Octopus.Tentacle/Communications/TentacleCommunicationsModule.cs
@@ -29,16 +29,11 @@ protected override void Load(ContainerBuilder builder)
var halibutTimeoutsAndLimits = TentacleHalibutTimeoutAndLimitsFactory.CreateHalibutTimeoutsAndLimits();
- ISslConfigurationProvider sslConfigurationProvider = EnvironmentOverrides.UseLegacyExplicitSslConfiguration
- ? new LegacySslConfigurationProvider()
- : new DefaultSslConfigurationProvider();
-
var halibutRuntime = new HalibutRuntimeBuilder()
.WithServiceFactory(services)
.WithServerCertificate(configuration.TentacleCertificate!)
.WithMessageSerializer(serializerBuilder => serializerBuilder.WithLegacyContractSupport())
.WithHalibutTimeoutsAndLimits(halibutTimeoutsAndLimits)
- .WithSslConfigurationProvider(sslConfigurationProvider)
.Build();
halibutRuntime.SetFriendlyHtmlPageContent(FriendlyHtmlPageContent);
diff --git a/source/Octopus.Tentacle/EnvironmentOverrides.cs b/source/Octopus.Tentacle/EnvironmentOverrides.cs
deleted file mode 100644
index 3ca1f4ab1..000000000
--- a/source/Octopus.Tentacle/EnvironmentOverrides.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace Octopus.Tentacle
-{
- public static class EnvironmentOverrides
- {
- ///
- /// By default, (i.e. with no environment variable set) we will use the system default SSL
- /// configuration. For users that need to revert to the legacy explicit SSL configuration,
- /// they can set the OCTOPUS_TENTACLE_USE_LEGACY_TLS environment variable to "TRUE".
- ///
- public static bool UseLegacyExplicitSslConfiguration =>
- bool.TrueString.Equals(
- Environment.GetEnvironmentVariable("OCTOPUS_TENTACLE_USE_LEGACY_TLS"),
- StringComparison.OrdinalIgnoreCase
- );
- }
-}
\ No newline at end of file
diff --git a/source/Octopus.Tentacle/Program.cs b/source/Octopus.Tentacle/Program.cs
index cd2371795..e31e5acb6 100644
--- a/source/Octopus.Tentacle/Program.cs
+++ b/source/Octopus.Tentacle/Program.cs
@@ -27,13 +27,6 @@ public Program(string[] commandLineArguments) : base("Octopus Deploy: Tentacle",
OctopusTentacle.EnvironmentInformation,
commandLineArguments)
{
- if (EnvironmentOverrides.UseLegacyExplicitSslConfiguration)
- {
- ServicePointManager.SecurityProtocol =
- SecurityProtocolType.Tls
- | SecurityProtocolType.Tls11
- | SecurityProtocolType.Tls12;
- }
}
protected override ApplicationName ApplicationName => ApplicationName.Tentacle;