Merge branch 'tor-snowflake' into 'master'

tor-over-snowflake

Closes #9045

See merge request leap/bitmask_android!138

19 files changed, 0 insertions, 274 deletions

diff --git a/go/android_build_core.sh b/go/android_build_core.sh
deleted file mode 100755
index 1a6af5b7..00000000
--- a/go/android_build_core.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-export GOPATH=`pwd`
-export GO_LANG=`pwd`/golang/go/bin
-export GO_COMPILED=`pwd`/bin
-PATH="${GO_LANG}:${GO_COMPILED}:${PATH}"
-
-if [ -z $ANDROID_NDK_HOME ]; then
-        echo "Android NDK path not specified!"
-        echo "Please set \$ANDROID_NDK_HOME before starting this script!"
-        exit 1;
-fi
-
-./golang/go/bin/go env
-echo "getting gomobile..."
-./golang/go/bin/go get golang.org/x/mobile/cmd/gomobile
-echo "initiating gomobile..."
-./bin/gomobile init
-if [ ! -d ./lib ]; then mkdir ./lib; fi
-echo "cross compiling bitmask core lib (shapeshifter)..."
-./bin/gomobile bind -target=android -o ./lib/bitmask-core.aar se.leap.bitmaskclient/shapeshifter/
-cp lib/bitmask-core* ../bitmask-core/.
\ No newline at end of file
diff --git a/go/android_build_shapeshifter.sh b/go/android_build_shapeshifter.sh
deleted file mode 100755
index e39f9eb1..00000000
--- a/go/android_build_shapeshifter.sh
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2016 Andrew Jiang (TunnelBear Inc.)
-# Convenience script for generating shapeshifter-dispatcher binaries for Android devices
-# adapted for Bitmask by cyberta
-
-BUILD_LIBRARY=false;
-
-function quit {
-    echo "$1."
-    exit 1
-}
-
-if [ "$1" == "removeAll" ]; then
-        echo "removing golang, sources and generated files"
-        for folder in /tmp/android-toolchain-*; do
-                if [[ -d $folder ]]; then
-                        rm -rf $folder
-                fi
-        done
-        if [[ -d "./out" ]]; then
-                rm -rf ./out
-        fi
-
-        if [[ -d "./bin" ]]; then
-                rm -rf ./bin
-        fi
-
-        if [[ -d "./golang" ]]; then
-                rm -rf ./golang
-        fi
-
-        if [[ -d "./src" ]]; then
-                rm -rf ./src
-        fi
-        echo "Done!"
-
-elif [ "$1" == "clean" ]; then
-        echo "Cleaning up..."
-        for folder in /tmp/android-toolchain-*; do
-                if [[ -d $folder ]]; then
-                        rm -rf $folder
-                fi
-        done
-        if [[ -d "./out" ]]; then
-                rm -rf ./out
-        fi
-
-        if [[ -d "./bin" ]]; then
-                rm -rf ./bin
-        fi
-        echo "Done!"
-else
-        if [[ "$1" == "createLibrary" ]]; then
-            BUILD_LIBRARY=true
-        fi
-
-        if [ -z $ANDROID_NDK_HOME ]; then
-                echo "Android NDK path not specified!"
-                echo "Please set \$ANDROID_NDK_HOME before starting this script!"
-                exit 1;
-        fi
-
-        if [[ ! -f ./bin/gomobile && $BUILD_LIBRARY == true ]]; then
-            echo "gomobile not installed"
-            echo please run "install_go.sh first"
-            exit 1
-        fi
-
-        # Our targets are x86, x86_64, armeabi, armeabi-v7a, armv8;
-        # To remove targets, simply delete them from the bracket.
-        # NOTE: We are only currently shipping the armeabi-v7a binary
-        # on Android, for space reasons.
-        targets=(386 x86_64 armv7 arm64)
-        export GOOS=android
-
-        for arch in ${targets[@]}; do
-                # Initialize variables
-                go_arch=$arch
-                ndk_arch=$arch
-                ndk_platform="android-16"
-                suffix=$arch
-
-                if [ "$arch" = "386" ]; then
-                        export CGO_ENABLED=1
-                        ndk_arch="x86"
-                        suffix="x86"
-                        binary="i686-linux-android-gcc"
-                elif [ "$arch" = "x86_64" ]; then
-                        ndk_platform="android-21"
-                        ndk_arch="x86_64"
-                        suffix="x86_64"
-                        binary="x86_64-linux-android-gcc"
-                elif [ "$arch" = "armv5" ]; then
-                        export GOARM=5
-                        export CGO_ENABLED=1
-                        go_arch="arm"
-                        ndk_arch="arm"
-                        suffix="armeabi"
-                        binary="arm-linux-androideabi-gcc"
-                elif [ "$arch" = "armv7" ]; then
-                        export GOARM=7
-                        export CGO_ENABLED=1
-                        go_arch="arm"
-                        ndk_arch="arm"
-                        suffix="armeabi-v7a"
-                        binary="arm-linux-androideabi-gcc"
-                elif [ "$arch" = "arm64" ]; then
-                        suffix="arm64-v8a"
-                        ndk_platform="android-21"
-                        binary="aarch64-linux-android-gcc"
-                elif [ "$arch" = "mips" ]; then
-                        binary="mipsel-linux-android-gcc"
-                fi
-                export GOARCH=${go_arch}
-                export GOPATH=`pwd`
-                export NDK_TOOLCHAIN=/tmp/android-toolchain-${ndk_arch}
-
-                # Only generate toolchain if it does not already exist
-                if [ ! -d $NDK_TOOLCHAIN ]; then
-                        echo "Generating ${suffix} toolchain..."
-                        $ANDROID_NDK_HOME/build/tools/make-standalone-toolchain.sh \
-                        --arch=${ndk_arch} --platform=${ndk_platform} --install-dir=$NDK_TOOLCHAIN || quit "Failed to generate toolchain"
-                        echo "Toolchain generated!"
-                fi
-
-                export CC=$NDK_TOOLCHAIN/bin/clang
-                echo "Starting compilation for $suffix..."
-
-                if [[ BUILD_LIBRARY ]]; then
-                echo "cross compiling shapeshifter lib..."
-                ./bin/gomobile bind -target=android -o ./lib/shapeshifter.aar se.leap.bitmaskclient/shapeshifter/
-                cp lib/shapeshifter* ../shapeshifter/.
-                    #./android_build_shapeshifter_lib.sh || quit "Failed to cross-compile shapeshifter-dispatcher-library"
-
-                else
-                    ./golang/go/bin/go build -buildmode=pie -ldflags '-w -s -extldflags=-pie' -o ./out/${suffix}/piedispatcher github.com/OperatorFoundation/shapeshifter-dispatcher/shapeshifter-dispatcher || quit "Failed to cross-compile shapeshifter-dispatcher"
-                fi
-                echo "Build succeeded!"
-
-        done
-fi
\ No newline at end of file
diff --git a/go/android_build_web_core.sh b/go/android_build_web_core.sh
deleted file mode 100755
index 762d4dad..00000000
--- a/go/android_build_web_core.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-export GOPATH=`pwd`
-export GO_LANG=`pwd`/golang/go/bin
-export GO_COMPILED=`pwd`/bin
-PATH="${GO_LANG}:${GO_COMPILED}:${PATH}"
-
-if [ -z $ANDROID_NDK_HOME ]; then
-        echo "Android NDK path not specified!"
-        echo "Please set \$ANDROID_NDK_HOME before starting this script!"
-        exit 1;
-fi
-
-./golang/go/bin/go env
-echo "getting gomobile..."
-./golang/go/bin/go get golang.org/x/mobile/cmd/gomobile
-echo "initiating gomobile..."
-./bin/gomobile init
-if [ ! -d ./lib ]; then mkdir ./lib; fi
-echo "cross compiling bitmask web apk core lib (shapeshifter, pgpverify)..."
-./bin/gomobile bind -target=android -o ./lib/bitmask-web-core.aar se.leap.bitmaskclient/shapeshifter/ se.leap.bitmaskclient/pgpverify
-cp lib/bitmask-web-core* ../bitmask-web-core/.
\ No newline at end of file
diff --git a/go/install_go.sh b/go/install_go.sh
deleted file mode 100755
index 59aab4f0..00000000
--- a/go/install_go.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-GO_VERSION=go1.14.2.linux-amd64
-EXPECTED_FP=6272d6e940ecb71ea5636ddb5fab3933e087c1356173c61f4a803895e947ebb3
-
-if [[ $(ls -A ${GO_VERSION}.tar.gz) ]]
-then
-    echo "reusing downloaded golang bundle"
-else
-    echo "installing go lang bundle ${GO_VERSION}.tar.gz"
-    curl -o $GO_VERSION.tar.gz https://dl.google.com/go/$GO_VERSION.tar.gz
-    ACTUAL_FP=`sha256sum $GO_VERSION.tar.gz | cut -d " " -f1`
-    if [[ ! $ACTUAL_FP == $EXPECTED_FP ]]
-    then
-    echo "Download seems to be corrupted. Cancelling build."
-        return 1
-    fi
-fi
-
-if [[ -d ./golang ]]
-then
-    if [[ $(ls -A ./golang/*) ]]
-    then
-        rm -r ./golang/*
-    fi
-else
-    mkdir ./golang
-fi
-tar -C ./golang -xzf $GO_VERSION.tar.gz
-
-
-export GOPATH=`pwd`
-export GO_LANG=`pwd`/golang/go/bin
-export GO_COMPILED=`pwd`/bin
-export PATH="${GO_LANG}:${GO_COMPILED}:${PATH}"
-
-./golang/go/bin/go get golang.org/x/mobile/cmd/gomobile
-./golang/go/bin/go env
-echo "getting gomobile..."
-./golang/go/bin/go get golang.org/x/mobile/cmd/gomobile
-echo "initiating gomobile..."
-./bin/gomobile init
-
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