deps: update golang.org/x/crypto 4def268fd1a4->e1110fd1c708 (#4624)

Unit tests are confirmed to pass:
```
~/go/src/golang.org/x/crypto$ git log --pretty=format:'%h' -n 1
e1110fd

~/go/src/golang.org/x/crypto$ go test ./...
ok      golang.org/x/crypto/acme        6.879s
ok      golang.org/x/crypto/acme/autocert       1.213s
?       golang.org/x/crypto/acme/autocert/internal/acmetest     [no test files]
?       golang.org/x/crypto/acme/internal/acmeprobe     [no test files]
ok      golang.org/x/crypto/argon2      0.084s
ok      golang.org/x/crypto/bcrypt      2.224s
ok      golang.org/x/crypto/blake2b     0.049s
ok      golang.org/x/crypto/blake2s     0.034s
ok      golang.org/x/crypto/blowfish    0.005s
ok      golang.org/x/crypto/bn256       0.311s
ok      golang.org/x/crypto/cast5       2.527s
ok      golang.org/x/crypto/chacha20    0.013s
ok      golang.org/x/crypto/chacha20poly1305    0.423s
ok      golang.org/x/crypto/cryptobyte  0.002s
?       golang.org/x/crypto/cryptobyte/asn1     [no test files]
ok      golang.org/x/crypto/curve25519  0.017s
ok      golang.org/x/crypto/ed25519     0.047s
?       golang.org/x/crypto/ed25519/internal/edwards25519       [no test files]
ok      golang.org/x/crypto/hkdf        0.009s
ok      golang.org/x/crypto/internal/subtle     0.011s
ok      golang.org/x/crypto/md4 0.001s
ok      golang.org/x/crypto/nacl/auth   4.920s
ok      golang.org/x/crypto/nacl/box    0.019s
ok      golang.org/x/crypto/nacl/secretbox      0.002s
ok      golang.org/x/crypto/nacl/sign   0.002s
ok      golang.org/x/crypto/ocsp        0.020s
ok      golang.org/x/crypto/openpgp     3.302s
ok      golang.org/x/crypto/openpgp/armor       0.001s
ok      golang.org/x/crypto/openpgp/clearsign   13.182s
ok      golang.org/x/crypto/openpgp/elgamal     0.008s
?       golang.org/x/crypto/openpgp/errors      [no test files]
ok      golang.org/x/crypto/openpgp/packet      0.115s
ok      golang.org/x/crypto/openpgp/s2k 5.114s
ok      golang.org/x/crypto/otr 0.163s
ok      golang.org/x/crypto/pbkdf2      0.025s
ok      golang.org/x/crypto/pkcs12      0.036s
ok      golang.org/x/crypto/pkcs12/internal/rc2 0.001s
ok      golang.org/x/crypto/poly1305    0.025s
ok      golang.org/x/crypto/ripemd160   0.018s
ok      golang.org/x/crypto/salsa20     0.029s
ok      golang.org/x/crypto/salsa20/salsa       0.009s
ok      golang.org/x/crypto/scrypt      0.384s
ok      golang.org/x/crypto/sha3        0.121s
ok      golang.org/x/crypto/ssh 2.779s
ok      golang.org/x/crypto/ssh/agent   0.460s
ok      golang.org/x/crypto/ssh/knownhosts      0.018s
ok      golang.org/x/crypto/ssh/terminal        0.006s
ok      golang.org/x/crypto/ssh/test    2.059s
ok      golang.org/x/crypto/tea 0.003s
ok      golang.org/x/crypto/twofish     0.013s
ok      golang.org/x/crypto/xtea        0.009s
ok      golang.org/x/crypto/xts 0.001s
```
This commit is contained in:
Daniel McCarney 2020-01-03 14:25:16 -05:00 committed by GitHub
parent 1bf07bc2ab
commit 76c4125e06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 2 deletions

2
go.mod
View File

@ -31,7 +31,7 @@ require (
github.com/weppos/publicsuffix-go v0.10.1-0.20191207085315-342bab737784
github.com/zmap/zcrypto v0.0.0-20191112190257-7f2fe6faf8cf
github.com/zmap/zlint v1.1.0
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708
golang.org/x/net v0.0.0-20191112182307-2180aed22343
golang.org/x/text v0.3.2
google.golang.org/genproto v0.0.0-20190415143225-d1146b9035b9 // indirect

2
go.sum
View File

@ -201,6 +201,8 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708 h1:pXVtWnwHkrWD9ru3sDxY/qFK/bfc0egRovX91EjWjf4=
golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=

View File

@ -252,6 +252,7 @@ func Decode(pfxData []byte, password string) (privateKey interface{}, certificat
case bag.Id.Equal(oidPKCS8ShroundedKeyBag):
if privateKey != nil {
err = errors.New("pkcs12: expected exactly one key bag")
return nil, nil, err
}
if privateKey, err = decodePkcs8ShroudedKeyBag(bag.Value.Bytes, encodedPassword); err != nil {

2
vendor/modules.txt vendored
View File

@ -103,7 +103,7 @@ github.com/zmap/zcrypto/x509/pkix
github.com/zmap/zlint
github.com/zmap/zlint/lints
github.com/zmap/zlint/util
# golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
# golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708
golang.org/x/crypto/cryptobyte
golang.org/x/crypto/cryptobyte/asn1
golang.org/x/crypto/ed25519