Browse Source

tris: fix mint interop

tls13
Filippo Valsorda 8 years ago
committed by Peter Wu
parent
commit
2b667f2952
3 changed files with 7 additions and 4 deletions
  1. +0
    -1
      .travis.yml
  2. +2
    -2
      _dev/mint/Dockerfile
  3. +5
    -1
      _dev/mint/mint-client.go

+ 0
- 1
.travis.yml View File

@@ -24,7 +24,6 @@ matrix:
- env: MODE=interop CLIENT=boring REVISION=origin/master
- env: MODE=interop CLIENT=tstclnt ZRTT=1 # tstclnt races and doesn't resend
- env: MODE=interop CLIENT=tstclnt REVISION=default ZRTT=1
- env: MODE=interop CLIENT=mint # broken resumption client

install:
- if [ "$MODE" = "interop" ]; then ./_dev/tris-localserver/start.sh -d && docker ps -a; fi


+ 2
- 2
_dev/mint/Dockerfile View File

@@ -7,9 +7,9 @@ RUN apk add --update \
RUN go get github.com/bifurcation/mint

# Draft 18
ARG REVISION=271abd1
ARG REVISION=52f9f98

RUN cd /go/src/github.com/bifurcation/mint && git fetch
RUN cd /go/src/github.com/bifurcation/mint && git fetch https://github.com/FiloSottile/mint
RUN cd /go/src/github.com/bifurcation/mint && git checkout $REVISION

ADD mint-client.go /mint-client.go


+ 5
- 1
_dev/mint/mint-client.go View File

@@ -10,9 +10,13 @@ import (
)

func main() {
c := &mint.Config{
PSKs: &mint.PSKMapCache{},
}

tr := &http.Transport{
DialTLS: func(network, addr string) (net.Conn, error) {
return mint.Dial(network, addr, nil)
return mint.Dial(network, addr, c)
},
DisableKeepAlives: true,
}


Loading…
Cancel
Save