openprivacy
/
bine
3
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Replace all Paths

This commit is contained in:
Sarah Jamie Lewis 2020-10-15 14:38:02 -07:00
parent 58e2c82c9c
commit 4bf58a3c21
32 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -30,7 +30,7 @@ import (
"net/http"
"time"
"github.com/cretz/bine/tor"
"git.openprivacy.ca/openprivacy/bine/tor"
)
func main() {
@ -67,9 +67,9 @@ func main() {
```
If in `main.go` it can simply be run with `go run main.go`. Of course this uses a separate `tor` process. To embed Tor
statically in the binary, follow the [embedded package docs](https://godoc.org/github.com/cretz/bine/process/embedded)
statically in the binary, follow the [embedded package docs](https://godoc.org/git.openprivacy.ca/openprivacy/bine/process/embedded)
which will require [building Tor statically](https://github.com/cretz/tor-static). Then with
`github.com/cretz/bine/process/embedded` imported, change the start line above to:
`git.openprivacy.ca/openprivacy/bine/process/embedded` imported, change the start line above to:
```go
t, err := tor.Start(nil, &tor.StartConf{ProcessCreator: embedded.NewCreator()})

2
control/cmd_conf.go
View File

@ -3,7 +3,7 @@ package control
import (
"strings"
"github.com/cretz/bine/torutil"
"git.openprivacy.ca/openprivacy/bine/torutil"
)
// SetConf invokes SETCONF.

2
control/cmd_event.go
View File

@ -7,7 +7,7 @@ import (
"strings"
"time"
"github.com/cretz/bine/torutil"
"git.openprivacy.ca/openprivacy/bine/torutil"
)
// EventCode represents an asynchronous event code (ref control spec 4.1).

2
control/cmd_misc.go
View File

@ -3,7 +3,7 @@ package control
import (
"strings"
"github.com/cretz/bine/torutil"
"git.openprivacy.ca/openprivacy/bine/torutil"
)
// Signal invokes SIGNAL.

4
control/cmd_onion.go
View File

@ -8,8 +8,8 @@ import (
"strconv"
"strings"
"github.com/cretz/bine/torutil"
"github.com/cretz/bine/torutil/ed25519"
"git.openprivacy.ca/openprivacy/bine/torutil"
"git.openprivacy.ca/openprivacy/bine/torutil/ed25519"
)
// KeyType is a key type for Key in AddOnion.

2
control/cmd_protocolinfo.go
View File

@ -3,7 +3,7 @@ package control
import (
"strings"
"github.com/cretz/bine/torutil"
"git.openprivacy.ca/openprivacy/bine/torutil"
)
// ProtocolInfo is the protocol info result of Conn.ProtocolInfo.

4
examples/embeddedfileserver/main.go
View File

@ -10,8 +10,8 @@ import (
"path/filepath"
"time"
"github.com/cretz/bine/process/embedded"
"github.com/cretz/bine/tor"
"git.openprivacy.ca/openprivacy/bine/process/embedded"
"git.openprivacy.ca/openprivacy/bine/tor"
)
func main() {

2
examples/embeddedversion/main.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
"log"
"github.com/cretz/bine/process/embedded"
"git.openprivacy.ca/openprivacy/bine/process/embedded"
)
func main() {

4
examples/httpaltsvc/main.go
View File

@ -14,8 +14,8 @@ import (
"path/filepath"
"strings"
"github.com/cretz/bine/tor"
"github.com/cretz/bine/torutil"
"git.openprivacy.ca/openprivacy/bine/tor"
"git.openprivacy.ca/openprivacy/bine/torutil"
)
var verbose bool

2
examples/simpleclient/main.go
View File

@ -9,7 +9,7 @@ import (
"strings"
"time"
"github.com/cretz/bine/tor"
"git.openprivacy.ca/openprivacy/bine/tor"
"golang.org/x/net/html"
)

2
examples/simpleserver/main.go
View File

@ -7,7 +7,7 @@ import (
"net/http"
"time"
"github.com/cretz/bine/tor"
"git.openprivacy.ca/openprivacy/bine/tor"
)
func main() {

1
go.mod
View File

@ -3,7 +3,6 @@ module git.openprivacy.ca/openprivacy/bine
go 1.14
require (
github.com/cretz/bine v0.1.0
github.com/stretchr/testify v1.6.1
golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb

2
go.sum
View File

@ -1,5 +1,3 @@
github.com/cretz/bine v0.1.0 h1:1/fvhLE+fk0bPzjdO5Ci+0ComYxEMuB1JhM4X5skT3g=
github.com/cretz/bine v0.1.0/go.mod h1:6PF6fWAvYtwjRGkAuDEJeWNOv3a2hUouSP/yRYXmvHw=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

4
process/embedded/process.go
View File

@ -21,9 +21,9 @@
package embedded
import (
"github.com/cretz/bine/process"
"git.openprivacy.ca/openprivacy/bine/process"
tor035 "github.com/cretz/bine/process/embedded/tor-0.3.5"
tor035 "git.openprivacy.ca/openprivacy/bine/process/embedded/tor-0.3.5"
)
// NewCreator creates a process.Creator for statically-linked Tor embedded in

2
process/embedded/tor-0.3.3/embeddedtest/main.go
View File

@ -5,7 +5,7 @@ import (
"log"
"os"
tor033 "github.com/cretz/bine/process/embedded/tor-0.3.3"
tor033 "git.openprivacy.ca/openprivacy/bine/process/embedded/tor-0.3.3"
)
// Simply calls Tor will the same parameters

2
process/embedded/tor-0.3.3/process.go
View File

@ -8,7 +8,7 @@ import (
"fmt"
"net"
"github.com/cretz/bine/process"
"git.openprivacy.ca/openprivacy/bine/process"
)
/*

4
process/embedded/tor-0.3.5/embeddedtest/main.go
View File

@ -7,8 +7,8 @@ import (
"net/textproto"
"os"
"github.com/cretz/bine/control"
tor035 "github.com/cretz/bine/process/embedded/tor-0.3.5"
"git.openprivacy.ca/openprivacy/bine/control"
tor035 "git.openprivacy.ca/openprivacy/bine/process/embedded/tor-0.3.5"
)
// Simply calls Tor will the same parameters, unless "embedconn" is the arg

2
process/embedded/tor-0.3.5/process.go
View File

@ -9,7 +9,7 @@ import (
"net"
"os"
"github.com/cretz/bine/process"
"git.openprivacy.ca/openprivacy/bine/process"
)
/*

2
process/process.go
View File

@ -16,7 +16,7 @@ import (
"strconv"
"strings"
"github.com/cretz/bine/torutil"
"git.openprivacy.ca/openprivacy/bine/torutil"
)
// Process is the interface implemented by Tor processes.

2
tests/context_test.go
View File

@ -7,7 +7,7 @@ import (
"testing"
"time"
"github.com/cretz/bine/tor"
"git.openprivacy.ca/openprivacy/bine/tor"
"github.com/stretchr/testify/require"
)

2
tests/control_cmd_authenticate_test.go
View File

@ -3,7 +3,7 @@ package tests
import (
"testing"
"github.com/cretz/bine/tor"
"git.openprivacy.ca/openprivacy/bine/tor"
)
func TestAuthenticateNull(t *testing.T) {

2
tests/control_cmd_conf_test.go
View File

@ -4,7 +4,7 @@ import (
"io/ioutil"
"testing"
"github.com/cretz/bine/control"
"git.openprivacy.ca/openprivacy/bine/control"
)
func TestGetSetAndResetConf(t *testing.T) {

2
tests/control_cmd_hiddenservice_test.go
View File

@ -6,7 +6,7 @@ import (
"testing"
"time"
"github.com/cretz/bine/control"
"git.openprivacy.ca/openprivacy/bine/control"
)
func TestHSFetch(t *testing.T) {

2
tests/tor_dialer_test.go
View File

@ -8,7 +8,7 @@ import (
"testing"
"time"
"github.com/cretz/bine/tor"
"git.openprivacy.ca/openprivacy/bine/tor"
"golang.org/x/net/context/ctxhttp"
)

4
tests/tor_geoip_test.go
View File

@ -3,8 +3,8 @@ package tests
import (
"testing"
"github.com/cretz/bine/tor"
"github.com/cretz/bine/torutil/geoipembed"
"git.openprivacy.ca/openprivacy/bine/tor"
"git.openprivacy.ca/openprivacy/bine/torutil/geoipembed"
)
func TestEmbeddedGeoIPFile(t *testing.T) {

2
tests/tor_isolate_socks_auth_test.go
View File

@ -7,7 +7,7 @@ import (
"testing"
"time"
"github.com/cretz/bine/tor"
"git.openprivacy.ca/openprivacy/bine/tor"
"golang.org/x/net/proxy"
)

4
tests/tor_listen_test.go
View File

@ -6,8 +6,8 @@ import (
"testing"
"time"
"github.com/cretz/bine/tor"
"github.com/cretz/bine/torutil"
"git.openprivacy.ca/openprivacy/bine/tor"
"git.openprivacy.ca/openprivacy/bine/torutil"
)
func TestListenSimpleHTTPV2(t *testing.T) {

6
tor/listen.go
View File

@ -21,7 +21,7 @@ type OnionService struct {
// Key is the private key for this service. It is either the set key, the
// generated key, or nil if asked to discard the key. If present, it is
// *crypto/rsa.PrivateKey (1024 bit) when Version3 is false or
// github.com/cretz/bine/torutil/ed25519.KeyPair when Version3 is true.
// git.openprivacy.ca/openprivacy/bine/torutil/ed25519.KeyPair when Version3 is true.
Key crypto.PrivateKey
// Version3 says whether or not this service is a V3 service.
@ -66,9 +66,9 @@ type ListenConf struct {
// Key is the private key to use. If not present, a key is generated based
// on whether Version3 is true or false. If present, it must be a
// *crypto/rsa.PrivateKey (1024 bit), a
// github.com/cretz/bine/torutil/ed25519.KeyPair, a
// git.openprivacy.ca/openprivacy/bine/torutil/ed25519.KeyPair, a
// golang.org/x/crypto/ed25519.PrivateKey, or a
// github.com/cretz/bine/control.Key.
// git.openprivacy.ca/openprivacy/bine/control.Key.
Key crypto.PrivateKey
// Version3 determines whether, when Key is nil, a version 2 or version 3

2
torutil/ed25519/ed25519.go
View File

@ -12,7 +12,7 @@ import (
"errors"
"io"
"github.com/cretz/bine/torutil/ed25519/internal/edwards25519"
"git.openprivacy.ca/openprivacy/bine/torutil/ed25519/internal/edwards25519"
"golang.org/x/crypto/ed25519"
)

2
torutil/ed25519/ed25519_test.go
View File

@ -11,7 +11,7 @@ import (
"strings"
"testing"
"github.com/cretz/bine/torutil/ed25519/internal/edwards25519"
"git.openprivacy.ca/openprivacy/bine/torutil/ed25519/internal/edwards25519"
)
// Taken from https://github.com/golang/crypto/blob/1a580b3eff7814fc9b40602fd35256c63b50f491/ed25519/ed25519_test.go

6
torutil/key.go
View File

@ -9,7 +9,7 @@ import (
"fmt"
"strings"
"github.com/cretz/bine/torutil/ed25519"
"git.openprivacy.ca/openprivacy/bine/torutil/ed25519"
"golang.org/x/crypto/sha3"
)
@ -17,7 +17,7 @@ var serviceIDEncoding = base32.StdEncoding.WithPadding(base32.NoPadding)
// OnionServiceIDFromPrivateKey generates the onion service ID from the given
// private key. This panics if the private key is not a 1024-bit
// crypto/*rsa.PrivateKey or github.com/cretz/bine/torutil/ed25519.KeyPair.
// crypto/*rsa.PrivateKey or git.openprivacy.ca/openprivacy/bine/torutil/ed25519.KeyPair.
func OnionServiceIDFromPrivateKey(key crypto.PrivateKey) string {
switch k := key.(type) {
case *rsa.PrivateKey:
@ -30,7 +30,7 @@ func OnionServiceIDFromPrivateKey(key crypto.PrivateKey) string {
// OnionServiceIDFromPublicKey generates the onion service ID from the given
// public key. This panics if the public key is not a 1024-bit
// crypto/*rsa.PublicKey or github.com/cretz/bine/torutil/ed25519.PublicKey.
// crypto/*rsa.PublicKey or git.openprivacy.ca/openprivacy/bine/torutil/ed25519.PublicKey.
func OnionServiceIDFromPublicKey(key crypto.PublicKey) string {
switch k := key.(type) {
case *rsa.PublicKey:

2
torutil/key_test.go
View File

@ -7,7 +7,7 @@ import (
"math/big"
"testing"
"github.com/cretz/bine/torutil/ed25519"
"git.openprivacy.ca/openprivacy/bine/torutil/ed25519"
"github.com/stretchr/testify/require"
)