tris: remove github.com/cloudflare/go #61
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FiloSottile
added a commit
to FiloSottile/go-libp2p-conn
that referenced
this pull request
Dec 21, 2017
Packages MUST be vendored together so that they all share the same golang_org/x/crypto/ed25519 types, and so that they replace the stdlib ones. cgo is disabled to avoid symbols clashing at link stage. crypto/internal/cipherhw golang_org/x/crypto/... crypto/x509 Go 9c64c65d0e + crypto/x509: add support for Ed25519 certificates golang/go@master...FiloSottile:filippo/ed25519 + disabled cgo (see below) crypto/tls tls-tris 8db4726 + Ed25519 certificates cloudflare/tls-tris#62 + tris: remove github.com/cloudflare/go cloudflare/tls-tris#61 --- diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go index 80cd2501c4..8aae8da491 100644 --- a/src/crypto/x509/root_cgo_darwin.go +++ b/src/crypto/x509/root_cgo_darwin.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build cgo,!arm,!arm64,!ios +// +build ignore package x509 diff --git a/src/crypto/x509/root_nocgo_darwin.go b/src/crypto/x509/root_nocgo_darwin.go index 2ac4666aff..7cf95b5844 100644 --- a/src/crypto/x509/root_nocgo_darwin.go +++ b/src/crypto/x509/root_nocgo_darwin.go @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build !cgo - package x509 func loadSystemRoots() (*CertPool, error) {
FiloSottile
added a commit
to FiloSottile/go-libp2p-conn
that referenced
this pull request
Dec 21, 2017
Packages MUST be vendored together so that they all share the same golang_org/x/crypto/ed25519 types, and so that they replace the stdlib ones. cgo is disabled to avoid symbols clashing at link stage. crypto/internal/cipherhw golang_org/x/crypto/... crypto/x509 Go 9c64c65d0e + crypto/x509: add support for Ed25519 certificates golang/go@master...FiloSottile:filippo/ed25519 + disabled cgo (see below) crypto/tls tls-tris 8db4726 + Ed25519 certificates cloudflare/tls-tris#62 + tris: remove github.com/cloudflare/go cloudflare/tls-tris#61 --- diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go index 80cd2501c4..8aae8da491 100644 --- a/src/crypto/x509/root_cgo_darwin.go +++ b/src/crypto/x509/root_cgo_darwin.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build cgo,!arm,!arm64,!ios +// +build ignore package x509 diff --git a/src/crypto/x509/root_nocgo_darwin.go b/src/crypto/x509/root_nocgo_darwin.go index 2ac4666aff..7cf95b5844 100644 --- a/src/crypto/x509/root_nocgo_darwin.go +++ b/src/crypto/x509/root_nocgo_darwin.go @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build !cgo - package x509 func loadSystemRoots() (*CertPool, error) {
FiloSottile
force-pushed
the
filippo/nofork
branch
from
c0bbca0
to
9b55743
Compare
Over time the amount of custom Go patches reduced, and tris got less tangled to the underlying Go. Finally sever the link. This allows more flexibility in what base Go is used (the system one), doesn't require coordinating two repositories, and simplifies the black magic considerably. Make sure to use tris with Go 1.9.X.
FiloSottile
force-pushed
the
filippo/nofork
branch
from
9b55743
to
2868d7e
Compare
FiloSottile
force-pushed
the
filippo/nofork
branch
from
2868d7e
to
05688e5
Compare
|
CI now passing, bump. |
Lekensteyn
approved these changes
Feb 9, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Over time the amount of custom Go patches reduced, and tris got less
tangled to the underlying Go. Finally sever the link.
This allows more flexibility in what base Go is used (the system one),
doesn't require coordinating two repositories, and simplifies the black
magic considerably.
Make sure to use tris with Go 1.9 or higher.