github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-27 10:39:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #784 from mtrmac/crypto-errors

Browse Source 
Add context to --encryption-key / --decryption-key processing failures
This commit is contained in:
Daniel J Walsh 2019-12-11 10:43:50 -05:00 committed by GitHub
commit e955849f0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/skopeo/copy.go
View File

@ -186,7 +186,7 @@ func (opts *copyOptions) run(args []string, stdout io.Writer) error {
encryptionKeys := opts.encryptionKeys.Value()
ecc, err := enchelpers.CreateCryptoConfig(encryptionKeys, []string{})
if err != nil {
return err
return fmt.Errorf("Invalid encryption keys: %v", err)
}
cc := encconfig.CombineCryptoConfigs([]encconfig.CryptoConfig{ecc})
encConfig = cc.EncryptConfig
@ -197,7 +197,7 @@ func (opts *copyOptions) run(args []string, stdout io.Writer) error {
decryptionKeys := opts.decryptionKeys.Value()
dcc, err := enchelpers.CreateCryptoConfig([]string{}, decryptionKeys)
if err != nil {
return err
return fmt.Errorf("Invalid decryption keys: %v", err)
}
cc := encconfig.CombineCryptoConfigs([]encconfig.CryptoConfig{dcc})
decConfig = cc.DecryptConfig