Start with same verification config on all channels

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
 	}

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)

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,
 	}