forking bulb

Godeps/Godeps.json

@@ -1,30 +0,0 @@
-{
-	"ImportPath": "github.com/s-rah/go-ricochet",
-	"GoVersion": "go1.7",
-	"GodepVersion": "v79",
-	"Packages": [
-		"./..."
-	],
-	"Deps": [
-		{
-			"ImportPath": "github.com/golang/protobuf/proto",
-			"Rev": "8ee79997227bf9b34611aee7946ae64735e6fd93"
-		},
-		{
-			"ImportPath": "github.com/yawning/bulb",
-			"Rev": "85d80d893c3d4a478b8c0abbc43f0ea13e1ce4f9"
-		},
-		{
-			"ImportPath": "github.com/yawning/bulb/utils",
-			"Rev": "85d80d893c3d4a478b8c0abbc43f0ea13e1ce4f9"
-		},
-		{
-			"ImportPath": "github.com/yawning/bulb/utils/pkcs1",
-			"Rev": "85d80d893c3d4a478b8c0abbc43f0ea13e1ce4f9"
-		},
-		{
-			"ImportPath": "golang.org/x/net/proxy",
-			"Rev": "60c41d1de8da134c05b7b40154a9a82bf5b7edb9"
-		}
-	]
-}

Godeps/Readme

@@ -1,5 +0,0 @@
-This directory tree is generated automatically by godep.
-
-Please do not edit.
-
-See https://github.com/tools/godep for more information.

application/ricochetonion.go

@@ -4,7 +4,7 @@ import (
 	"crypto/rsa"
 	"crypto/sha512"
 	"encoding/base64"
-	"github.com/yawning/bulb"
+	"git.openprivacy.ca/openprivacy/asaur"
 	"golang.org/x/crypto/ed25519"
 	"net"
 )
@@ -56,6 +56,7 @@ func SetupOnionV3(torControlAddress string, torControlSocketType string, authent
 	cfg := &bulb.NewOnionConfig{
 		DiscardPK:  true,
 		PrivateKey: onionPK,
+		Detach: true,
 	}
 
 	return c.NewListener(cfg, onionport)

utils/crypto.go

@@ -7,7 +7,7 @@ import (
 	"encoding/pem"
 	"errors"
 	"github.com/agl/ed25519/extra25519"
-	"github.com/yawning/bulb/utils/pkcs1"
+	"git.openprivacy.ca/openprivacy/asaur/utils/pkcs1"
 	"golang.org/x/crypto/curve25519"
 	"golang.org/x/crypto/ed25519"
 	"io/ioutil"

utils/networkresolver.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/yawning/bulb"
+	"git.openprivacy.ca/openprivacy/asaur"
 	"golang.org/x/net/proxy"
 	"net"
 	"strings"