Merge pull request jackc#2509 from m-ocean-it/return-correct-err-for-decryptpemblock

jackc · web-flow · commit 77fcc7ed3d5c · 2026-02-21T11:58:13.000-06:00
fix returning wrong error in configTLS when DecryptPEMBlock fails
diff --git a/pgconn/config.go b/pgconn/config.go
@@ -844,7 +844,7 @@ func configTLS(settings map[string]string, thisHost string, parseConfigOptions P
 			decryptedKey, decryptedError = x509.DecryptPEMBlock(block, []byte(sslpassword))
 			// Should we also provide warning for PKCS#1 needed?
 			if decryptedError != nil {
-				return nil, fmt.Errorf("unable to decrypt key: %w", err)
+				return nil, fmt.Errorf("unable to decrypt key: %w", decryptedError)
 			}
 
 			pemBytes := pem.Block{

Original file line number	Diff line number	Diff line change
`@@ -844,7 +844,7 @@ func configTLS(settings map[string]string, thisHost string, parseConfigOptions P`
`844`	`844`	`decryptedKey, decryptedError = x509.DecryptPEMBlock(block, []byte(sslpassword))`
`845`	`845`	`// Should we also provide warning for PKCS#1 needed?`
`846`	`846`	`if decryptedError != nil {`
`847`		`- return nil, fmt.Errorf("unable to decrypt key: %w", err)`
	`847`	`+ return nil, fmt.Errorf("unable to decrypt key: %w", decryptedError)`
`848`	`848`	`}`
`849`	`849`
`850`	`850`	`pemBytes := pem.Block{`