diff --git a/aes-crypto-sample-app/.gitignore b/aes-crypto-sample-app/.gitignore
new file mode 100644
index 0000000..9a7b916
--- /dev/null
+++ b/aes-crypto-sample-app/.gitignore
@@ -0,0 +1,7 @@
+*.iml
+.gradle
+/local.properties
+.DS_Store
+/build
+.externalNativeBuild
+.idea
diff --git a/sample/.gitignore b/aes-crypto-sample-app/app/.gitignore
similarity index 87%
rename from sample/.gitignore
rename to aes-crypto-sample-app/app/.gitignore
index 796b96d..3543521 100644
--- a/sample/.gitignore
+++ b/aes-crypto-sample-app/app/.gitignore
@@ -1 +1 @@
-/build
+/build
diff --git a/aes-crypto-sample-app/app/build.gradle b/aes-crypto-sample-app/app/build.gradle
new file mode 100644
index 0000000..f63372f
--- /dev/null
+++ b/aes-crypto-sample-app/app/build.gradle
@@ -0,0 +1,33 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 25
+ buildToolsVersion "25.0.1"
+ defaultConfig {
+ applicationId "com.tozny.aeswithintegritysample"
+ minSdkVersion 18
+ targetSdkVersion 25
+ versionCode 1
+ versionName "1.0"
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ }
+ sourceSets {
+ main.java.srcDirs += '../../aes-crypto/src/main/java'
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ exclude group: 'com.android.support', module: 'support-annotations'
+ })
+ compile 'com.android.support:appcompat-v7:25.0.1'
+ testCompile 'junit:junit:4.12'
+}
diff --git a/sample/proguard-rules.pro b/aes-crypto-sample-app/app/proguard-rules.pro
similarity index 85%
rename from sample/proguard-rules.pro
rename to aes-crypto-sample-app/app/proguard-rules.pro
index 4956cd8..717603b 100644
--- a/sample/proguard-rules.pro
+++ b/aes-crypto-sample-app/app/proguard-rules.pro
@@ -1,17 +1,17 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/scottab/dev/adt-bundle-mac-x86_64/sdk-macosx-v2/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\Justin\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/sample/src/main/AndroidManifest.xml b/aes-crypto-sample-app/app/src/main/AndroidManifest.xml
similarity index 65%
rename from sample/src/main/AndroidManifest.xml
rename to aes-crypto-sample-app/app/src/main/AndroidManifest.xml
index 59b983c..2040a4c 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/aes-crypto-sample-app/app/src/main/AndroidManifest.xml
@@ -1,21 +1,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sample/src/main/java/com/tozny/crypto/android/sample/MainActivity.java b/aes-crypto-sample-app/app/src/main/java/com/tozny/aes_crypto_sample/MainActivity.java
similarity index 54%
rename from sample/src/main/java/com/tozny/crypto/android/sample/MainActivity.java
rename to aes-crypto-sample-app/app/src/main/java/com/tozny/aes_crypto_sample/MainActivity.java
index d3d418a..57526c3 100644
--- a/sample/src/main/java/com/tozny/crypto/android/sample/MainActivity.java
+++ b/aes-crypto-sample-app/app/src/main/java/com/tozny/aes_crypto_sample/MainActivity.java
@@ -1,95 +1,68 @@
-package com.tozny.crypto.android.sample;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import java.io.UnsupportedEncodingException;
-import java.security.GeneralSecurityException;
-
-import com.tozny.crypto.android.AesCbcWithIntegrity;
-
-import static com.tozny.crypto.android.AesCbcWithIntegrity.decryptString;
-import static com.tozny.crypto.android.AesCbcWithIntegrity.encrypt;
-import static com.tozny.crypto.android.AesCbcWithIntegrity.generateKey;
-import static com.tozny.crypto.android.AesCbcWithIntegrity.generateKeyFromPassword;
-import static com.tozny.crypto.android.AesCbcWithIntegrity.generateSalt;
-import static com.tozny.crypto.android.AesCbcWithIntegrity.keyString;
-import static com.tozny.crypto.android.AesCbcWithIntegrity.keys;
-import static com.tozny.crypto.android.AesCbcWithIntegrity.saltString;
-
-/**
- * Sample shows password based key gen
- */
-public class MainActivity extends Activity {
- public static final String TAG = "Tozny";
-
- private static boolean PASSWORD_BASED_KEY = true;
- private static String EXAMPLE_PASSWORD = "LeighHunt";
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
-
- try {
- AesCbcWithIntegrity.SecretKeys key;
- if (PASSWORD_BASED_KEY) {//example for password based keys
- String salt = saltString(generateSalt());
- //If you generated the key from a password, you can store the salt and not the key.
- Log.i(TAG, "Salt: " + salt);
- key = generateKeyFromPassword(EXAMPLE_PASSWORD, salt);
- } else {
- key = generateKey();
- //Note: If you are generating a random key, you'll probably be storing it somewhere
- }
-
- // The encryption / storage & display:
-
- String keyStr = keyString(key);
- key = null; //Pretend to throw that away so we can demonstrate converting it from str
-
- String textToEncrypt = "We, the Fairies, blithe and antic,\n" +
- "Of dimensions not gigantic,\n" +
- "Though the moonshine mostly keep us,\n" +
- "Oft in orchards frisk and peep us. ";
- Log.i(TAG, "Before encryption: " + textToEncrypt);
-
- // Read from storage & decrypt
- key = keys(keyStr); // alternately, regenerate the key from password/salt.
- AesCbcWithIntegrity.CipherTextIvMac civ = encrypt(textToEncrypt, key);
- Log.i(TAG, "Encrypted: " + civ.toString());
-
- String decryptedText = decryptString(civ, key);
- Log.i(TAG, "Decrypted: " + decryptedText);
- //Note: "String.equals" is not a constant-time check, which can sometimes be problematic.
- Log.i(TAG, "Do they equal: " + textToEncrypt.equals(decryptedText));
- } catch (GeneralSecurityException e) {
- Log.e(TAG, "GeneralSecurityException", e);
- } catch (UnsupportedEncodingException e) {
- Log.e(TAG, "UnsupportedEncodingException", e);
- }
-
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.menu_main, menu);
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
- if (id == R.id.action_settings) {
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-}
+package com.tozny.aes_crypto_sample;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.TextView;
+
+import java.io.UnsupportedEncodingException;
+import java.security.GeneralSecurityException;
+
+import com.tozny.aeswithintegritysample.R;
+import com.tozny.crypto.android.AesCbcWithIntegrity;
+import static com.tozny.crypto.android.AesCbcWithIntegrity.*;
+
+public class MainActivity extends AppCompatActivity {
+
+ public static final String TAG = "Tozny";
+
+ private static boolean PASSWORD_BASED_KEY = true;
+ private static String EXAMPLE_PASSWORD = "always use passphrases for passwords wherever possible!";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+
+ try {
+ AesCbcWithIntegrity.SecretKeys key;
+ if (PASSWORD_BASED_KEY) {//example for password based keys
+ String salt = saltString(generateSalt());
+ //If you generated the key from a password, you can store the salt and not the key.
+ Log.i(TAG, "Salt: " + salt);
+ key = generateKeyFromPassword(EXAMPLE_PASSWORD, salt);
+ } else {
+ key = generateKey();
+ //Note: If you are generating a random key, you'll probably be storing it somewhere
+ }
+
+ // The encryption / storage & display:
+
+ String keyStr = keyString(key);
+ key = null; //Pretend to throw that away so we can demonstrate converting it from str
+
+ String textToEncrypt = "Testing shows the presence, not the absence of bugs.\n\n Edsger W. Dijkstra";
+ Log.i(TAG, "Before encryption: " + textToEncrypt);
+
+ // Read from storage & decrypt
+ key = keys(keyStr); // alternately, regenerate the key from password/salt.
+ AesCbcWithIntegrity.CipherTextIvMac civ = encrypt(textToEncrypt, key);
+ Log.i(TAG, "Encrypted: " + civ.toString());
+
+ String decryptedText = decryptString(civ, key);
+ Log.i(TAG, "Decrypted: " + decryptedText);
+ //Note: "String.equals" is not a constant-time check, which can sometimes be problematic.
+ Log.i(TAG, "Do they equal: " + textToEncrypt.equals(decryptedText));
+
+ TextView t = (TextView) findViewById(R.id.textView);
+ t.setText(decryptedText);
+ } catch (GeneralSecurityException e) {
+ Log.e(TAG, "GeneralSecurityException", e);
+ } catch (UnsupportedEncodingException e) {
+ Log.e(TAG, "UnsupportedEncodingException", e);
+ }
+
+ }
+}
diff --git a/aes-crypto-sample-app/app/src/main/res/layout/activity_main.xml b/aes-crypto-sample-app/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..eeb3264
--- /dev/null
+++ b/aes-crypto-sample-app/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/sample/src/main/res/mipmap-hdpi/ic_launcher.png b/aes-crypto-sample-app/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from sample/src/main/res/mipmap-hdpi/ic_launcher.png
rename to aes-crypto-sample-app/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/sample/src/main/res/mipmap-mdpi/ic_launcher.png b/aes-crypto-sample-app/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from sample/src/main/res/mipmap-mdpi/ic_launcher.png
rename to aes-crypto-sample-app/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/sample/src/main/res/mipmap-xhdpi/ic_launcher.png b/aes-crypto-sample-app/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from sample/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to aes-crypto-sample-app/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/aes-crypto-sample-app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from sample/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to aes-crypto-sample-app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/aes-crypto-sample-app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/aes-crypto-sample-app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..aee44e1
Binary files /dev/null and b/aes-crypto-sample-app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/sample/src/main/res/values-w820dp/dimens.xml b/aes-crypto-sample-app/app/src/main/res/values-w820dp/dimens.xml
similarity index 98%
rename from sample/src/main/res/values-w820dp/dimens.xml
rename to aes-crypto-sample-app/app/src/main/res/values-w820dp/dimens.xml
index 63fc816..62df187 100644
--- a/sample/src/main/res/values-w820dp/dimens.xml
+++ b/aes-crypto-sample-app/app/src/main/res/values-w820dp/dimens.xml
@@ -1,6 +1,6 @@
-
-
- 64dp
-
+
+
+ 64dp
+
diff --git a/aes-crypto-sample-app/app/src/main/res/values/colors.xml b/aes-crypto-sample-app/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..2a12c47
--- /dev/null
+++ b/aes-crypto-sample-app/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+
+
+ #3F51B5
+ #303F9F
+ #FF4081
+
diff --git a/sample/src/main/res/values/dimens.xml b/aes-crypto-sample-app/app/src/main/res/values/dimens.xml
similarity index 97%
rename from sample/src/main/res/values/dimens.xml
rename to aes-crypto-sample-app/app/src/main/res/values/dimens.xml
index 47c8224..295b5a9 100644
--- a/sample/src/main/res/values/dimens.xml
+++ b/aes-crypto-sample-app/app/src/main/res/values/dimens.xml
@@ -1,5 +1,5 @@
-
-
- 16dp
- 16dp
-
+
+
+ 16dp
+ 16dp
+
diff --git a/aes-crypto-sample-app/app/src/main/res/values/strings.xml b/aes-crypto-sample-app/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..b0dd6b2
--- /dev/null
+++ b/aes-crypto-sample-app/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ Tozny Crypto
+
diff --git a/aes-crypto-sample-app/app/src/main/res/values/styles.xml b/aes-crypto-sample-app/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..6f19b47
--- /dev/null
+++ b/aes-crypto-sample-app/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff --git a/aes-crypto-sample-app/build.gradle b/aes-crypto-sample-app/build.gradle
new file mode 100644
index 0000000..2449eab
--- /dev/null
+++ b/aes-crypto-sample-app/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.2.2'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}
diff --git a/aes-crypto-sample-app/gradle.properties b/aes-crypto-sample-app/gradle.properties
new file mode 100644
index 0000000..3530b01
--- /dev/null
+++ b/aes-crypto-sample-app/gradle.properties
@@ -0,0 +1,17 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
diff --git a/aes-crypto-sample-app/gradle/wrapper/gradle-wrapper.jar b/aes-crypto-sample-app/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..13372ae
Binary files /dev/null and b/aes-crypto-sample-app/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/aes-crypto-sample-app/gradle/wrapper/gradle-wrapper.properties b/aes-crypto-sample-app/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..04e285f
--- /dev/null
+++ b/aes-crypto-sample-app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/aes-crypto-sample-app/gradlew b/aes-crypto-sample-app/gradlew
new file mode 100644
index 0000000..9d82f78
--- /dev/null
+++ b/aes-crypto-sample-app/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/aes-crypto-sample-app/gradlew.bat b/aes-crypto-sample-app/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/aes-crypto-sample-app/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/aes-crypto-sample-app/settings.gradle b/aes-crypto-sample-app/settings.gradle
new file mode 100644
index 0000000..d3db109
--- /dev/null
+++ b/aes-crypto-sample-app/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/aes-crypto/src/main/java/com/tozny/crypto/android/AesCbcWithIntegrity.java b/aes-crypto/src/main/java/com/tozny/crypto/android/AesCbcWithIntegrity.java
index af25e35..3515915 100644
--- a/aes-crypto/src/main/java/com/tozny/crypto/android/AesCbcWithIntegrity.java
+++ b/aes-crypto/src/main/java/com/tozny/crypto/android/AesCbcWithIntegrity.java
@@ -70,7 +70,6 @@ public class AesCbcWithIntegrity {
private static final String CIPHER_TRANSFORMATION = "AES/CBC/PKCS5Padding";
private static final String CIPHER = "AES";
- private static final String RANDOM_ALGORITHM = "SHA1PRNG";
private static final int AES_KEY_LENGTH_BITS = 128;
private static final int IV_LENGTH_BYTES = 16;
private static final int PBE_ITERATION_COUNT = 10000;
@@ -224,7 +223,7 @@ public static byte[] generateIv() throws GeneralSecurityException {
private static byte[] randomBytes(int length) throws GeneralSecurityException {
fixPrng();
- SecureRandom random = SecureRandom.getInstance(RANDOM_ALGORITHM);
+ SecureRandom random = new SecureRandom();
byte[] b = new byte[length];
random.nextBytes(b);
return b;
diff --git a/sample/build.gradle b/sample/build.gradle
deleted file mode 100644
index 28afd21..0000000
--- a/sample/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-apply plugin: 'com.android.application'
-
-repositories {
- mavenCentral()
- maven {
- url "https://oss.sonatype.org/content/repositories/snapshots"
- }
-}
-
-android {
- compileSdkVersion 21
- buildToolsVersion "21.1.2"
-
- defaultConfig {
- applicationId "com.tozny.crypto.android.sample"
- minSdkVersion 10
- targetSdkVersion 21
- versionCode 1
- versionName "1.0"
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-}
-
-dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile project (':aes-crypto')
-
- compile 'com.android.support:appcompat-v7:21.0.3'
-}
diff --git a/sample/sample.iml b/sample/sample.iml
deleted file mode 100644
index d29d3e9..0000000
--- a/sample/sample.iml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sample/src/androidTest/java/com/tozny/crypto/android/sample/ApplicationTest.java b/sample/src/androidTest/java/com/tozny/crypto/android/sample/ApplicationTest.java
deleted file mode 100644
index 8439ff2..0000000
--- a/sample/src/androidTest/java/com/tozny/crypto/android/sample/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.tozny.crypto.android.sample;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * Testing Fundamentals
- */
-public class ApplicationTest extends ApplicationTestCase {
- public ApplicationTest() {
- super(Application.class);
- }
-}
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 53ce557..0000000
--- a/sample/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
diff --git a/sample/src/main/res/menu/menu_main.xml b/sample/src/main/res/menu/menu_main.xml
deleted file mode 100644
index a459e0a..0000000
--- a/sample/src/main/res/menu/menu_main.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
deleted file mode 100644
index 2ea715e..0000000
--- a/sample/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
- AESCryptoSample
-
- AES-Crypto Sample, Hello world!
- Settings
-
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
deleted file mode 100644
index 766ab99..0000000
--- a/sample/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-