Merge branch 'master' of https://github.com/Psiphon-Labs/psiphon-tunnel-core

AndroidLibrary/Dockerfile

@@ -2,7 +2,7 @@
 #
 # See README.md for usage instructions.
 
-FROM ubuntu:latest
+FROM ubuntu:16.04
 
 # Install system-level dependencies.
 ENV DEBIAN_FRONTEND=noninteractive
@@ -11,13 +11,13 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
     ca-certificates \
     curl \
     git \
-    openjdk-7-jdk \
+    openjdk-8-jdk \
     pkg-config \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Go.
-ENV GOVERSION=go1.6 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
+ENV GOVERSION=go1.6.2 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
 
 RUN curl -L https://storage.googleapis.com/golang/$GOVERSION.linux-amd64.tar.gz -o /tmp/go.tar.gz \
   && tar -C /usr/local -xzf /tmp/go.tar.gz \
@@ -42,7 +42,7 @@ RUN curl -L http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -o /tmp/a
   && (while true; do echo 'y'; sleep 2; done) | $ANDROID_HOME/tools/android update sdk --no-ui --filter platform,platform-tool,tool
 
 # Setup OpenSSL libray.
-ENV OPENSSL_VERSION=1.0.1p
+ENV OPENSSL_VERSION=1.0.2h
 ENV PKG_CONFIG_PATH=/tmp/openssl/openssl-$OPENSSL_VERSION
 ENV CGO_CFLAGS="-I $PKG_CONFIG_PATH/include" CGO_LDFLAGS="-L $PKG_CONFIG_PATH -lssl -lcrypto"
 

ConsoleClient/Dockerfile

@@ -2,7 +2,7 @@
 #
 # See README.md for usage instructions.
 
-FROM ubuntu:latest
+FROM ubuntu:16.04
 
 # Install system-level dependencies.
 ENV DEBIAN_FRONTEND=noninteractive
@@ -22,7 +22,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Go.
-ENV GOVERSION=go1.6 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
+ENV GOVERSION=go1.6.2 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
 
 RUN curl -L https://storage.googleapis.com/golang/$GOVERSION.linux-amd64.tar.gz -o /tmp/go.tar.gz \
    && tar -C /usr/local -xzf /tmp/go.tar.gz \
@@ -34,7 +34,7 @@ RUN go get github.com/mitchellh/gox \
     && go get github.com/pwaller/goupx
 
 # Setup OpenSSL libray.
-ENV OPENSSL_VERSION=1.0.1p
+ENV OPENSSL_VERSION=1.0.2h
 ENV PKG_CONFIG_PATH_32=/tmp/openssl/32/openssl-$OPENSSL_VERSION PKG_CONFIG_PATH_64=/tmp/openssl/64/openssl-$OPENSSL_VERSION
 
 RUN mkdir -p /tmp/openssl/32 \

openssl/build-android.sh

@@ -2,10 +2,10 @@
 
 # Based on: https://wiki.openssl.org/index.php/Android
 
-rm -rf ./openssl-1.0.1p
-tar xvf openssl-1.0.1p.tar.gz
+rm -rf ./openssl-1.0.2h
+tar xvf openssl-1.0.2h.tar.gz
 source ./setenv-android.sh
-cd openssl-1.0.1p
+cd openssl-1.0.2h
 perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org
 # TODO: strip out more unnecessary components
 ./config no-shared no-ssl2 no-ssl3 no-comp no-hw no-md2 no-md4 no-rc2 no-rc5 no-krb5 no-ripemd160 no-idea no-gost no-camellia no-seed no-3des no-heartbeats --openssldir=../ssl