]> Cypherpunks.ru repositories - gostls13.git/commit
[dev.boringcrypto] all: merge master (nearly Go 1.10 beta 1) into dev.boringcrypto
authorRuss Cox <rsc@golang.org>
Wed, 6 Dec 2017 05:35:28 +0000 (00:35 -0500)
committerRuss Cox <rsc@golang.org>
Wed, 6 Dec 2017 06:03:36 +0000 (01:03 -0500)
commit185e6094fd968b35b80e56aad1286c66bb2cc261
tree411babe570d6faa1e99251a9167123afd07407d2
parentc36033a379a4907fb75309416ffcf2904e613ab9
parenta032f74bf0b40a94669159e7d7e96722eb76199b
[dev.boringcrypto] all: merge master (nearly Go 1.10 beta 1) into dev.boringcrypto

This is a git merge of master into dev.boringcrypto.

The branch was previously based on release-branch.go1.9,
so there are a handful of spurious conflicts that would
also arise if trying to merge master into release-branch.go1.9
(which we never do). Those have all been resolved by taking
the original file from master, discarding any Go 1.9-specific
edits.

all.bash passes on darwin/amd64, which is to say without
actually using BoringCrypto.

Go 1.10-related fixes to BoringCrypto itself will be in a followup CL.
This CL is just the merge.

Change-Id: I4c97711fec0fb86761913dcde28d25c001246c35
27 files changed:
src/cmd/compile/internal/gc/reflect.go
src/cmd/go/go_test.go
src/cmd/go/internal/load/pkg.go
src/cmd/link/internal/ld/lib.go
src/crypto/ecdsa/ecdsa.go
src/crypto/hmac/hmac.go
src/crypto/issue21104_test.go
src/crypto/rsa/pss.go
src/crypto/rsa/rsa.go
src/crypto/sha1/sha1.go
src/crypto/sha1/sha1_test.go
src/crypto/sha256/sha256.go
src/crypto/sha256/sha256_test.go
src/crypto/sha512/sha512.go
src/crypto/sha512/sha512_test.go
src/crypto/tls/boring.go
src/crypto/tls/boring_test.go
src/crypto/tls/common.go
src/crypto/tls/handshake_client.go
src/crypto/tls/handshake_messages_test.go
src/crypto/tls/handshake_server.go
src/crypto/tls/key_agreement.go
src/crypto/tls/prf.go
src/crypto/x509/verify.go
src/go/build/deps_test.go
src/runtime/race/testdata/mop_test.go
src/runtime/runtime_boring.go