diff --git a/bitmask/darwin.go b/bitmask/darwin.go index 32a9b079a641a3d1610e54da8ce7e4fe4434548b..f4250780113b11dfb8b9670c68483a18e346baf6 100644 --- a/bitmask/darwin.go +++ b/bitmask/darwin.go @@ -16,8 +16,16 @@ package bitmask -import "os" +import ( + "os" + + "github.com/pebbe/zmq4" +) const coreEndpoint = "ipc:///var/tmp/bitmask.core.sock" var ConfigPath = os.Getenv("HOME") + "/Library/Preferences/leap" + +func hasCurve() bool { + return zmq4.HasCurve() +} diff --git a/bitmask/events.go b/bitmask/events.go index 3fbdc4381927eda24618e76eb53a2bb3fb07dcb9..f8b3725c7d600a52f617dd3ba3e8544a3ee3832d 100644 --- a/bitmask/events.go +++ b/bitmask/events.go @@ -35,7 +35,7 @@ func initEvents() (*zmq4.Socket, error) { return nil, err } - if zmq4.HasCurve() { + if hasCurve() { err = initCurve(socket) if err != nil { return nil, err diff --git a/bitmask/unix.go b/bitmask/unix.go index a9768571e9a6b8bde43a227656b46e03e442de26..321f1c0bae4a2bdc2e830690d62d561e52ae6d05 100644 --- a/bitmask/unix.go +++ b/bitmask/unix.go @@ -16,8 +16,16 @@ package bitmask -import "os" +import ( + "os" + + "github.com/pebbe/zmq4" +) const coreEndpoint = "ipc:///var/tmp/bitmask.core.sock" var ConfigPath = os.Getenv("HOME") + "/.config/leap" + +func hasCurve() bool { + return zmq4.HasCurve() +} diff --git a/bitmask/windows.go b/bitmask/windows.go index b3d41aa47991f802100c4e17a8b5813631ae9792..180240571de2af918b15245cfc941b29d4940149 100644 --- a/bitmask/windows.go +++ b/bitmask/windows.go @@ -21,3 +21,7 @@ import "os" const coreEndpoint = "tcp://127.0.0.1:5001" var ConfigPath = os.Getenv("APPDATA") + "\\leap" + +func hasCurve() bool { + return false +}