Conjure full

assets/ClientConf.dev

@@ -0,0 +1,9 @@
+
+c
+
+tapdance1.freeaeskey.xyzh�z�
+
+tapdance2.freeaeskey.xyzi�z�
+
+tapdance3.freeaeskey.xyzj�z�
$
+ ���yW�LjQ������`eM��{?�ho�K��Z

cli/main.go

@@ -34,6 +34,9 @@ func main() {
 	var tlsLog = flag.String("tlslog", "", "Filename to write SSL secrets to (allows Wireshark to decrypt TLS connections)")
 	var connect_target = flag.String("connect-addr", "", "If set, tapdance will transparently connect to provided address, which \nmust be either hostname:port or ip:port. "+
 		"Default(unset): connects client to \nforwardproxy, to which CONNECT request is yet to be written.")
+
+	var td = flag.Bool("td", false, "Enable tapdance cli mode for compatibility")
+
 	flag.Usage = func() {
 		fmt.Fprintf(os.Stderr, "Dark Decoy CLI\n$./cli -connect-addr=<decoy_address> [OPTIONS] \n\nOptions:\n")
 		flag.PrintDefaults()
@@ -67,11 +70,6 @@ func main() {
 	if *trace {
 		tapdance.Logger().Level = logrus.TraceLevel
 		tapdance.Logger().Trace("Trace logging enabled")
-
-		pubkey := tapdance.Assets().GetPubkey()
-		dst := make([]byte, hex.EncodedLen(len(pubkey)))
-		hex.Encode(dst, pubkey[:])
-		tapdance.Logger().Tracef("Using Pubkey: %s", dst)
 	}
 
 	if *tlsLog != "" {
@@ -81,9 +79,13 @@ func main() {
 		}
 	}
 
-    fmt.Printf("Using Station Pubkey: %s\n", hex.EncodeToString(tapdance.Assets().GetPubkey()[:]))
+	if *td {
+		fmt.Printf("Using Station Pubkey: %s\n", hex.EncodeToString(tapdance.Assets().GetPubkey()[:]))
+	} else {
+		fmt.Printf("Using Station Pubkey: %s\n", hex.EncodeToString(tapdance.Assets().GetConjurePubkey()[:]))
+	}
 
-	err := connectDirect(*connect_target, *port, *proxyHeader, v6Support, *width)
+	err := connectDirect(*td, *connect_target, *port, *proxyHeader, v6Support, *width)
 	if err != nil {
 		tapdance.Logger().Println(err)
 		os.Exit(1)
@@ -97,7 +99,7 @@ func main() {
 	}
 }
 
-func connectDirect(connect_target string, localPort int, proxyHeader bool, v6Support bool, width int) error {
+func connectDirect(td bool, connect_target string, localPort int, proxyHeader bool, v6Support bool, width int) error {
 	if _, _, err := net.SplitHostPort(connect_target); err != nil {
 		return fmt.Errorf("failed to parse host and port from connect_target %s: %v",
 			connect_target, err)
@@ -109,7 +111,7 @@ func connectDirect(connect_target string, localPort int, proxyHeader bool, v6Sup
 		return fmt.Errorf("error listening on port %v: %v", localPort, err)
 	}
 
-	tdDialer := tapdance.Dialer{DarkDecoy: true, UseProxyHeader: proxyHeader, V6Support: v6Support, Width: width}
+	tdDialer := tapdance.Dialer{DarkDecoy: !td, UseProxyHeader: proxyHeader, V6Support: v6Support, Width: width}
 
 	for {
 		clientConn, err := l.AcceptTCP()

protobuf/signalling.proto

@@ -84,6 +84,7 @@ message ClientConf {
     optional uint32 generation = 2;
     optional PubKey default_pubkey = 3;
     optional DarkDecoyBlocks dark_decoy_blocks = 4;
+    optional PubKey conjure_pubkey = 5;
 }
 
 message DecoyList {

tapdance/assets.go

@@ -262,6 +262,15 @@ func (a *assets) GetPubkey() *[32]byte {
 	return &pKey
 }
 
+func (a *assets) GetConjurePubkey() *[32]byte {
+	a.RLock()
+	defer a.RUnlock()
+
+	var pKey [32]byte
+	copy(pKey[:], a.config.GetConjurePubkey().GetKey()[:])
+	return &pKey
+}
+
 func (a *assets) GetGeneration() uint32 {
 	a.RLock()
 	defer a.RUnlock()