Skip to content

Commit

Permalink
Merge branch 'main' into etcd
Browse files Browse the repository at this point in the history
  • Loading branch information
davies committed Apr 2, 2022
2 parents 7a7ee62 + f55ba44 commit 6e828fa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/object/encrypt.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func ParseRsaPrivateKeyFromPem(privPEM string, passphrase string) (*rsa.PrivateK
if strings.Contains(block.Headers["Proc-Type"], "ENCRYPTED") &&
x509.IsEncryptedPEMBlock(block) {
if passphrase == "" {
return nil, fmt.Errorf("passphrase is required to private key")
return nil, fmt.Errorf("passphrase is required to private key, please try again after setting the 'JFS_RSA_PASSPHRASE' environment variable")
}
var err error
// nolint:staticcheck
Expand Down

0 comments on commit 6e828fa

Please sign in to comment.