opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-30 11:52:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump github.com/containers/ocicrypt from 1.1.0 to 1.1.1

Browse Source 
Bumps [github.com/containers/ocicrypt](https://github.com/containers/ocicrypt) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/containers/ocicrypt/releases)
- [Commits](https://github.com/containers/ocicrypt/compare/v1.1.0...v1.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot]
2021-04-13 08:01:58 +00:00
committed by GitHub
parent 6933d4611a
commit 24d2df7307
26 changed files with 72 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/github.com/containers/ocicrypt/utils/utils.go generated vendored
View File

@ -95,11 +95,11 @@ func ParsePrivateKey(privKey, privKeyPassword []byte, prefix string) (interface{
block, _ := pem.Decode(privKey)
if block != nil {
var der []byte
if x509.IsEncryptedPEMBlock(block) {
if x509.IsEncryptedPEMBlock(block) { //nolint:staticcheck // ignore SA1019, which is kept for backward compatibility
if privKeyPassword == nil {
return nil, errors.Errorf("%s: Missing password for encrypted private key", prefix)
}
der, err = x509.DecryptPEMBlock(block, privKeyPassword)
der, err = x509.DecryptPEMBlock(block, privKeyPassword) //nolint:staticcheck // ignore SA1019, which is kept for backward compatibility
if err != nil {
return nil, errors.Errorf("%s: Wrong password: could not decrypt private key", prefix)
}