From 06a15e6c7019e4dbe82ecf9044a5e58849b65861 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Tue, 7 Jan 2025 17:21:02 +0200 Subject: Refactored to better embed the certifcates and also made sure to read at runtime the server.key instead of containing it in the server's executable using go embed --- internal/client/gateway/gateway.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'internal/client/gateway') diff --git a/internal/client/gateway/gateway.go b/internal/client/gateway/gateway.go index a8f4241..9709968 100644 --- a/internal/client/gateway/gateway.go +++ b/internal/client/gateway/gateway.go @@ -5,7 +5,6 @@ import ( "crypto/ed25519" "crypto/tls" "crypto/x509" - _ "embed" "encoding/binary" "errors" "log" @@ -15,15 +14,13 @@ import ( tea "github.com/charmbracelet/bubbletea" + "github.com/kyren223/eko/certs" "github.com/kyren223/eko/internal/client/ui" "github.com/kyren223/eko/internal/packet" "github.com/kyren223/eko/pkg/assert" "github.com/kyren223/eko/pkg/snowflake" ) -//go:embed server.crt -var certPEM []byte - var ( tlsConfig *tls.Config @@ -42,7 +39,7 @@ type ( func init() { certPool := x509.NewCertPool() - if !certPool.AppendCertsFromPEM(certPEM) { + if !certPool.AppendCertsFromPEM(certs.CertPEM) { log.Fatalln("failed to append server certificate") } -- cgit v1.3.1