diff --git a/cmds/portmaster-start/main.go b/cmds/portmaster-start/main.go index 3a58d596..22f4cfdf 100644 --- a/cmds/portmaster-start/main.go +++ b/cmds/portmaster-start/main.go @@ -34,7 +34,7 @@ var ( UpdateURLs: []string{ "https://updates.safing.io", }, - Verification: helper.VerificationConfig, // FIXME: disable for now + Verification: helper.VerificationConfig, DevMode: false, Online: true, // is disabled later based on command } diff --git a/updates/helper/signing.go b/updates/helper/signing.go index 0bd19224..78ccab47 100644 --- a/updates/helper/signing.go +++ b/updates/helper/signing.go @@ -28,16 +28,6 @@ var ( BinarySigningTrustStore = jess.NewMemTrustStore() ) -// GetVerificationConfig returns the verification options based on the release channel. -func GetVerificationConfig(releaseChannel string) map[string]*updater.VerificationOptions { - switch releaseChannel { - case ReleaseChannelBeta, ReleaseChannelStaging: - return VerificationConfig - default: - return nil - } -} - func init() { for _, signingKey := range BinarySigningKeys { rcpt, err := jess.RecipientFromTextFormat(signingKey) diff --git a/updates/main.go b/updates/main.go index 6977ca16..3819f99b 100644 --- a/updates/main.go +++ b/updates/main.go @@ -111,7 +111,7 @@ func start() error { UserAgent: UserAgent, MandatoryUpdates: helper.MandatoryUpdates(), AutoUnpack: helper.AutoUnpackUpdates(), - Verification: helper.GetVerificationConfig(initialReleaseChannel), + Verification: helper.VerificationConfig, DevMode: devMode(), Online: true, }