Merge pull request #47 from signal-golang/sealed_sender

Use crayfish for register and decipher of sealed sender messages

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "cmd/textsecure/crayfish"]
+	path = cmd/textsecure/crayfish
+	url = https://github.com/nanu-c/crayfish.git

cmd/textsecure/Makefile

@@ -26,18 +26,21 @@ endif
 ifeq ($(uname_s), Linux)
 ifeq ($(shell uname --machine), x86_64)
 	@echo "get zkgroup $(PLATFORM)"
-	go get -d github.com/nanu-c/zkgroup
+	go get -d github.com/nanu-c/zkgroup \
+	&& cd $(GOPATH)/src/github.com/nanu-c/zkgroup \
 	&& git submodule update \
 	&& cd lib/zkgroup \
-	&& cargo build --release --verbose
-	mv libzkgroup.so libzkgroup_linux_x86_64.so
+	&& cargo build --release --verbose 
+	mv $(GOPATH)/src/github.com/nanu-c/zkgroup/lib/zkgroup/target/debug/libzkgroup.so libzkgroup_linux_x86_64.so
+	cd crayfish&&cargo build
 else ifeq ($(shell uname --machine), aarch64)
 	@echo "get zkgroup $(PLATFORM)"
 	go get -d github.com/nanu-c/zkgroup
 	&& git submodule update \
 	&& cd lib/zkgroup \
 	&& cargo build --release --verbose
-	mv libzkgroup.so libzkgroup_linux_aarch64.so
+	mv $(GOPATH)/src/github.com/nanu-c/zkgroup/lib/zkgroup/target/debug/libzkgroup.so libzkgroup_linux_aarch64.so
+	cd crayfish&&cargo build
 else 
 	@echo architecture not supported
 	exit 1

cmd/textsecure/README.md

@@ -1,8 +1,14 @@
 # Info
-The textsecure-cmd depends on libzkgroup a rust lib.
+The textsecure-cmd depends on libzkgroup and crayfsh both rust libs.
+
+# Tooling
+`go`, `cargo`, `rust`
 
 # Installing
-In order to run textsecure-cmd you can either copy the precompiled library with `make copy-lib` or compile it with `make`.
+textsecure-cmd uses [crayfish](https://github.com/nanu-c/crayfish) as backend to decipher the signal messages. In order to checkout the code run `git submodule update`.
+Then build `crayfish` with `cd crayfish && cago build`
+In order to run textsecure-cmd you can either copy the precompiled zkgroup library with `make copy-lib` or compile it with `make`.
+
 
 # Troubleshooting
 

cmd/textsecure/main.go

@@ -69,7 +69,7 @@ func init() {
 	flag.StringVar(&leavegroup, "leavegroup", "", "Leave a group named by the argument")
 	flag.BoolVar(&endsession, "endsession", false, "Terminate session with peer")
 	flag.BoolVar(&showdevices, "showdevices", false, "Show linked devices")
-	flag.StringVar(&linkdevice, "linkdevice", "", "Link a new device, the argument is a url in the format 'tsdevice:/?uuid=xxx&pub_key=yyy'")
+	flag.StringVar(&linkdevice, "linkdevice", "", "Link a new device, the argument is a url in the format 'sgn:/?uuid=xxx&pub_key=yyy'")
 	flag.IntVar(&unlinkdevice, "unlinkdevice", 0, "Unlink a device, the argument is the id of the device to delete")
 	flag.IntVar(&stress, "stress", 0, "Automatically send many messages to the peer")
 	flag.StringVar(&configDir, "config", ".config", "Location of config dir")