Browse Source

Merge pull request 'Upgrade Cwtch' (#32) from cwtch-v1.11.1 into trunk

Reviewed-on: https://git.openprivacy.ca/cwtch.im/libcwtch-go/pulls/32
pull/34/head v1.3.1
Dan Ballard 8 months ago
parent
commit
fcc9d7148a
  1. 2
      go.mod
  2. 6
      go.sum
  3. 3
      lib.go

2
go.mod

@ -3,7 +3,7 @@ module git.openprivacy.ca/cwtch.im/libcwtch-go
go 1.15
require (
cwtch.im/cwtch v0.11.1
cwtch.im/cwtch v0.11.2
git.openprivacy.ca/openprivacy/connectivity v1.5.0
git.openprivacy.ca/openprivacy/log v1.0.3
golang.org/x/mobile v0.0.0-20210716004757-34ab1303b554 // indirect

6
go.sum

@ -1,7 +1,5 @@
cwtch.im/cwtch v0.11.0 h1:CwmbaMEbL0lOiPagfWxA7po2HSq49B1lcFjPB7UR8k4=
cwtch.im/cwtch v0.11.0/go.mod h1:QpTkQK7MqNt0dQK9/pBk5VpkvFhy6xuoxJIn401B8fM=
cwtch.im/cwtch v0.11.1 h1:9HHcGwij3WIt53ZuKQUSqQ4x29CnZJ7TufA+t+cat/M=
cwtch.im/cwtch v0.11.1/go.mod h1:QpTkQK7MqNt0dQK9/pBk5VpkvFhy6xuoxJIn401B8fM=
cwtch.im/cwtch v0.11.2 h1:a38zZLSNsKJzLStBDOIoYKKIL56V9ueQvOZfnIEVc5I=
cwtch.im/cwtch v0.11.2/go.mod h1:QpTkQK7MqNt0dQK9/pBk5VpkvFhy6xuoxJIn401B8fM=
filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU=
filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
git.openprivacy.ca/cwtch.im/tapir v0.4.9 h1:LXonlztwvI1F1++0IyomIcDH1/Bxzo+oN8YjGonNvjM=

3
lib.go

@ -31,7 +31,6 @@ import (
"encoding/base64"
mrand "math/rand"
"os"
"path"
"path/filepath"
"time"
@ -156,7 +155,7 @@ func _startCwtch(appDir string, torPath string) {
}
log.Infof("making directory %v", appDir)
os.MkdirAll(path.Join(appDir, "tor"), 0700)
os.MkdirAll(filepath.Join(appDir, "tor"), 0700)
tor.NewTorrc().WithSocksPort(port).WithOnionTrafficOnly().WithControlPort(controlPort).WithHashedPassword(base64.StdEncoding.EncodeToString(key)).Build(filepath.Join(appDir, "tor", "torrc"))
acn, err := tor.NewTorACNWithAuth(appDir, torPath, controlPort, tor.HashedPasswordAuthenticator{Password: base64.StdEncoding.EncodeToString(key)})
if err != nil {

Loading…
Cancel
Save