Merge branch 'tor-snowflake' into 'master'

tor-over-snowflake

Closes #9045

See merge request leap/bitmask_android!138

15 files changed, 0 insertions, 45 deletions

diff --git a/go/src/github.com/OperatorFoundation/obfs4 b/go/src/github.com/OperatorFoundation/obfs4
deleted file mode 160000
-Subproject 17f2cb99c26454c519ca23185ee5dd3176a9363
diff --git a/go/src/github.com/OperatorFoundation/shapeshifter-dispatcher b/go/src/github.com/OperatorFoundation/shapeshifter-dispatcher
deleted file mode 160000
-Subproject 7f7dd9fa3e11173dc5f54b9fca7e693cfe93cc8
diff --git a/go/src/github.com/OperatorFoundation/shapeshifter-ipc b/go/src/github.com/OperatorFoundation/shapeshifter-ipc
deleted file mode 160000
-Subproject 11746ba927e07aaa79ead1342256419df25ad69
diff --git a/go/src/github.com/OperatorFoundation/shapeshifter-transports b/go/src/github.com/OperatorFoundation/shapeshifter-transports
deleted file mode 160000
-Subproject b69856f6c6f6864167030359cb556143ecafb0a
diff --git a/go/src/github.com/aead/chacha20 b/go/src/github.com/aead/chacha20
deleted file mode 160000
-Subproject 8b13a72661dae6e9e5dea04f344f0dc95ea2954
diff --git a/go/src/github.com/agl/ed25519 b/go/src/github.com/agl/ed25519
deleted file mode 160000
-Subproject 5312a61534124124185d41f09206b9fef1d8840
diff --git a/go/src/github.com/dchest/siphash b/go/src/github.com/dchest/siphash
deleted file mode 160000
-Subproject 34f201214d993633bb24f418ba11736ab8b55aa
diff --git a/go/src/github.com/shadowsocks/shadowsocks-go b/go/src/github.com/shadowsocks/shadowsocks-go
deleted file mode 160000
-Subproject 6a03846ca9c02d8e94142b3c72b3182207a414b
diff --git a/go/src/github.com/willscott/goturn b/go/src/github.com/willscott/goturn
deleted file mode 160000
-Subproject 19f41278d0c9251d64e0ee29f37d51e87a24a97
diff --git a/go/src/golang.org/x/crypto b/go/src/golang.org/x/crypto
deleted file mode 160000
-Subproject 87dc89f01550277dc22b74ffcf4cd89fa2f40f4
diff --git a/go/src/golang.org/x/net b/go/src/golang.org/x/net
deleted file mode 160000
-Subproject ec77196f6094c3492a8b61f2c11cf937f78992a
diff --git a/go/src/golang.org/x/sys b/go/src/golang.org/x/sys
deleted file mode 160000
-Subproject f89234f9a2c237c4d4cf7b32e3d9fe2f7c4eacd
diff --git a/go/src/golang.org/x/tools b/go/src/golang.org/x/tools
deleted file mode 160000
-Subproject 2b779830f9d33eccacea7d9e741475351b225b1
diff --git a/go/src/se.leap.bitmaskclient/pgpverify/pgpverify.go b/go/src/se.leap.bitmaskclient/pgpverify/pgpverify.go
deleted file mode 100644
index 1388a33c..00000000
--- a/go/src/se.leap.bitmaskclient/pgpverify/pgpverify.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package pgpverify
-
-import (
-	"os"
-	"strings"
-
-	"golang.org/x/crypto/openpgp"
-)
-
-// PgpVerifier - exported struct used for file verification
-type PgpVerifier struct {
-	Logger Logger
-}
-
-// Logger - logging interface
-type Logger interface {
-	Log(msg string)
-}
-
-// Verify checks if a file was signed with the correct pgp key
-// using a PEM formatted signature and a corresponding public key
-func (pgpv *PgpVerifier) Verify(signature string, publicKey string, targetPath string) bool {
-	keyRingReader := strings.NewReader(publicKey)
-	signatureReader := strings.NewReader(signature)
-
-	verificationTarget, err := os.Open(targetPath)
-	if err != nil {
-		pgpv.Logger.Log("Open verification target: " + err.Error())
-		return false
-	}
-
-	keyring, err := openpgp.ReadArmoredKeyRing(keyRingReader)
-	if err != nil {
-		pgpv.Logger.Log("Read Armored Key Ring: " + err.Error())
-		return false
-	}
-	_, err = openpgp.CheckArmoredDetachedSignature(keyring, verificationTarget, signatureReader)
-	if err != nil {
-		pgpv.Logger.Log("Verification failed: " + err.Error())
-		return false
-	}
-	pgpv.Logger.Log("Successfully verified: entity.Identities")
-	return true
-}
-
diff --git a/go/src/se.leap.bitmaskclient/shapeshifter b/go/src/se.leap.bitmaskclient/shapeshifter
deleted file mode 160000
-Subproject f50f90891c1b0dfab1c717c19c183387d08b878