From 394a519b96b278fb0a8a193c545089546e91c6b0 Mon Sep 17 00:00:00 2001
From: Jerry Jacobs <jerry.jacobs@xor-gate.org>
Date: Fri, 26 Jul 2024 16:14:06 +0200
Subject: [PATCH] Use garble -literals in builds

---
 .goreleaser.yaml           | 1 +
 Makefile                   | 6 ++----
 scripts/garble-literals.sh | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100755 scripts/garble-literals.sh

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index b3d3df2..cf1165e 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -27,6 +27,7 @@ builds:
       - amd64
     ldflags:
       - -H=windowsgui
+    gobinary: "scripts/garble-literals.sh"
     buildmode: c-shared
     tags:
       - release
diff --git a/Makefile b/Makefile
index 566fc87..b9d4035 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 SOURCES=Makefile main.go main_release.go main_debug.go config.go config_release.go config_template.go 
-GARBLE_BIN = $(shell go env GOPATH)/bin/garble
+GARBLE_BIN = $(shell go env GOPATH)/bin/garble -literals
 
 all: socks5-ssh-proxy
 
@@ -18,10 +18,8 @@ socks5-ssh-proxy.release: resources $(SOURCES)
 	GOOS=darwin GOARCH=amd64 $(GO_ENV_VARS) go build -tags release -o $@
 	upx $@
 win: socks5-ssh-proxy.exe
-#socks5-ssh-proxy.exe: resources $(GARBLE_BIN) $(SOURCES)
-#	GOOS=windows GOARCH=amd64 $(GARBLE_BIN) build -ldflags -H=windowsgui -tags release -o $@
 socks5-ssh-proxy.exe: resources $(SOURCES)
-	GOOS=windows GOARCH=amd64 go build -ldflags -H=windowsgui -tags release -o $@
+	GOOS=windows GOARCH=amd64 $(GARBLE_BIN) build -ldflags -H=windowsgui -tags release -o $@
 dll: resources
 	rm -Rf dist
 	goreleaser build --snapshot
diff --git a/scripts/garble-literals.sh b/scripts/garble-literals.sh
new file mode 100755
index 0000000..a41a663
--- /dev/null
+++ b/scripts/garble-literals.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+`go env GOPATH`/bin/garble -literals $@