From e65629e089fc056664000312af96bd28d380df2b Mon Sep 17 00:00:00 2001
From: moloch-- <875022+moloch--@users.noreply.github.com>
Date: Fri, 30 Sep 2022 08:10:46 -0700
Subject: [PATCH] Tweak https/tls server compatibility for windows

---
 server/c2/http.go       | 31 +++++++++++++++++++------------
 server/rpc/rpc-tasks.go |  4 ++--
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/server/c2/http.go b/server/c2/http.go
index 6890ca067c..179a1f0974 100644
--- a/server/c2/http.go
+++ b/server/c2/http.go
@@ -255,11 +255,18 @@ func getHTTPSConfig(conf *HTTPServerConfig) *tls.Config {
 
 	// Randomize the JARM fingerprint
 	switch insecureRand.Intn(4) {
+
+	// So it turns out that Windows by default
+	// disables TLS v1.2 because it's horrible.
+	// So anyways for compatibility we'll specify
+	// a min of 1.1 or 1.0
+
 	case 0:
 		// tlsConfig.MinVersion = tls.VersionTLS13
 		fallthrough // For compatibility with winhttp
 	case 1:
-		tlsConfig.MinVersion = tls.VersionTLS12
+		// tlsConfig.MinVersion = tls.VersionTLS12
+		fallthrough // For compatibility with winhttp
 	case 2:
 		tlsConfig.MinVersion = tls.VersionTLS11
 	default:
@@ -268,17 +275,17 @@ func getHTTPSConfig(conf *HTTPServerConfig) *tls.Config {
 
 	// Randomize the cipher suites
 	allCipherSuites := []uint16{
-		// tls.TLS_RSA_WITH_RC4_128_SHA,     //uint16 = 0x0005
-		tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,   //uint16 = 0x000a
-		tls.TLS_RSA_WITH_AES_128_CBC_SHA,    //uint16 = 0x002f
-		tls.TLS_RSA_WITH_AES_256_CBC_SHA,    //uint16 = 0x0035
-		tls.TLS_RSA_WITH_AES_128_CBC_SHA256, //uint16 = 0x003c
-		tls.TLS_RSA_WITH_AES_128_GCM_SHA256, //uint16 = 0x009c
-		tls.TLS_RSA_WITH_AES_256_GCM_SHA384, //uint16 = 0x009d
-		// tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,  //uint16 = 0xc007
-		tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, //uint16 = 0xc009
-		tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, //uint16 = 0xc00a
-		// tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,    //uint16 = 0xc011
+		tls.TLS_RSA_WITH_RC4_128_SHA,                      //uint16 = 0x0005
+		tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,                 //uint16 = 0x000a
+		tls.TLS_RSA_WITH_AES_128_CBC_SHA,                  //uint16 = 0x002f
+		tls.TLS_RSA_WITH_AES_256_CBC_SHA,                  //uint16 = 0x0035
+		tls.TLS_RSA_WITH_AES_128_CBC_SHA256,               //uint16 = 0x003c
+		tls.TLS_RSA_WITH_AES_128_GCM_SHA256,               //uint16 = 0x009c
+		tls.TLS_RSA_WITH_AES_256_GCM_SHA384,               //uint16 = 0x009d
+		tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,              //uint16 = 0xc007
+		tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,          //uint16 = 0xc009
+		tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,          //uint16 = 0xc00a
+		tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,                //uint16 = 0xc011
 		tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,           //uint16 = 0xc012
 		tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,            //uint16 = 0xc013
 		tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,            //uint16 = 0xc014
diff --git a/server/rpc/rpc-tasks.go b/server/rpc/rpc-tasks.go
index 125c7561e5..0e893d6578 100644
--- a/server/rpc/rpc-tasks.go
+++ b/server/rpc/rpc-tasks.go
@@ -23,7 +23,7 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path"
 	"strings"
 
@@ -78,7 +78,7 @@ func (rpc *Server) Migrate(ctx context.Context, req *clientpb.MigrateReq) (*sliv
 		if err != nil {
 			return nil, err
 		}
-		shellcode, _ = ioutil.ReadFile(shellcodePath)
+		shellcode, _ = os.ReadFile(shellcodePath)
 	}
 	reqData, err := proto.Marshal(&sliverpb.InvokeMigrateReq{
 		Request: req.Request,