Skip to content
This repository has been archived by the owner on Aug 19, 2022. It is now read-only.

Commit

Permalink
Merge pull request #54 from libp2p/go1.14
Browse files Browse the repository at this point in the history
update to Go 1.14
  • Loading branch information
Stebalien committed Mar 13, 2020
2 parents 9542de3 + dd8e940 commit 6d5ce18
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- "1.13.x"
- "1.14.x"

# first part of the GOARCH workaround
# setting the GOARCH directly doesn't work, since the value will be overwritten later
Expand All @@ -14,7 +14,6 @@ env:
# now actually set the GOARCH env variable to the value of the temporary variable set earlier
before_install:
- |
export GO111MODULE=on;
go get golang.org/x/tools/cmd/cover;
go get github.com/onsi/ginkgo/ginkgo;
go get github.com/onsi/gomega;
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/libp2p/go-libp2p-tls

go 1.12
go 1.14

require (
github.com/libp2p/go-libp2p-core v0.3.0
Expand Down
11 changes: 7 additions & 4 deletions transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,12 @@ var _ = Describe("Transport", func() {

transforms := []transform{
{
name: "private key used in the TLS handshake doesn't match the public key in the cert",
apply: invalidateCertChain,
remoteErr: Equal("tls: invalid certificate signature"),
name: "private key used in the TLS handshake doesn't match the public key in the cert",
apply: invalidateCertChain,
remoteErr: Or(
Equal("tls: invalid signature by the client certificate: ECDSA verification failure"),
Equal("tls: invalid signature by the server certificate: ECDSA verification failure"),
),
},
{
name: "certificate chain contains 2 certs",
Expand All @@ -339,7 +342,7 @@ var _ = Describe("Transport", func() {
{
name: "cert is expired",
apply: expiredCert,
remoteErr: Equal("certificate verification failed: x509: certificate has expired or is not yet valid"),
remoteErr: ContainSubstring("certificate has expired or is not yet valid"),
},
{
name: "cert doesn't have the key extension",
Expand Down

0 comments on commit 6d5ce18

Please sign in to comment.