]> Cypherpunks repositories - gostls13.git/commit
[dev.boringcrypto] crypto: move crypto/internal/boring imports to reduce merge conflicts
authorFilippo Valsorda <filippo@golang.org>
Fri, 7 Jun 2019 17:48:42 +0000 (13:48 -0400)
committerFilippo Valsorda <filippo@golang.org>
Sun, 9 Jun 2019 19:24:48 +0000 (19:24 +0000)
commit9bf9e7d4b279470c411562ef6ad015629dce6303
treea96aab07bdd6dd8178c25958dd1b032c27303e83
parent324f8365be3aa144879e6b1abb4e13c51b5f4750
[dev.boringcrypto] crypto: move crypto/internal/boring imports to reduce merge conflicts

As suggested by dmitshur@, move them to their own block so they don't
conflict with changes in the upstream imports.

Change-Id: Id46fb7c766066c406023b0355f4c3c860166f0fe
Reviewed-on: https://go-review.googlesource.com/c/go/+/181277
Run-TryBot: Filippo Valsorda <filippo@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
16 files changed:
src/crypto/aes/cipher.go
src/crypto/aes/cipher_asm.go
src/crypto/ecdsa/ecdsa.go
src/crypto/hmac/hmac.go
src/crypto/rand/rand_unix.go
src/crypto/rsa/pkcs1v15.go
src/crypto/rsa/pss.go
src/crypto/rsa/rsa.go
src/crypto/rsa/rsa_test.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/cipher_suites.go
src/crypto/tls/common.go