From be9b9821f4834749d194c2774e594243f1df89fb Mon Sep 17 00:00:00 2001 From: DaanSelen Date: Mon, 24 Nov 2025 16:55:16 +0100 Subject: [PATCH] chore: update labels --- .gitignore | 5 ++++- compile_win.sh | 2 ++ main.go | 13 ++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 compile_win.sh diff --git a/.gitignore b/.gitignore index d650c66..3c849c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +* +!*.* fyne-cross -Icon.png \ No newline at end of file +Icon.png +*.exe diff --git a/compile_win.sh b/compile_win.sh new file mode 100644 index 0000000..f75e459 --- /dev/null +++ b/compile_win.sh @@ -0,0 +1,2 @@ +#!/bin/bash +GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CXX=x86_64-w64-mingw32-g++ CC=x86_64-w64-mingw32-gcc go build -ldflags -H=windowsgui diff --git a/main.go b/main.go index 7030a0c..0fc5173 100644 --- a/main.go +++ b/main.go @@ -73,7 +73,7 @@ func main() { // Certificate Intermediate var newSectigoSelected bool - caRadio := widget.NewRadioGroup([]string{"New Sectigo (2025+)", "Old Sectigo (2025-)"}, func(selected string) { + caRadio := widget.NewRadioGroup([]string{"New Sectigo (2025-03-22+)", "Old Sectigo (2025-03-22-)"}, func(selected string) { switch selected { case "New Sectigo (2025+)": newSectigoSelected = true @@ -112,8 +112,11 @@ func main() { respText, pfxData := integrityCheckAndGo(keyPath, certPath, caCert, rootCert) - log.Println(respText) - grid.SetText(respText) + if pfxData == nil { + log.Println(respText) + grid.SetText(respText) + return + } // Show Save File dialog immediately svDialog := dialog.NewFileSave( @@ -242,9 +245,9 @@ func integrityCheckAndGo(keyPath, certPath, caCertString, caRootString string) ( checkPublicKey(cert) // Print the information about the key if checkCertKeyPair(cert.PublicKey, key) { - fmt.Println("Private key matches certificate") + log.Println("Private key matches certificate") } else { - fmt.Println("Private key does NOT match certificate") + return "Private key does NOT match certificate", nil } caCertList := []*x509.Certificate{caCert, rootCert}