Browse Source

Use fork (pinned version) of x/crypto

Rod Hynes 9 years ago
parent
commit
7ae56bad0a
3 changed files with 3 additions and 3 deletions
  1. 1 1
      psiphon/meekConn.go
  2. 1 1
      psiphon/server/config.go
  3. 1 1
      psiphon/server/meek.go

+ 1 - 1
psiphon/meekConn.go

@@ -34,10 +34,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/Psiphon-Inc/crypto/nacl/box"
 	"github.com/Psiphon-Inc/goarista/monotime"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/upstreamproxy"
-	"golang.org/x/crypto/nacl/box"
 )
 
 // MeekConn is based on meek-client.go from Tor and Psiphon:

+ 1 - 1
psiphon/server/config.go

@@ -32,10 +32,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/Psiphon-Inc/crypto/nacl/box"
 	"github.com/Psiphon-Inc/crypto/ssh"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common"
-	"golang.org/x/crypto/nacl/box"
 )
 
 const (

+ 1 - 1
psiphon/server/meek.go

@@ -33,10 +33,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/Psiphon-Inc/crypto/nacl/box"
 	"github.com/Psiphon-Inc/goarista/monotime"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common"
-	"golang.org/x/crypto/nacl/box"
 )
 
 // MeekServer is based on meek-server.go from Tor and Psiphon: