openssl, rust 2018, xargo

* Using openssl-1.1.0j
* Using Rust 2018
* Removed Xargo dependency

Author: astonbitecode

buildall.sh

@@ -4,4 +4,4 @@ set -e
 
 sh rust-build/pre_build_rust_keylock_android.sh
 sh rust-build/build_rust_for_rust_keylock_android.sh
-mvn -f java/pom.xml clean install
+mvn -f java/pom.xml clean install

java/src/main/java/org/astonbitecode/rustkeylock/callbacks/ShowEntriesSetCb.java

@@ -32,15 +32,6 @@ public class ShowEntriesSetCb extends NativeCallbackToRustChannelSupport {
     public void apply(List<JavaEntry> entries, String filter) {
         Log.d(TAG, "ShowEntriesSetCb with filter " + filter);
         InterfaceWithRust.INSTANCE.setCallback(this);
-//        // Workaround for handling empty list from Rust
-//        if (entriesSet.numberOfEntries == 1 && entriesSet.getEntries().get(0).name.equals(Defs.EMPTY_ARG)
-//                && entriesSet.getEntries().get(0).user.equals(Defs.EMPTY_ARG)
-//                && entriesSet.getEntries().get(0).pass.equals(Defs.EMPTY_ARG)
-//                && entriesSet.getEntries().get(0).desc.equals(Defs.EMPTY_ARG)) {
-//            entries = new ArrayList<>();
-//        } else {
-//            entries = entriesSet.getEntries();
-//        }
 
         MainActivity mainActivity = MainActivity.getActiveActivity();
         Runnable uiRunnable = new UiThreadRunnable(entries, filter, mainActivity);

rust-build/build_rust_for_rust_keylock_android.sh

@@ -20,8 +20,8 @@ mkdir -p $ANDROID_JAVA_NATIVE
 cd $ANDROID_RUST
 
 ANDROID_TOOLCHAIN_DIR=$BASEDIR/android-toolchain
-OPENSSL_BUILD_DIR=$BASEDIR/tools/openssl-1.1.0g/build
-CC="${ANDROID_TOOLCHAIN_DIR}/bin/arm-linux-androideabi-gcc" OPENSSL_DIR=${OPENSSL_BUILD_DIR} OPENSSL_LIB_DIR=${OPENSSL_BUILD_DIR}/lib OPENSSL_INCLUDE_DIR=${OPENSSL_BUILD_DIR}/include OPENSSL_STATIC=true $CARGO_HOME/bin/cargo build --target=arm-linux-androideabi --release
+OPENSSL_BUILD_DIR=$BASEDIR/tools/openssl-1.1.0j/build
+CC="${ANDROID_TOOLCHAIN_DIR}/bin/arm-linux-androideabi-gcc" AR="${ANDROID_TOOLCHAIN_DIR}/bin/arm-linux-androideabi-ar" OPENSSL_DIR=${OPENSSL_BUILD_DIR} OPENSSL_LIB_DIR=${OPENSSL_BUILD_DIR}/lib OPENSSL_INCLUDE_DIR=${OPENSSL_BUILD_DIR}/include OPENSSL_STATIC=true $CARGO_HOME/bin/cargo build --target=arm-linux-androideabi --release
 
 echo "Copying $ANDROID_RUST_KEYLOCK_LIB to $ANDROID_JAVA_NATIVE"
 cp $ANDROID_RUST_KEYLOCK_LIB $ANDROID_JAVA_NATIVE

rust-build/libs/android-arm.jar

@@ -24,9 +24,6 @@ CARGO_HOME=$BASEDIR/tools/.cargo RUSTUP_HOME=$BASEDIR/tools/.rustup sh tools/rus
 $CARGO_HOME/bin/rustup default stable
 $CARGO_HOME/bin/rustup target add arm-linux-androideabi
 
-# Install xargo
-$CARGO_HOME/bin/cargo install xargo --force --root $CARGO_HOME
-
 # Create an Android toolchain
 cd $BASEDIR
 
@@ -47,9 +44,9 @@ fi
 
 ANDROID_NDK_HOME=${ANDROID_NDK}
 
-echo Installing the Android toolchain
+echo Installing the Android toolchain using NDK: $ANDROID_NDK
 
-sh $ANDROID_NDK/build/tools/make-standalone-toolchain.sh --platform=android-16 --arch=arm --install-dir=android-toolchain > /dev/null
+$ANDROID_NDK/build/tools/make-standalone-toolchain.sh --platform=android-16 --arch=arm --install-dir=android-toolchain  > /dev/null
 
 cd android-toolchain
 ANDROID_TOOLCHAIN_DIR=`pwd`
@@ -72,22 +69,28 @@ EOF
 
 # Get and build the openssl
 
-ANDROID_NDK_ROOT=${ANDROID_NDK}
+# Export the ANDROID_TOOLCHAIN variable to be used for building the openssl
+export ANDROID_TOOLCHAIN=$ANDROID_TOOLCHAIN_DIR/bin
+export ANDROID_NDK_ROOT=${ANDROID_NDK}
 
 cd $BASEDIR/tools
 
-curl -O https://www.openssl.org/source/openssl-1.1.0g.tar.gz
-tar xzf openssl-1.1.0g.tar.gz
-OPENSSL_SRC_DIR=$BASEDIR/tools/openssl-1.1.0g
+curl -O https://www.openssl.org/source/openssl-1.1.0j.tar.gz
+tar xzf openssl-1.1.0j.tar.gz
+
+export OPENSSL_SRC_DIR=$BASEDIR/tools/openssl-1.1.0j
+
+# Delete the mandroid flag as clang does not recognize it
+sed -i 's/-mandroid //g' ${OPENSSL_SRC_DIR}/Configurations/10-main.conf
 
 . ../rust-build/setenv-android.sh
 
 cd $OPENSSL_SRC_DIR
 
 echo Building openssl
-
-./config shared no-ssl2 no-ssl3 no-comp no-hw no-engine --openssldir=$OPENSSL_SRC_DIR/build --prefix=$OPENSSL_SRC_DIR/build
+#./config android shared no-ssl3 no-comp no-hw no-engine --openssldir=$OPENSSL_SRC_DIR/build --prefix=$OPENSSL_SRC_DIR/build
+./Configure android-armeabi shared no-ssl3 no-comp no-hw no-asm --openssldir=$OPENSSL_SRC_DIR/build --prefix=$OPENSSL_SRC_DIR/build
 make all > /dev/null
-make install CC=$ANDROID_TOOLCHAIN/arm-linux-androideabi-gcc RANLIB=$ANDROID_TOOLCHAIN/arm-linux-androideabi-ranlib > /dev/null
+make install CC=$ANDROID_TOOLCHAIN/arm-linux-androideabi-clang RANLIB=$ANDROID_TOOLCHAIN/arm-linux-androideabi-ranlib > /dev/null
 
 echo openssl build success

rust-build/pre_build_rust_keylock_android.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+
+set -e
+
 # Cross-compile environment for Android on ARMv7 and x86
 #
 # Contents licensed under the terms of the OpenSSL license
@@ -9,6 +12,8 @@
 
 #####################################################################
 
+echo ===========setenv-android starts=============
+
 # Set ANDROID_NDK_ROOT to you NDK location. For example,
 # /opt/android-ndk-r8e or /opt/android-ndk-r9. This can be done in a
 # login script. If ANDROID_NDK_ROOT is not specified, the script will
@@ -22,8 +27,8 @@
 # list in $ANDROID_NDK_ROOT/toolchains. This value is always used.
 # _ANDROID_EABI="x86-4.6"
 # _ANDROID_EABI="arm-linux-androideabi-4.6"
-_ANDROID_EABI="arm-linux-androideabi-4.8"
-#_ANDROID_EABI="arm-linux-androideabi-4.9"
+#_ANDROID_EABI="arm-linux-androideabi-4.8"
+_ANDROID_EABI="arm-linux-androideabi-4.9"
 
 # Set _ANDROID_ARCH to the architecture you are building for.
 # This value is always used.
@@ -103,14 +108,18 @@ fi
 # doing things according to the NDK documentation for Ice Cream Sandwich.
 # https://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html
 
-ANDROID_TOOLCHAIN=""
-for host in "linux-x86_64" "linux-x86" "darwin-x86_64" "darwin-x86"
-do
-  if [ -d "$ANDROID_NDK_ROOT/toolchains/$_ANDROID_EABI/prebuilt/$host/bin" ]; then
-    ANDROID_TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/$_ANDROID_EABI/prebuilt/$host/bin"
-    break
-  fi
-done
+if [ -z "$ANDROID_TOOLCHAIN" ]; then
+
+  ANDROID_TOOLCHAIN=""
+  for host in "linux-x86_64" "linux-x86" "darwin-x86_64" "darwin-x86"
+  do
+    if [ -d "$ANDROID_NDK_ROOT/toolchains/$_ANDROID_EABI/prebuilt/$host/bin" ]; then
+      export ANDROID_TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/$_ANDROID_EABI/prebuilt/$host/bin"
+      break
+    fi
+  done
+fi
+
 
 # Error checking
 if [ -z "$ANDROID_TOOLCHAIN" ] || [ ! -d "$ANDROID_TOOLCHAIN" ]; then
@@ -120,12 +129,12 @@ if [ -z "$ANDROID_TOOLCHAIN" ] || [ ! -d "$ANDROID_TOOLCHAIN" ]; then
 fi
 
 case $_ANDROID_ARCH in
-	arch-arm)	  
+	arch-arm)
       ANDROID_TOOLS="arm-linux-androideabi-gcc arm-linux-androideabi-ranlib arm-linux-androideabi-ld"
 	  ;;
-	arch-x86)	  
+	arch-x86)
       ANDROID_TOOLS="i686-linux-android-gcc i686-linux-android-ranlib i686-linux-android-ld"
-	  ;;	  
+	  ;;
 	*)
 	  echo "ERROR ERROR ERROR"
 	  ;;
@@ -151,9 +160,10 @@ fi
 
 # For the Android SYSROOT. Can be used on the command line with --sysroot
 # https://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html
-export ANDROID_SYSROOT="$ANDROID_NDK_ROOT/platforms/$_ANDROID_API/$_ANDROID_ARCH"
+#export ANDROID_SYSROOT="$ANDROID_NDK_ROOT/platforms/$_ANDROID_API/$_ANDROID_ARCH"
+export ANDROID_SYSROOT="$ANDROID_TOOLCHAIN/../sysroot"
+export NDK_SYSROOT="$ANDROID_NDK_ROOT/sysroot"
 export CROSS_SYSROOT="$ANDROID_SYSROOT"
-export NDK_SYSROOT="$ANDROID_SYSROOT"
 
 # Error checking
 if [ -z "$ANDROID_SYSROOT" ] || [ ! -d "$ANDROID_SYSROOT" ]; then
@@ -210,9 +220,8 @@ fi
 
 # For the Android toolchain
 # https://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html
-export ANDROID_SYSROOT="$ANDROID_NDK_ROOT/platforms/$_ANDROID_API/$_ANDROID_ARCH"
 export SYSROOT="$ANDROID_SYSROOT"
-export NDK_SYSROOT="$ANDROID_SYSROOT"
+export NDK_SYSROOT="$ANDROID_NDK_ROOT/sysroot"
 export ANDROID_NDK_SYSROOT="$ANDROID_SYSROOT"
 export ANDROID_API="$_ANDROID_API"
 
@@ -221,15 +230,20 @@ export ANDROID_API="$_ANDROID_API"
 export ANDROID_DEV="$ANDROID_NDK_ROOT/platforms/$_ANDROID_API/$_ANDROID_ARCH/usr"
 export HOSTCC=gcc
 
-VERBOSE=1
-if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" != "0" ]; then
-  echo "ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT"
-  echo "ANDROID_ARCH: $_ANDROID_ARCH"
-  echo "ANDROID_EABI: $_ANDROID_EABI"
-  echo "ANDROID_API: $ANDROID_API"
-  echo "ANDROID_SYSROOT: $ANDROID_SYSROOT"
-  echo "ANDROID_TOOLCHAIN: $ANDROID_TOOLCHAIN"
-  echo "FIPS_SIG: $FIPS_SIG"
-  echo "CROSS_COMPILE: $CROSS_COMPILE"
-  echo "ANDROID_DEV: $ANDROID_DEV"
-fi
+echo "ANDROID_TOOLS: $ANDROID_TOOLS"
+echo "ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT"
+echo "ANDROID_ARCH: $_ANDROID_ARCH"
+echo "ANDROID_EABI: $_ANDROID_EABI"
+echo "ANDROID_API: $ANDROID_API"
+echo "ANDROID_SYSROOT: $ANDROID_SYSROOT"
+echo "ANDROID_TOOLCHAIN: $ANDROID_TOOLCHAIN"
+echo "FIPS_SIG: $FIPS_SIG"
+echo "CROSS_SYS_ROOT: $CROSS_SYSROOT"
+echo "NDK_SYSROOT: $NDK_SYSROOT"
+echo "MACHINE: $MACHINE"
+echo "SYSTEM: $SYSTEM"
+echo "ARCH: $ARCH"
+echo "CROSS_COMPILE: $CROSS_COMPILE"
+echo "ANDROID_DEV: $ANDROID_DEV"
+
+echo ===========setenv-android completed=============

rust-build/setenv-android.sh

@@ -2,7 +2,7 @@
 name = "rustkeylockandroid"
 version = "0.7.0"
 authors = ["aston <[email protected]>"]
-edition = "2015"
+edition = "2018"
 
 [lib]
 name = "rustkeylockandroid"

rust/Cargo.toml

@@ -1,6 +1,7 @@
 use std::sync::mpsc::{self, Receiver};
 
 use j4rs::{Instance, InvocationArg, Jvm};
+use log::*;
 // Copyright 2017 astonbitecode
 // This file is part of rust-keylock password manager.
 //
@@ -16,8 +17,14 @@ use j4rs::{Instance, InvocationArg, Jvm};
 //
 // You should have received a copy of the GNU General Public License
 // along with rust-keylock.  If not, see <http://www.gnu.org/licenses/>.
-use rust_keylock::{AsyncEditor, Menu, MessageSeverity, RklConfiguration, Safe, UserOption,
-                   UserSelection};
+use rust_keylock::{
+    AsyncEditor,
+    Menu,
+    MessageSeverity,
+    RklConfiguration,
+    Safe, UserOption,
+    UserSelection,
+};
 
 use super::japi;
 

rust/Xargo.toml

@@ -2,9 +2,10 @@ use std::sync::mpsc::{self, Receiver};
 use std::thread;
 
 use j4rs::{errors, Instance, InstanceReceiver};
-
+use log::*;
 use rust_keylock::{Entry, Menu, UserOption, UserSelection};
 use rust_keylock::nextcloud::NextcloudConfiguration;
+use serde_derive::{Deserialize, Serialize};
 
 pub fn handle_instance_receiver_result(instance_receiver_res: errors::Result<InstanceReceiver>) -> Receiver<UserSelection> {
     let (tx, rx) = mpsc::channel();