Merge pull request #34 from DarrenWhite99/TLSTesting

TLS Handling Updates

Author: LabtechConsulting

LabTech.psm1

@@ -63,13 +63,11 @@ Add-Type -Debug:$False @"
     }
 "@
 [System.Net.ServicePointManager]::CertificatePolicy = New-Object TrustAllCertsPolicy
-#Enable TLS 1.2
-if ([Net.ServicePointManager]::SecurityProtocol.ToString().Split(',').Trim() -notcontains 'Tls12') {
-            $securityProtocol=@()
-            $securityProtocol+=[Net.ServicePointManager]::SecurityProtocol
-            $securityProtocol+=[Net.SecurityProtocolType]3072
-            [Net.ServicePointManager]::SecurityProtocol=$securityProtocol
-}
+#Enable TLS, TLS1.1, TLS1.2 in this session if they are available
+IF([Net.SecurityProtocolType]::Tls) {[Net.ServicePointManager]::SecurityProtocol=[Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls}
+IF([Net.SecurityProtocolType]::Tls11) {[Net.ServicePointManager]::SecurityProtocol=[Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11}
+IF([Net.SecurityProtocolType]::Tls12) {[Net.ServicePointManager]::SecurityProtocol=[Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12}
+
 #region [Functions]-------------------------------------------------------------
 
 Function Get-LTServiceInfo{ 
@@ -433,7 +431,7 @@ Function Start-LTService{
                             Write-Warning "There was an issue killing the following process: $proc"
                             Write-Warning "This generally means that a 'protected application' is using this port."
                             $newPort = [int]$port + 1
-                            if($newPort > 42009) {$newPort = 42000}
+                            if($newPort -gt 42009) {$newPort = 42000}
                             Write-Warning "Setting tray port to $newPort."
                             New-ItemProperty -Path "HKLM:\Software\Labtech\Service" -Name TrayPort -PropertyType String -Value $newPort -Force -WhatIf:$False -Confirm:$False | Out-Null
                         }#End Catch