From: Lasse Folger Date: Tue, 5 Apr 2022 07:19:57 +0000 (+0200) Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto X-Git-Tag: go1.19beta1~484^2~18 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4739b353bb878f29ee78e1cd7eaf3d8f32199798;p=gostls13.git [dev.boringcrypto] all: merge master into dev.boringcrypto Change-Id: Iaf618444dd2d99721c19708df9ce2c1f35854efd --- 4739b353bb878f29ee78e1cd7eaf3d8f32199798 diff --cc api/next/46057.txt index 0000000000,0000000000..d971aa7ffd new file mode 100644 --- /dev/null +++ b/api/next/46057.txt @@@ -1,0 -1,0 +1,1 @@@ ++pkg crypto/x509, method (*CertPool) Equal(*CertPool) bool #46057 diff --cc src/go/build/deps_test.go index ade6519b8d,052e7ad9c0..f318f6e432 --- a/src/go/build/deps_test.go +++ b/src/go/build/deps_test.go @@@ -412,13 -408,18 +411,13 @@@ var depsRules = < crypto/ed25519/internal/edwards25519/field, golang.org/x/crypto/curve25519/internal/field < crypto/ed25519/internal/edwards25519 < crypto/cipher + < encoding/asn1 + < crypto/internal/boring < crypto/aes, crypto/des, crypto/hmac, crypto/md5, crypto/rc4, crypto/sha1, crypto/sha256, crypto/sha512 - < crypto/rand - < CRYPTO; - - CGO, fmt, net !< CRYPTO; - - # CRYPTO-MATH is core bignum-based crypto - no cgo, net; fmt now ok. - CRYPTO, FMT, math/big, embed < crypto/internal/randutil + < crypto/rand < crypto/ed25519 - < encoding/asn1 < golang.org/x/crypto/cryptobyte/asn1 < golang.org/x/crypto/cryptobyte < golang.org/x/crypto/curve25519