Merge pull request #3 from nicolae-leonte-go/qlight-develop-refactor-…

…tls-params use only 1 cacert config
baptiste-b-pegasys · Mar 22, 2022 · 35628cc · 35628cc
2 parents ce996a5 + 18898d0
commit 35628cc
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/cmd/geth/config.go b/cmd/geth/config.go
@@ -207,7 +207,7 @@ func readQLightServerTLSConfig(ctx *cli.Context) *tls.Config {
 	tlsConfig, err := qlight.ConfigureQLightTLSConfig(&qlight.TLSConfig{
 		CertFileName:         ctx.GlobalString(utils.QuorumLightTLSCertFlag.Name),
 		KeyFileName:          ctx.GlobalString(utils.QuorumLightTLSKeyFlag.Name),
-		ClientCACertFileName: ctx.GlobalString(utils.QuorumLightTLSClientCAFlag.Name),
+		ClientCACertFileName: ctx.GlobalString(utils.QuorumLightTLSCACertsFlag.Name),
 		ClientAuth:           ctx.GlobalInt(utils.QuorumLightTLSClientAuthFlag.Name),
 		CipherSuites:         ctx.GlobalString(utils.QuorumLightTLSCipherSuitesFlag.Name),
 	})

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -209,7 +209,6 @@ var (
 		utils.QuorumLightTLSFlag,
 		utils.QuorumLightTLSCertFlag,
 		utils.QuorumLightTLSKeyFlag,
-		utils.QuorumLightTLSClientCAFlag,
 		utils.QuorumLightTLSCACertsFlag,
 		utils.QuorumLightTLSClientAuthFlag,
 		utils.QuorumLightTLSCipherSuitesFlag,

diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
@@ -279,7 +279,6 @@ var AppHelpFlagGroups = []flags.FlagGroup{
 			utils.QuorumLightTLSFlag,
 			utils.QuorumLightTLSCertFlag,
 			utils.QuorumLightTLSKeyFlag,
-			utils.QuorumLightTLSClientCAFlag,
 			utils.QuorumLightTLSCACertsFlag,
 			utils.QuorumLightTLSClientAuthFlag,
 			utils.QuorumLightTLSCipherSuitesFlag,

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -1031,13 +1031,9 @@ var (
 		Name:  "qlight.tls.key",
 		Usage: "The key file to use for the qlight P2P connection",
 	}
-	QuorumLightTLSClientCAFlag = cli.StringFlag{
-		Name:  "qlight.tls.clientcacerts",
-		Usage: "The certificate authorities file to use for validating client qlight P2P connections (server configuration parameter)",
-	}
 	QuorumLightTLSCACertsFlag = cli.StringFlag{
 		Name:  "qlight.tls.cacerts",
-		Usage: "The certificate authorities file to use for validating qlight P2P connection (client configuration parameter)",
+		Usage: "The certificate authorities file to use for validating P2P connection",
 	}
 	QuorumLightTLSClientAuthFlag = cli.IntFlag{
 		Name:  "qlight.tls.clientauth",