From 2b667f2952af6bd4f39981dfba7d30d3e729d592 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo@cloudflare.com>
Date: Wed, 30 Nov 2016 01:00:17 +0000
Subject: [PATCH] tris: fix mint interop

---
 .travis.yml              | 1 -
 _dev/mint/Dockerfile     | 4 ++--
 _dev/mint/mint-client.go | 6 +++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4745598..63a76ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/_dev/mint/Dockerfile b/_dev/mint/Dockerfile
index 5e769f2..03004dd 100644
--- a/_dev/mint/Dockerfile
+++ b/_dev/mint/Dockerfile
@@ -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
diff --git a/_dev/mint/mint-client.go b/_dev/mint/mint-client.go
index b86475a..3a59bde 100644
--- a/_dev/mint/mint-client.go
+++ b/_dev/mint/mint-client.go
@@ -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,
 	}