diff options
| author | Bryan C. Mills <bcmills@google.com> | 2019-03-01 10:12:30 -0500 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2019-03-11 20:28:54 +0000 |
| commit | c5cf6624076a644906aa7ec5c91c4e01ccd375d3 (patch) | |
| tree | 9953a8fe6691afac06d4087f6badebf52fbc8fd9 /src/crypto | |
| parent | 0fc89a72edc2c73651f7f6841b1146af723f517f (diff) | |
| download | go-c5cf6624076a644906aa7ec5c91c4e01ccd375d3.tar.xz | |
all: move internal/x to vendor/golang.org/x and revendor using 'go mod vendor'
This also updates the vendored-in versions of several packages: 'go
mod vendor' selects a consistent version of each module, but we had
previously vendored an ad-hoc selection of packages.
Notably, x/crypto/hkdf was previously vendored in at a much newer
commit than the rest of x/crypto. Bringing the rest of x/crypto up to
that commit introduced an import of golang.org/x/sys/cpu, which broke
the js/wasm build, requiring an upgrade of x/sys to pick up CL 165749.
Updates #30228
Updates #30241
Updates #25822
Change-Id: I5b3dbc232b7e6a048a158cbd8d36137af1efb711
Reviewed-on: https://go-review.googlesource.com/c/go/+/164623
Reviewed-by: Filippo Valsorda <filippo@golang.org>
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/tls/cipher_suites.go | 2 | ||||
| -rw-r--r-- | src/crypto/tls/handshake_messages.go | 2 | ||||
| -rw-r--r-- | src/crypto/tls/key_schedule.go | 6 | ||||
| -rw-r--r-- | src/crypto/tls/ticket.go | 2 | ||||
| -rw-r--r-- | src/crypto/x509/x509.go | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/crypto/tls/cipher_suites.go b/src/crypto/tls/cipher_suites.go index ecb4db290a..7431ac0435 100644 --- a/src/crypto/tls/cipher_suites.go +++ b/src/crypto/tls/cipher_suites.go @@ -14,8 +14,8 @@ import ( "crypto/sha1" "crypto/sha256" "crypto/x509" + "golang.org/x/crypto/chacha20poly1305" "hash" - "internal/x/crypto/chacha20poly1305" ) // a keyAgreement implements the client and server side of a TLS key agreement diff --git a/src/crypto/tls/handshake_messages.go b/src/crypto/tls/handshake_messages.go index c0e049b16f..864fbd4757 100644 --- a/src/crypto/tls/handshake_messages.go +++ b/src/crypto/tls/handshake_messages.go @@ -6,7 +6,7 @@ package tls import ( "fmt" - "internal/x/crypto/cryptobyte" + "golang.org/x/crypto/cryptobyte" "strings" ) diff --git a/src/crypto/tls/key_schedule.go b/src/crypto/tls/key_schedule.go index 2cfc226d7f..3cd6e8297a 100644 --- a/src/crypto/tls/key_schedule.go +++ b/src/crypto/tls/key_schedule.go @@ -8,10 +8,10 @@ import ( "crypto/elliptic" "crypto/hmac" "errors" + "golang.org/x/crypto/cryptobyte" + "golang.org/x/crypto/curve25519" + "golang.org/x/crypto/hkdf" "hash" - "internal/x/crypto/cryptobyte" - "internal/x/crypto/curve25519" - "internal/x/crypto/hkdf" "io" "math/big" ) diff --git a/src/crypto/tls/ticket.go b/src/crypto/tls/ticket.go index 9560176259..c873e43a70 100644 --- a/src/crypto/tls/ticket.go +++ b/src/crypto/tls/ticket.go @@ -12,7 +12,7 @@ import ( "crypto/sha256" "crypto/subtle" "errors" - "internal/x/crypto/cryptobyte" + "golang.org/x/crypto/cryptobyte" "io" ) diff --git a/src/crypto/x509/x509.go b/src/crypto/x509/x509.go index 80e4dec0f3..0d68d82993 100644 --- a/src/crypto/x509/x509.go +++ b/src/crypto/x509/x509.go @@ -24,8 +24,8 @@ import ( "encoding/pem" "errors" "fmt" - "internal/x/crypto/cryptobyte" - cryptobyte_asn1 "internal/x/crypto/cryptobyte/asn1" + "golang.org/x/crypto/cryptobyte" + cryptobyte_asn1 "golang.org/x/crypto/cryptobyte/asn1" "io" "math/big" "net" |