diff options
| author | Corey Hulen <corey@hulen.com> | 2017-03-24 23:31:34 -0700 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2017-03-25 03:31:34 -0300 |
| commit | 54d3d47daf9190275bbdaf8703b84969a4593451 (patch) | |
| tree | 05899b296d0186c1a0da8a540bc486e34ad8eec9 /vendor/golang.org/x/crypto | |
| parent | 7460302dec7796e01c98264e84bece8169cb6ed9 (diff) | |
| download | chat-54d3d47daf9190275bbdaf8703b84969a4593451.tar.gz chat-54d3d47daf9190275bbdaf8703b84969a4593451.tar.bz2 chat-54d3d47daf9190275bbdaf8703b84969a4593451.zip | |
PLT-6076 Adding viper libs for config file changes (#5871)
* Adding viper libs for config file changes
* Removing the old fsnotify lib
* updating some missing libs
Diffstat (limited to 'vendor/golang.org/x/crypto')
| -rw-r--r-- | vendor/golang.org/x/crypto/pkcs12/pkcs12.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vendor/golang.org/x/crypto/pkcs12/pkcs12.go b/vendor/golang.org/x/crypto/pkcs12/pkcs12.go index ad6341e60..eff9ad3a9 100644 --- a/vendor/golang.org/x/crypto/pkcs12/pkcs12.go +++ b/vendor/golang.org/x/crypto/pkcs12/pkcs12.go @@ -109,6 +109,10 @@ func ToPEM(pfxData []byte, password string) ([]*pem.Block, error) { bags, encodedPassword, err := getSafeContents(pfxData, encodedPassword) + if err != nil { + return nil, err + } + blocks := make([]*pem.Block, 0, len(bags)) for _, bag := range bags { block, err := convertBag(&bag, encodedPassword) |