Use x/crypto/poly1305 and x/crypto/salsa20/salsa

psiphon/common/crypto/nacl/secretbox/secretbox.go

@@ -36,8 +36,8 @@ package secretbox // import "github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon
 
 import (
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/crypto/internal/subtle"
-	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/crypto/poly1305"
-	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/crypto/salsa20/salsa"
+	"golang.org/x/crypto/poly1305"
+	"golang.org/x/crypto/salsa20/salsa"
 )
 
 // Overhead is the number of bytes of overhead when boxing a message.

psiphon/common/crypto/nacl/secretbox/secretbox_reader.go

@@ -29,8 +29,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/crypto/poly1305"
-	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/crypto/salsa20/salsa"
+	"golang.org/x/crypto/poly1305"
+	"golang.org/x/crypto/salsa20/salsa"
 )
 
 // NewOpenReadSeeker is a streaming variant of Open.