From f82b34bfbbff35a768e551620b87ae06af0ccd9f Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 15 Oct 2023 16:03:17 +0100 Subject: [PATCH] Rename to Flashpoint Game Server --- .github/workflows/nexus.yml | 4 ++-- .gitignore | 1 + fpproxy.crt => fpGameServerCA.crt | 0 fpproxy.key => fpGameServerCA.key | 0 gen-ca.sh | 6 +++--- main.go | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) rename fpproxy.crt => fpGameServerCA.crt (100%) rename fpproxy.key => fpGameServerCA.key (100%) diff --git a/.github/workflows/nexus.yml b/.github/workflows/nexus.yml index f2640f0..46f7f0c 100644 --- a/.github/workflows/nexus.yml +++ b/.github/workflows/nexus.yml @@ -25,9 +25,9 @@ jobs: env: GOOS: "windows" GOARCH: "386" - run: go build -o "Flashpoint Proxy.exe" . + run: go build -o "Flashpoint Game Server.exe" . - name: Package - run: zip Server.zip "./Flashpoint Proxy.exe" ./proxySettings.json ./fpproxy.crt ./fpproxy.key + run: zip Server.zip "./Flashpoint Game Server.exe" ./proxySettings.json ./fpGameServerCA.crt ./fpGameServerCA.key - name: Generate Metadata run: | sudo apt install libarchive-zip-perl -y diff --git a/.gitignore b/.gitignore index b3a1ef8..7cc2439 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ main.exe fpproxy.csr Flashpoint Proxy.exe +Flashpoint Game Server.exe fpProxy.exe \ No newline at end of file diff --git a/fpproxy.crt b/fpGameServerCA.crt similarity index 100% rename from fpproxy.crt rename to fpGameServerCA.crt diff --git a/fpproxy.key b/fpGameServerCA.key similarity index 100% rename from fpproxy.key rename to fpGameServerCA.key diff --git a/gen-ca.sh b/gen-ca.sh index 7a9cd6e..e16836f 100644 --- a/gen-ca.sh +++ b/gen-ca.sh @@ -1,3 +1,3 @@ -openssl ecparam -out fpproxy.key -name prime256v1 -genkey -openssl req -new -sha256 -key fpproxy.key -out fpproxy.csr -openssl x509 -req -sha256 -days 36500 -in fpproxy.csr -signkey fpproxy.key -out fpproxy.crt \ No newline at end of file +openssl ecparam -out fpGameServerCA.key -name prime256v1 -genkey +openssl req -new -sha256 -key fpGameServerCA.key -out fpGameServerCA.csr +openssl x509 -req -sha256 -days 36500 -in fpGameServerCA.csr -signkey fpGameServerCA.key -out fpGameServerCA.crt \ No newline at end of file diff --git a/main.go b/main.go index daeba31..084f0f8 100644 --- a/main.go +++ b/main.go @@ -248,8 +248,8 @@ func handleRequest(r *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http func main() { // To create CA cert, refer to https://wiki.mozilla.org/SecurityEngineering/x509Certs#Self_Signed_Certs // Replace CA in GoProxy - certFile := "fpproxy.crt" - keyFile := "fpproxy.key" + certFile := "fpGameServerCA.crt" + keyFile := "fpGameServerCA.key" cert, err := tls.LoadX509KeyPair(certFile, keyFile) if err != nil {