Merge pull request #3213 from thaJeztah/fix_linting

silvin-lubecki · web-flow · commit fb78bd4be359 · 2021-07-28T13:55:48.000+02:00
cli/context: ignore linting warnings about RFC 1423 encryption
diff --git a/cli/context/docker/load.go b/cli/context/docker/load.go
@@ -66,8 +66,9 @@ func (c *Endpoint) tlsConfig() (*tls.Config, error) {
 		}
 
 		var err error
-		if x509.IsEncryptedPEMBlock(pemBlock) {
-			keyBytes, err = x509.DecryptPEMBlock(pemBlock, []byte(c.TLSPassword))
+		// TODO should we follow Golang, and deprecate RFC 1423 encryption, and produce a warning (or just error)? see https://github.com/docker/cli/issues/3212
+		if x509.IsEncryptedPEMBlock(pemBlock) { //nolint: staticcheck // SA1019: x509.IsEncryptedPEMBlock is deprecated, and insecure by design
+			keyBytes, err = x509.DecryptPEMBlock(pemBlock, []byte(c.TLSPassword)) //nolint: staticcheck // SA1019: x509.IsEncryptedPEMBlock is deprecated, and insecure by design
 			if err != nil {
 				return nil, errors.Wrap(err, "private key is encrypted, but could not decrypt it")
 			}

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,9 @@ func (c Endpoint) tlsConfig() (tls.Config, error) {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`var err error`
`69`		`- if x509.IsEncryptedPEMBlock(pemBlock) {`
`70`		`- keyBytes, err = x509.DecryptPEMBlock(pemBlock, []byte(c.TLSPassword))`
	`69`	`+ // TODO should we follow Golang, and deprecate RFC 1423 encryption, and produce a warning (or just error)? see https://github.com/docker/cli/issues/3212`
	`70`	`+ if x509.IsEncryptedPEMBlock(pemBlock) { //nolint: staticcheck // SA1019: x509.IsEncryptedPEMBlock is deprecated, and insecure by design`
	`71`	`+ keyBytes, err = x509.DecryptPEMBlock(pemBlock, []byte(c.TLSPassword)) //nolint: staticcheck // SA1019: x509.IsEncryptedPEMBlock is deprecated, and insecure by design`
`71`	`72`	`if err != nil {`
`72`	`73`	`return nil, errors.Wrap(err, "private key is encrypted, but could not decrypt it")`
`73`	`74`	`}`