Address comments

letsencrypt · Nov 22, 2024 · afaf04b · afaf04b
1 parent ff6c22d
commit afaf04b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/cmd/boulder-wfe2/main.go b/cmd/boulder-wfe2/main.go
@@ -293,13 +293,8 @@ func main() {
 		cmd.Fail("'getNonceService' must be configured")
 	}
 
-	var noncePrefixKey []byte
-	if c.WFE.NonceHMACKey.KeyFile != "" {
-		noncePrefixKey, err = c.WFE.NonceHMACKey.Load()
-		cmd.FailOnError(err, "Failed to load nonceHMACKey file")
-	} else {
-		cmd.Fail("NonceHMACKey KeyFile must be set")
-	}
+	noncePrefixKey, err := c.WFE.NonceHMACKey.Load()
+	cmd.FailOnError(err, "Failed to load nonceHMACKey file")
 
 	getNonceConn, err := bgrpc.ClientSetup(c.WFE.GetNonceService, tlsConfig, stats, clk)
 	cmd.FailOnError(err, "Failed to load credentials and create gRPC connection to get nonce service")

diff --git a/cmd/nonce-service/main.go b/cmd/nonce-service/main.go
@@ -74,13 +74,8 @@ func main() {
 		c.NonceService.DebugAddr = *debugAddr
 	}
 
-	var key []byte
-	if c.NonceService.NonceHMACKey.KeyFile != "" {
-		key, err = c.NonceService.NonceHMACKey.Load()
-		cmd.FailOnError(err, "Failed to load nonceHMACKey file.")
-	} else {
-		cmd.Fail("NonceHMACKey KeyFile must be set")
-	}
+	key, err := c.NonceService.NonceHMACKey.Load()
+	cmd.FailOnError(err, "Failed to load nonceHMACKey file.")
 
 	noncePrefix, err := derivePrefix(key, c.NonceService.GRPC.Address)
 	cmd.FailOnError(err, "Failed to derive nonce prefix")