Re-organize the project into a better hierarchy.

platform-independent/cli-c/bashcomplib

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+# FIXME
+#   partials are currently readline words, but these can't be reliably compared against literal data.  We need to make them literal first.. in a safe way.  Currently using xargs' quote parser as a hack.
+
+# Process literal completion options in COMPREPLY
+#
+# 1. Filter COMPREPLY by excluding the options that do not match the word that is being completed.
+# 2. Shell-escape the COMPREPLY words so they remain syntactical words when injected into the completed command.
+# 3. Add a space after the words so successful completions advance to the next word
+#    (we disabled this default behavior with -o nospace so we can do completions that don't want this, eg. directory names)
+_comp_finish_completions() {
+    local partial=$(xargs <<< "${COMP_WORDS[COMP_CWORD]}") # FIXME
+    local word words=( "${COMPREPLY[@]}" )
+
+    COMPREPLY=()
+    for word in "${words[@]}"; do
+        ( shopt -s nocasematch; [[ $word = $partial* ]] ) && COMPREPLY+=( "$(printf '%q ' "$word")" )
+    done
+
+    if (( ${#COMPREPLY[@]} > 1 )) && [[ $_comp_title ]]; then
+        printf '\n%s:' "$_comp_title"
+        unset _comp_title
+    fi
+}
+
+# Perform pathname completion.
+#
+# 1. Populate COMPREPLY with pathnames.
+# 2. Shell-escape the COMPREPLY words so they remain syntactical words when injected into the completed command.
+# 3. Add a space after file names so successful completions advance to the next word.
+#    Directory names are suffixed with a / instead so we can keep completing the files inside.
+_comp_complete_path() {
+    local partial=$(xargs <<< "${COMP_WORDS[COMP_CWORD]}")
+    local path
+
+    COMPREPLY=()
+    for path in "$partial"*; do
+        if [[ -d $path ]]; then
+            COMPREPLY+=( "$(printf '%q/' "$path")" )
+
+        elif [[ -e $path ]]; then
+            COMPREPLY+=( "$(printf '%q ' "$path")" )
+
+        fi
+    done
+}
+
+_show_args() {
+    echo
+    local i=0
+    for arg; do
+        printf "arg %d: %s\n" "$((i++))" "$arg"
+    done
+
+    i=0
+    for word in "${COMP_WORDS[@]}"; do
+        printf "word %d: %s -> %s %s\n" "$i" "$word" "$(xargs <<< "$word")" "$( ((i == $COMP_CWORD)) && echo '<CWORD>' )"
+        let i++
+    done
+}

platform-independent/cli-c/build

@@ -0,0 +1,332 @@
+#!/usr/bin/env bash
+#
+# TROUBLESHOOTING
+#   - If you see 'undefined reference to `AES_encrypt'',
+#       make sure you have openssl installed.
+#       If libcrypto.a is in a non-standard directory, try ./build -L[your-lib-dir]
+#   - If you see 'undefined reference to `clock_gettime'',
+#       try ./build -lrt instead.
+#   - If you see 'x86.S:202: Error: junk at end of line, first unrecognized character is `,'',
+#       try commenting the line in lib/bcrypt/x86.S.
+#   - Take a look at the "Optional features" section.  Some features have dependencies,
+#       either make sure you have them or disable those features.
+#
+# BUGS
+#   masterpassword@lyndir.com
+#
+# AUTHOR
+#   Maarten Billemont
+#
+cd "${BASH_SOURCE%/*}"
+shopt -s extglob
+set -e
+
+
+### CONFIGURATION
+
+# Targets to build.
+if [[ $targets ]]; then
+    read -ra targets <<< "$targets"
+else
+    # Default targets.
+    # Modify here or override using targets='mpw mpw-bench' ./build
+    targets=(
+        mpw                         # C CLI version of Master Password.
+        mpw-bench                   # C CLI Master Password benchmark utility.
+        mpw-tests                   # C Master Password algorithm tester.
+    )
+fi
+
+# Optional features.
+mpw_color=1 # Colorized Identicon, requires libncurses-dev
+
+# Distribution specific configuration.
+# Homebrew
+if hash brew 2>/dev/null; then
+    opensslPath=$(brew --prefix openssl)
+    export CFLAGS="$CFLAGS -I$opensslPath/include"
+    export LDFLAGS="$LDFLAGS -L$opensslPath/lib"
+fi
+
+### DEPENDENCIES
+
+digest() {
+    openssl sha -sha256 -binary < "$1" | od -t x1 -An -v | tr -d '[:space:]'
+}
+fetch() {
+    if hash wget 2>/dev/null; then
+        wget -O "${1##*/}" "$1"
+    elif hash curl 2>/dev/null; then
+        curl "$1" > "${1##*/}"
+    fi
+}
+unpack() {
+    printf 'Verifying package: %s, against digest: %s...' "$1" "$2"
+    [[ $(digest "$1") = $2 ]] || {
+        printf ' mismatch!\n'
+        echo 2>&1 "Downloaded package doesn't match digest."
+        exit 1
+    }
+    printf ' OK!\n'
+
+    if [[ $1 = *.tar.gz || $1 = *.tgz ]]; then
+        tar -xvzf "$1"
+
+    elif [[ $1 = *.tar.bz2 || $1 = *.tbz2 ]]; then
+        tar -xvjf "$1"
+
+    elif [[ $1 = *.tar ]]; then
+        tar -xvf "$1"
+
+    else
+        echo 2>&1 "Don't know how to unpack: $1"
+    fi
+
+    files=( * )
+    if [[ -d $files ]] && (( ${#files[@]} == 1 )); then
+        mv "$files"/* .
+        rmdir "$files"
+    fi
+}
+fetchSource() (
+    local name=${PWD##*/}
+    source .source
+
+    if [[ -e .unpacked ]]; then
+        true
+
+    elif [[ $pkg && -e "${pkg##*/}" ]]; then
+        [[ -e src ]] || {
+            echo
+            echo "Unpacking: $name, using package..."
+            ( mkdir src && cd src && unpack "../${pkg##*/}" "$pkg_sha256" )
+            touch .unpacked
+        }
+
+    elif [[ $git ]] && hash git 2>/dev/null; then
+        [[ -e .git ]] || {
+            echo
+            echo "Fetching: $name, using git..."
+            git clone "$git" src
+            touch .unpacked
+        }
+
+    elif [[ $svn ]] && hash git 2>/dev/null && [[ -x "$(git --exec-path)/git-svn" ]]; then
+        [[ -e .git ]] || {
+            echo
+            echo "Fetching: $name, using git-svn..."
+            git svn clone --prefix=origin/ --stdlayout "$svn" src
+            touch .unpacked
+        }
+
+    elif [[ $svn ]] && hash svn 2>/dev/null; then
+        [[ -e .svn ]] || {
+            echo
+            echo "Fetching: $name, using svn..."
+            svn checkout "$svn/trunk" src
+            touch .unpacked
+        }
+
+    elif [[ $pkg ]]; then
+        [[ -e src ]] || {
+            echo
+            echo "Fetching: $name, using package..."
+            fetch "$pkg"
+            ( mkdir src && cd src && unpack "../${pkg##*/}" "$pkg_sha256" )
+            touch .unpacked
+        }
+
+    else
+
+        echo >&2 "error: Missing git-svn or svn."
+        echo >&2 "error: Please install either or manually check out the sources"
+        echo >&2 "error: from: $home"
+        echo >&2 "error: into: $PWD/src"
+        exit 1
+    fi
+
+    if [[ ! -e .patched ]] && (( ${#patches[@]} )); then
+        pushd src
+        for patch in "${patches[@]}"; do
+            echo
+            echo "Patching: $name, for $patch..."
+            patch -p0 < "../$patch.patch"
+        done
+        popd
+        touch .patched
+    fi
+)
+depend() {
+    local name=$1
+
+    echo
+    echo "Checking dependency: $name..."
+    [[ -e "lib/include/$name" ]] && return
+
+    pushd "lib/$name"
+    fetchSource
+    pushd "src"
+
+    echo
+    echo "Configuring dependency: $name..."
+    if [[ -e configure.ac ]]; then
+        if [[ ! -e configure ]]; then
+            # create configure using autotools.
+            if ! hash aclocal || ! hash automake; then
+                echo >&2 "Need autotools to build $name.  Please install automake and autoconf."
+                exit 1
+            fi
+
+            aclocal
+            autoheader
+            autoconf
+            mkdir -p config.aux
+            automake --add-missing
+        fi
+    fi
+
+    if [[ -e configure ]]; then
+        ./configure
+    fi
+
+    echo
+    echo "Building dependency: $name..."
+    if [[ -e Makefile ]]; then
+        if ! hash make; then
+            echo >&2 "Need make to build $name.  Please install GNU make."
+            exit 1
+        fi
+
+        make
+        install -d "../../include/$name/"
+        find . -name '*.h' -exec install -m 444 {} "../../include/$name/" \;
+    else
+        echo >&2 "error: Don't know how to build: $name"
+        exit 1
+    fi
+    popd
+    popd
+}
+
+
+### MPW
+mpw() {
+    depend scrypt
+
+    echo
+    echo "Building target: $target..."
+    local CFLAGS=(
+        # include paths
+        -I"lib/include"
+    )
+    local LDFLAGS=(
+        # scrypt
+        "lib/scrypt/src/libcperciva/"*/*.o
+        "lib/scrypt/src/lib/crypto/"*.o
+        # library paths
+        -L"." -L"lib/scrypt/src"
+        # link libraries
+        -l"crypto"
+    )
+    # optional features
+    (( mpw_color )) && CFLAGS+=( -DCOLOR ) LDFLAGS+=( -l"curses" )
+
+    cc "${CFLAGS[@]}" "$@"                  -c mpw-algorithm.c    -o mpw-algorithm.o
+    cc "${CFLAGS[@]}" "$@"                  -c mpw-types.c        -o mpw-types.o
+    cc "${CFLAGS[@]}" "$@"                  -c mpw-util.c         -o mpw-util.o
+    cc "${CFLAGS[@]}" "$@" "mpw-algorithm.o" "mpw-types.o" "mpw-util.o" \
+       "${LDFLAGS[@]}"     "mpw-cli.c" -o "mpw"
+    echo "done!  Now run ./install or use ./mpw"
+}
+
+
+### MPW-BENCH
+mpw-bench() {
+    depend scrypt
+    depend bcrypt
+
+    echo
+    echo "Building target: $target..."
+    local CFLAGS=(
+        # include paths
+        -I"lib/include"
+    )
+    local LDFLAGS=(
+        # scrypt
+        "lib/scrypt/src/libcperciva/"*/*.o
+        "lib/scrypt/src/lib/crypto/"*.o
+        # bcrypt
+        "lib/bcrypt/src/crypt_blowfish.o"
+        "lib/bcrypt/src/crypt_gensalt.o"
+        "lib/bcrypt/src/wrapper.o"
+        "lib/bcrypt/src/x86.o"
+        # library paths
+        -L"." -L"lib/scrypt/src"
+        -L"lib/bcrypt/src"
+        # link libraries
+        -l"crypto"
+    )
+
+    cc "${CFLAGS[@]}" "$@"                  -c mpw-algorithm.c    -o mpw-algorithm.o
+    cc "${CFLAGS[@]}" "$@"                  -c mpw-types.c        -o mpw-types.o
+    cc "${CFLAGS[@]}" "$@"                  -c mpw-util.c         -o mpw-util.o
+    cc "${CFLAGS[@]}" "$@" "mpw-algorithm.o" "mpw-types.o" "mpw-util.o" \
+       "${LDFLAGS[@]}"     "mpw-bench.c" -o "mpw-bench"
+    echo "done!  Now use ./mpw-bench"
+}
+
+
+### MPW-TESTS
+mpw-tests() {
+    depend scrypt
+
+    echo
+    echo "Building target: $target..."
+    local CFLAGS=(
+        # include paths
+        -I"lib/include"
+        -I"/usr/include/libxml2"
+        -I"/usr/local/include/libxml2"
+    )
+    local LDFLAGS=(
+        # scrypt
+        "lib/scrypt/src/libcperciva/"*/*.o
+        "lib/scrypt/src/lib/crypto/"*.o
+        # library paths
+        -L"." -L"lib/scrypt/src"
+        # link libraries
+        -l"crypto" -l"xml2"
+    )
+
+    cc "${CFLAGS[@]}" "$@"                  -c mpw-algorithm.c    -o mpw-algorithm.o
+    cc "${CFLAGS[@]}" "$@"                  -c mpw-types.c        -o mpw-types.o
+    cc "${CFLAGS[@]}" "$@"                  -c mpw-util.c         -o mpw-util.o
+    cc "${CFLAGS[@]}" "$@"                  -c mpw-tests-util.c   -o mpw-tests-util.o
+    cc "${CFLAGS[@]}" "$@" "mpw-algorithm.o" "mpw-types.o" "mpw-util.o" "mpw-tests-util.o" \
+       "${LDFLAGS[@]}"     "mpw-tests.c" -o "mpw-tests"
+    echo "done!  Now use ./mpw-tests"
+}
+
+
+### TARGETS
+
+haslib() {
+    ! LC_ALL=C cc -l"$1" 2>&1 | grep -q 'library not found'
+}
+cc() {
+    if hash llvm-gcc 2>/dev/null; then
+        llvm-gcc "$@"
+    elif hash gcc 2>/dev/null; then
+        gcc -std=gnu99 "$@"
+    elif hash clang 2>/dev/null; then
+        clang "$@"
+    else
+        echo >&2 "Need a compiler.  Please install GCC or LLVM."
+        exit 1
+    fi
+}
+
+echo "Will build targets: ${targets[*]}..."
+for target in "${targets[@]}"; do
+    "$target" "$@"
+done

platform-independent/cli-c/clean

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#
+# Clean all generated build files.
+set -e
+cd "${BASH_SOURCE%/*}"
+
+rm -vfr lib/*/{.unpacked,.patched,src} lib/include
+rm -vfr *.o *.dSYM mpw mpw-bench mpw-tests

platform-independent/cli-c/distribute

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -e
+
+cd "${BASH_SOURCE%/*}"
+tag=$(git describe)
+commit=$(git describe --long --dirty)
+[[ $tag && $commit = $tag* ]] || exit 1
+git show --show-signature --pretty=format:%H --quiet "$tag" > VERSION
+
+mpwArchive=mpw-$commit.tar.gz
+[[ -e $mpwArchive ]] && echo "WARNING: $mpwArchive already exists.  Will overwrite."
+read -n1 -p "Will prepare and release $mpwArchive.  Press a key to continue or ^C to abort."
+
+git ls-files -z . | xargs -0 tar -Lcvzf "$mpwArchive"
+echo "$mpwArchive ready, SHA256: $(openssl sha -sha256 < "$mpwArchive")"
+
+cd ../../Site/current
+ln -sf "../../MasterPassword/C/$mpwArchive"
+[[ -e $_ ]]
+echo "Linked from site, please update your hyperlinks to point to http://masterpasswordapp.com/$mpwArchive"

platform-independent/cli-c/install

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+#
+# Install the Master Password CLI tool.
+set -e
+cd "${BASH_SOURCE%/*}"
+source bashlib
+
+inf "This will install the mpw tool."
+
+# Try to guess then ask for the bin dir to install to.
+IFS=: read -a paths <<< "$PATH"
+if inArray ~/bin "${paths[@]}"; then
+    bindir=~/bin
+elif inArray ~/.bin "${paths[@]}"; then
+    bindir=~/.bin
+elif inArray /usr/local/bin "${paths[@]}"; then
+    bindir=/usr/local/bin
+else
+    bindir=~/bin
+fi
+bindir=$(ask -d "$bindir" "What bin directory should I install to?")
+[[ -d "$bindir" ]] || mkdir "$bindir" || ftl 'Cannot create missing bin directory: %s' "$bindir" || exit
+[[ -w "$bindir" ]] || ftl 'Cannot write to bin directory: %s' "$bindir" || exit
+
+# Install Master Password.
+install mpw "$bindir"
+[[ ! -e "$bindir/bashlib" ]] && install bashlib "$bindir" ||:
+
+# Convenience bash function.
+inf "Installation successful!"
+echo
+
+inf "To improve usability, you can install an mpw function in your bash shell."
+inf "This function adds the following features:"
+inf "  - Automatically remember your user name in the shell if not set."
+inf "  - Automatically put the password in the clipboard (some platforms)."
+echo
+inf "To do this you need the following function in ~/.bashrc:\n%s" "$(<mpw.bashrc)"
+echo
+inf "We can do this for you automatically now."
+if ask -c Y!n "Append the mpw function to your .bashrc?"; then
+    cat mpw.bashrc >> ~/.bashrc
+    inf "Done!  Don't forget to run '%s' to apply the changes!" "source ~/.bashrc"
+fi
+echo
+
+inf "You can also save your user name in ~/.bashrc.  Leave blank to skip this step."
+if MP_FULLNAME=$(ask "Your full name:") && [[ $MP_FULLNAME ]] ; then
+    printf 'export MP_FULLNAME=%q\n' "$MP_FULLNAME" >> ~/.bashrc
+fi
+echo
+
+inf "To begin using Master Password, type: mpw [site name]"

platform-independent/cli-c/mpw-bench.c

@@ -0,0 +1,135 @@
+//
+//  mpw-bench.c
+//  MasterPassword
+//
+//  Created by Maarten Billemont on 2014-12-20.
+//  Copyright (c) 2014 Lyndir. All rights reserved.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/time.h>
+
+#include <scrypt/sha256.h>
+#include <bcrypt/ow-crypt.h>
+
+#include "mpw-algorithm.h"
+#include "mpw-util.h"
+
+#define MP_N                32768
+#define MP_r                8
+#define MP_p                2
+#define MP_dkLen            64
+#define MP_hash             PearlHashSHA256
+
+static void mpw_getTime(struct timeval *time) {
+
+    if (gettimeofday( time, NULL ) != 0)
+        ftl( "Could not get time: %d\n", errno );
+}
+
+static const double mpw_showSpeed(struct timeval startTime, const unsigned int iterations, const char *operation) {
+
+    struct timeval endTime;
+    mpw_getTime( &endTime );
+
+    const time_t dsec = (endTime.tv_sec - startTime.tv_sec);
+    const suseconds_t dusec = (endTime.tv_usec - startTime.tv_usec);
+    const double elapsed = dsec + dusec / 1000000.;
+    const double speed = iterations / elapsed;
+
+    fprintf( stderr, " done.  " );
+    fprintf( stdout, "%d %s iterations in %llds %lldµs -> %.2f/s\n", iterations, operation, (long long)dsec, (long long)dusec, speed );
+
+    return speed;
+}
+
+int main(int argc, char *const argv[]) {
+
+    const char *fullName = "Robert Lee Mitchel";
+    const char *masterPassword = "banana colored duckling";
+    const char *siteName = "masterpasswordapp.com";
+    const uint32_t siteCounter = 1;
+    const MPSiteType siteType = MPSiteTypeGeneratedLong;
+    const MPSiteVariant siteVariant = MPSiteVariantPassword;
+    const char *siteContext = NULL;
+    struct timeval startTime;
+    unsigned int iterations;
+    float percent;
+    const uint8_t *masterKey;
+
+    // Start HMAC-SHA-256
+    // Similar to phase-two of mpw
+    uint8_t *sitePasswordInfo = malloc( 128 );
+    iterations = 3000000;
+    masterKey = mpw_masterKeyForUser( fullName, masterPassword, MPAlgorithmVersionCurrent );
+    if (!masterKey) {
+        ftl( "Could not allocate master key: %d\n", errno );
+        abort();
+    }
+    mpw_getTime( &startTime );
+    for (int i = 1; i <= iterations; ++i) {
+        free( (void *)mpw_hmac_sha256( masterKey, MP_dkLen, sitePasswordInfo, 128 ) );
+
+        if (modff(100.f * i / iterations, &percent) == 0)
+            fprintf( stderr, "\rhmac-sha-256: iteration %d / %d (%.0f%%)..", i, iterations, percent );
+    }
+    const double hmacSha256Speed = mpw_showSpeed( startTime, iterations, "hmac-sha-256" );
+    free( (void *)masterKey );
+
+    // Start BCrypt
+    // Similar to phase-one of mpw
+    int bcrypt_cost = 9;
+    iterations = 1000;
+    mpw_getTime( &startTime );
+    for (int i = 1; i <= iterations; ++i) {
+        crypt( masterPassword, crypt_gensalt( "$2b$", bcrypt_cost, fullName, strlen( fullName ) ) );
+
+        if (modff(100.f * i / iterations, &percent) == 0)
+            fprintf( stderr, "\rbcrypt (cost %d): iteration %d / %d (%.0f%%)..", bcrypt_cost, i, iterations, percent );
+    }
+    const double bcrypt9Speed = mpw_showSpeed( startTime, iterations, "bcrypt9" );
+
+    // Start SCrypt
+    // Phase one of mpw
+    iterations = 50;
+    mpw_getTime( &startTime );
+    for (int i = 1; i <= iterations; ++i) {
+        free( (void *)mpw_masterKeyForUser( fullName, masterPassword, MPAlgorithmVersionCurrent ) );
+
+        if (modff(100.f * i / iterations, &percent) == 0)
+            fprintf( stderr, "\rscrypt_mpw: iteration %d / %d (%.0f%%)..", i, iterations, percent );
+    }
+    const double scryptSpeed = mpw_showSpeed( startTime, iterations, "scrypt_mpw" );
+
+    // Start MPW
+    // Both phases of mpw
+    iterations = 50;
+    mpw_getTime( &startTime );
+    for (int i = 1; i <= iterations; ++i) {
+        masterKey = mpw_masterKeyForUser( fullName, masterPassword, MPAlgorithmVersionCurrent );
+        if (!masterKey) {
+            ftl( "Could not allocate master key: %d\n", errno );
+            abort();
+        }
+
+        free( (void *)mpw_passwordForSite(
+                masterKey, siteName, siteType, siteCounter, siteVariant, siteContext, MPAlgorithmVersionCurrent ) );
+        free( (void *)masterKey );
+
+        if (modff(100.f * i / iterations, &percent) == 0)
+            fprintf( stderr, "\rmpw: iteration %d / %d (%.0f%%)..", i, iterations, percent );
+    }
+    const double mpwSpeed = mpw_showSpeed( startTime, iterations, "mpw" );
+
+    // Summarize.
+    fprintf( stdout, "\n== SUMMARY ==\nOn this machine,\n" );
+    fprintf( stdout, " - mpw is %f times slower than hmac-sha-256 (reference: 320000 on an MBP Late 2013).\n", hmacSha256Speed / mpwSpeed );
+    fprintf( stdout, " - mpw is %f times slower than bcrypt (cost 9) (reference: 22 on an MBP Late 2013).\n", bcrypt9Speed / mpwSpeed );
+    fprintf( stdout, " - scrypt is %f times slower than bcrypt (cost 9) (reference: 22 on an MBP Late 2013).\n", bcrypt9Speed / scryptSpeed );
+
+    return 0;
+}

platform-independent/cli-c/mpw-cli.c

@@ -0,0 +1,238 @@
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#if defined(READLINE)
+#include <readline/readline.h>
+#elif defined(EDITLINE)
+#include <histedit.h>
+#endif
+
+#include "mpw-algorithm.h"
+#include "mpw-util.h"
+
+#define MP_env_fullname     "MP_FULLNAME"
+#define MP_env_sitetype     "MP_SITETYPE"
+#define MP_env_sitecounter  "MP_SITECOUNTER"
+#define MP_env_algorithm    "MP_ALGORITHM"
+
+static void usage() {
+
+    fprintf( stderr, "Usage: mpw [-u name] [-t type] [-c counter] [-a algorithm] [-V variant] [-C context] [-v|-q] [-h] site\n\n" );
+    fprintf( stderr, "    -u name      Specify the full name of the user.\n"
+            "                 Defaults to %s in env or prompts.\n\n", MP_env_fullname );
+    fprintf( stderr, "    -t type      Specify the password's template.\n"
+            "                 Defaults to %s in env or 'long' for password, 'name' for login.\n"
+            "                     x, max, maximum | 20 characters, contains symbols.\n"
+            "                     l, long         | Copy-friendly, 14 characters, contains symbols.\n"
+            "                     m, med, medium  | Copy-friendly, 8 characters, contains symbols.\n"
+            "                     b, basic        | 8 characters, no symbols.\n"
+            "                     s, short        | Copy-friendly, 4 characters, no symbols.\n"
+            "                     i, pin          | 4 numbers.\n"
+            "                     n, name         | 9 letter name.\n"
+            "                     p, phrase       | 20 character sentence.\n\n", MP_env_sitetype );
+    fprintf( stderr, "    -c counter   The value of the counter.\n"
+            "                 Defaults to %s in env or 1.\n\n", MP_env_sitecounter );
+    fprintf( stderr, "    -a version   The algorithm version to use.\n"
+            "                 Defaults to %s in env or %d.\n\n", MP_env_algorithm, MPAlgorithmVersionCurrent );
+    fprintf( stderr, "    -V variant   The kind of content to generate.\n"
+            "                 Defaults to 'password'.\n"
+            "                     p, password | The password to log in with.\n"
+            "                     l, login    | The username to log in as.\n"
+            "                     a, answer   | The answer to a security question.\n\n" );
+    fprintf( stderr, "    -C context   A variant-specific context.\n"
+            "                 Defaults to empty.\n"
+            "                  -V p, password | Doesn't currently use a context.\n"
+            "                  -V l, login    | Doesn't currently use a context.\n"
+            "                  -V a, answer   | Empty for a universal site answer or\n"
+            "                                 | the most significant word(s) of the question.\n\n" );
+    fprintf( stderr, "    -v           Increase output verbosity (can be repeated).\n\n" );
+    fprintf( stderr, "    -q           Decrease output verbosity (can be repeated).\n\n" );
+    fprintf( stderr, "    ENVIRONMENT\n\n"
+            "        %-14s | The full name of the user (see -u).\n"
+            "        %-14s | The default password template (see -t).\n"
+            "        %-14s | The default counter value (see -c).\n"
+            "        %-14s | The default algorithm version (see -a).\n\n",
+            MP_env_fullname, MP_env_sitetype, MP_env_sitecounter, MP_env_algorithm );
+    exit( 0 );
+}
+
+static char *homedir(const char *filename) {
+
+    char *homedir = NULL;
+    struct passwd *passwd = getpwuid( getuid() );
+    if (passwd)
+        homedir = passwd->pw_dir;
+    if (!homedir)
+        homedir = getenv( "HOME" );
+    if (!homedir)
+        homedir = getcwd( NULL, 0 );
+
+    char *homefile = NULL;
+    asprintf( &homefile, "%s/%s", homedir, filename );
+    return homefile;
+}
+
+static char *getline_prompt(const char *prompt) {
+
+    char *buf = NULL;
+    size_t bufSize = 0;
+    ssize_t lineSize;
+    fprintf( stderr, "%s", prompt );
+    fprintf( stderr, " " );
+    if ((lineSize = getline( &buf, &bufSize, stdin )) <= 1) {
+        free( buf );
+        return NULL;
+    }
+    buf[lineSize - 1] = 0;
+    return buf;
+}
+
+int main(int argc, char *const argv[]) {
+
+    // Read the environment.
+    const char *fullName = NULL;
+    const char *masterPassword = NULL;
+    const char *siteName = NULL;
+    MPSiteType siteType = MPSiteTypeGeneratedLong;
+    const char *siteTypeString = getenv( MP_env_sitetype );
+    MPSiteVariant siteVariant = MPSiteVariantPassword;
+    const char *siteVariantString = NULL;
+    const char *siteContextString = NULL;
+    uint32_t siteCounter = 1;
+    const char *siteCounterString = getenv( MP_env_sitecounter );
+    MPAlgorithmVersion algorithmVersion = MPAlgorithmVersionCurrent;
+    const char *algorithmVersionString = getenv( MP_env_algorithm );
+    if (algorithmVersionString && strlen( algorithmVersionString ))
+        if (sscanf( algorithmVersionString, "%u", &algorithmVersion ) != 1)
+            ftl( "Invalid %s: %s\n", MP_env_algorithm, algorithmVersionString );
+
+    // Read the options.
+    for (int opt; (opt = getopt( argc, argv, "u:P:t:c:V:a:C:vqh" )) != -1;)
+        switch (opt) {
+            case 'u':
+                fullName = strdup( optarg );
+                break;
+            case 'P':
+                // Do not use this.  Passing your master password via the command-line
+                // is insecure.  This is here for non-interactive testing purposes only.
+                masterPassword = strcpy( malloc( strlen( optarg ) + 1 ), optarg );
+                break;
+            case 't':
+                siteTypeString = optarg;
+                break;
+            case 'c':
+                siteCounterString = optarg;
+                break;
+            case 'V':
+                siteVariantString = optarg;
+                break;
+            case 'a':
+                if (sscanf( optarg, "%u", &algorithmVersion ) != 1)
+                    ftl( "Not a version: %s\n", optarg );
+                break;
+            case 'C':
+                siteContextString = optarg;
+                break;
+            case 'v':
+                ++mpw_verbosity;
+                break;
+            case 'q':
+                --mpw_verbosity;
+                break;
+            case 'h':
+                usage();
+                break;
+            case '?':
+                switch (optopt) {
+                    case 'u':
+                        ftl( "Missing full name to option: -%c\n", optopt );
+                        break;
+                    case 't':
+                        ftl( "Missing type name to option: -%c\n", optopt );
+                        break;
+                    case 'c':
+                        ftl( "Missing counter value to option: -%c\n", optopt );
+                        break;
+                    default:
+                        ftl( "Unknown option: -%c\n", optopt );
+                }
+            default:
+                ftl("Unexpected option: %c", opt);
+        }
+    if (optind < argc)
+        siteName = strdup( argv[optind] );
+
+    // Convert and validate input.
+    if (!fullName && (fullName = getenv( MP_env_fullname )))
+        fullName = strdup( fullName );
+    if (!fullName && !(fullName = getline_prompt( "Your full name:" )))
+        ftl( "Missing full name.\n" );
+    if (!siteName && !(siteName = getline_prompt( "Site name:" )))
+        ftl( "Missing site name.\n" );
+    if (siteCounterString)
+        siteCounter = (uint32_t)atol( siteCounterString );
+    if (siteCounter < 1)
+        ftl( "Invalid site counter: %d\n", siteCounter );
+    if (siteVariantString)
+        siteVariant = mpw_variantWithName( siteVariantString );
+    if (siteVariant == MPSiteVariantLogin)
+        siteType = MPSiteTypeGeneratedName;
+    if (siteVariant == MPSiteVariantAnswer)
+        siteType = MPSiteTypeGeneratedPhrase;
+    if (siteTypeString)
+        siteType = mpw_typeWithName( siteTypeString );
+    trc( "algorithmVersion: %u\n", algorithmVersion );
+
+    // Read the master password.
+    char *mpwConfigPath = homedir( ".mpw" );
+    if (!mpwConfigPath)
+        ftl( "Couldn't resolve path for configuration file: %d\n", errno );
+    trc( "mpwConfigPath: %s\n", mpwConfigPath );
+    FILE *mpwConfig = fopen( mpwConfigPath, "r" );
+    free( mpwConfigPath );
+    if (mpwConfig) {
+        char *line = NULL;
+        size_t linecap = 0;
+        while (getline( &line, &linecap, mpwConfig ) > 0) {
+            char *lineData = line;
+            if (strcmp( strsep( &lineData, ":" ), fullName ) == 0) {
+                masterPassword = strcpy( malloc( strlen( lineData ) ), strsep( &lineData, "\n" ) );
+                break;
+            }
+        }
+        mpw_free( line, linecap );
+    }
+    while (!masterPassword || !strlen(masterPassword))
+        masterPassword = getpass( "Your master password: " );
+
+    // Summarize operation.
+    const char *identicon = mpw_identicon( fullName, masterPassword );
+    fprintf( stderr, "%s's password for %s:\n[ %s ]: ", fullName, siteName, identicon );
+    mpw_free_string( identicon );
+
+    // Output the password.
+    const uint8_t *masterKey = mpw_masterKeyForUser(
+            fullName, masterPassword, algorithmVersion );
+    mpw_free_string( masterPassword );
+    mpw_free_string( fullName );
+    if (!masterKey)
+        ftl( "Couldn't derive master key." );
+
+    const char *sitePassword = mpw_passwordForSite(
+            masterKey, siteName, siteType, siteCounter, siteVariant, siteContextString, algorithmVersion );
+    mpw_free( masterKey, MP_dkLen );
+    mpw_free_string( siteName );
+    if (!sitePassword)
+        ftl( "Couldn't derive site password." );
+
+    fprintf( stdout, "%s\n", sitePassword );
+    mpw_free_string( sitePassword );
+
+    return 0;
+}

platform-independent/cli-c/mpw-tests-util.c

@@ -0,0 +1,76 @@
+//
+//  mpw-tests-util.c
+//  MasterPassword
+//
+//  Created by Maarten Billemont on 2014-12-21.
+//  Copyright (c) 2014 Lyndir. All rights reserved.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "mpw-util.h"
+
+#include "mpw-tests-util.h"
+
+static xmlChar const *mpw_xmlPath(xmlNodePtr context) {
+
+    if (context->parent) {
+        char *string = calloc( 256, 1 );
+        snprintf( string, 256, "%s/%s", mpw_xmlPath( context->parent ), context->name );
+        return BAD_CAST string;
+    }
+
+    return context->name? context->name: (xmlChar const *)"";
+}
+
+xmlNodePtr mpw_xmlTestCaseNode(xmlNodePtr testCaseNode, const char *nodeName) {
+
+    // Try to find an attribute node.
+    for (xmlAttrPtr child = testCaseNode->properties; child; child = child->next)
+        if (xmlStrcmp( child->name, BAD_CAST nodeName ) == 0)
+            return (xmlNodePtr)child;
+
+    // Try to find an element node.
+    for (xmlNodePtr child = testCaseNode->children; child; child = child->next)
+        if (xmlStrcmp( child->name, BAD_CAST nodeName ) == 0)
+            return child;
+
+    // Missing content, try to find parent case.
+    if (strcmp(nodeName, "parent") == 0)
+        // Was just searching for testCaseNode's parent, none found.
+        return NULL;
+    xmlChar *parentId = mpw_xmlTestCaseString( testCaseNode, "parent" );
+    if (!parentId)
+        // testCaseNode has no parent, give up.
+        return NULL;
+
+    for (xmlNodePtr otherTestCaseNode = testCaseNode->parent->children; otherTestCaseNode; otherTestCaseNode = otherTestCaseNode->next) {
+        xmlChar *id = mpw_xmlTestCaseString( otherTestCaseNode, "id" );
+        int foundParent = xmlStrcmp( id, parentId ) == 0;
+        xmlFree( id );
+
+        if (foundParent) {
+            xmlFree( parentId );
+            return mpw_xmlTestCaseNode( otherTestCaseNode, nodeName );
+        }
+    }
+
+    ftl( "Missing parent: %s, for case: %s\n", parentId, mpw_xmlTestCaseString( testCaseNode, "id" ) );
+}
+
+xmlChar *mpw_xmlTestCaseString(xmlNodePtr context, const char *nodeName) {
+
+    xmlNodePtr child = mpw_xmlTestCaseNode( context, nodeName );
+    return xmlNodeGetContent( child );
+}
+
+uint32_t mpw_xmlTestCaseInteger(xmlNodePtr context, const char *nodeName) {
+
+    xmlChar *string = mpw_xmlTestCaseString( context, nodeName );
+    uint32_t integer = (uint32_t)atol( (char *)string );
+    xmlFree( string );
+
+    return integer;
+}

platform-independent/cli-c/mpw-tests-util.h

@@ -0,0 +1,16 @@
+//
+//  mpw-tests-util.h
+//  MasterPassword
+//
+//  Created by Maarten Billemont on 2014-12-21.
+//  Copyright (c) 2014 Lyndir. All rights reserved.
+//
+
+#include <libxml/parser.h>
+
+xmlNodePtr mpw_xmlTestCaseNode(
+        xmlNodePtr testCaseNode, const char *nodeName);
+xmlChar *mpw_xmlTestCaseString(
+        xmlNodePtr context, const char *nodeName);
+uint32_t mpw_xmlTestCaseInteger(
+        xmlNodePtr context, const char *nodeName);

platform-independent/cli-c/mpw-tests.c

@@ -0,0 +1,81 @@
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define ftl(...) do { fprintf( stderr, __VA_ARGS__ ); exit(2); } while (0)
+
+#include "mpw-algorithm.h"
+#include "mpw-util.h"
+
+#include "mpw-tests-util.h"
+
+int main(int argc, char *const argv[]) {
+
+    int failedTests = 0;
+
+    xmlNodePtr tests = xmlDocGetRootElement( xmlParseFile( "mpw_tests.xml" ) );
+    for (xmlNodePtr testCase = tests->children; testCase; testCase = testCase->next) {
+        if (testCase->type != XML_ELEMENT_NODE || xmlStrcmp( testCase->name, BAD_CAST "case" ) != 0)
+            continue;
+
+        // Read in the test case.
+        xmlChar *id = mpw_xmlTestCaseString( testCase, "id" );
+        uint32_t algorithm = mpw_xmlTestCaseInteger( testCase, "algorithm" );
+        xmlChar *fullName = mpw_xmlTestCaseString( testCase, "fullName" );
+        xmlChar *masterPassword = mpw_xmlTestCaseString( testCase, "masterPassword" );
+        xmlChar *keyID = mpw_xmlTestCaseString( testCase, "keyID" );
+        xmlChar *siteName = mpw_xmlTestCaseString( testCase, "siteName" );
+        uint32_t siteCounter = mpw_xmlTestCaseInteger( testCase, "siteCounter" );
+        xmlChar *siteTypeString = mpw_xmlTestCaseString( testCase, "siteType" );
+        xmlChar *siteVariantString = mpw_xmlTestCaseString( testCase, "siteVariant" );
+        xmlChar *siteContext = mpw_xmlTestCaseString( testCase, "siteContext" );
+        xmlChar *result = mpw_xmlTestCaseString( testCase, "result" );
+
+        MPSiteType siteType = mpw_typeWithName( (char *)siteTypeString );
+        MPSiteVariant siteVariant = mpw_variantWithName( (char *)siteVariantString );
+
+        // Run the test case.
+        fprintf( stdout, "test case %s... ", id );
+        if (!xmlStrlen( result )) {
+            fprintf( stdout, "abstract.\n" );
+            continue;
+        }
+
+        // 1. calculate the master key.
+        const uint8_t *masterKey = mpw_masterKeyForUser(
+                (char *)fullName, (char *)masterPassword, algorithm );
+        if (!masterKey)
+            ftl( "Couldn't derive master key." );
+
+        // 2. calculate the site password.
+        const char *sitePassword = mpw_passwordForSite(
+                masterKey, (char *)siteName, siteType, siteCounter, siteVariant, (char *)siteContext, algorithm );
+        mpw_free( masterKey, MP_dkLen );
+        if (!sitePassword)
+            ftl( "Couldn't derive site password." );
+
+        // Check the result.
+        if (xmlStrcmp( result, BAD_CAST sitePassword ) == 0)
+            fprintf( stdout, "pass.\n" );
+
+        else {
+            ++failedTests;
+            fprintf( stdout, "FAILED!  (got %s != expected %s)\n", sitePassword, result );
+        }
+
+        // Free test case.
+        mpw_free_string( sitePassword );
+        xmlFree( id );
+        xmlFree( fullName );
+        xmlFree( masterPassword );
+        xmlFree( keyID );
+        xmlFree( siteName );
+        xmlFree( siteTypeString );
+        xmlFree( siteVariantString );
+        xmlFree( siteContext );
+        xmlFree( result );
+    }
+
+    return failedTests;
+}

platform-independent/cli-c/mpw.bashrc

@@ -0,0 +1,24 @@
+## Added by Master Password
+source bashlib
+mpw() {
+    _copy() {
+        if hash pbcopy 2>/dev/null; then
+            pbcopy
+        elif hash xclip 2>/dev/null; then
+            xclip -selection clip
+        else
+            cat; echo 2>/dev/null
+            return
+        fi
+        echo >&2 "Copied!"
+    }
+
+    # Empty the clipboard
+    :| _copy 2>/dev/null
+
+    # Ask for the user's name and password if not yet known.
+    MP_FULLNAME=${MP_FULLNAME:-$(ask 'Your Full Name:')}
+
+    # Start Master Password and copy the output.
+    printf %s "$(MP_FULLNAME=$MP_FULLNAME command mpw "$@")" | _copy
+}

platform-independent/cli-c/mpw.completion.bash

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+source bashcomplib
+
+# completing the 'mpw' command.
+_comp_mpw() {
+    local optarg= cword=${COMP_WORDS[COMP_CWORD]} pcword=
+    (( COMP_CWORD )) && pcword=${COMP_WORDS[COMP_CWORD - 1]} 
+
+    case $pcword in
+        -u) # complete full names.
+            COMPREPLY=( ~/.mpw.d/*.mpsites )
+            [[ -e $COMPREPLY ]] || COMPREPLY=()
+            COMPREPLY=( "${COMPREPLY[@]##*/}" ) COMPREPLY=( "${COMPREPLY[@]%.mpsites}" )
+            ;;
+        -t) # complete types.
+            COMPREPLY=( maximum long medium basic short pin name phrase )
+            ;;
+        -c) # complete counter.
+            COMPREPLY=( 1 )
+            ;;
+        -V) # complete versions.
+            COMPREPLY=( 0 1 2 3 )
+            ;;
+        -v) # complete variants.
+            COMPREPLY=( password login answer )
+            ;;
+        -C) # complete context.
+            ;;
+        *)
+            # previous word is not an option we can complete, complete site name (or option if leading -)
+            if [[ $cword = -* ]]; then
+                COMPREPLY=( -u -t -c -V -v -C )
+            else
+                local w fullName=$MP_FULLNAME
+                for (( w = 0; w < ${#COMP_WORDS[@]}; ++w )); do
+                    [[ ${COMP_WORDS[w]} = -u ]] && fullName=$(xargs <<< "${COMP_WORDS[w + 1]}") && break
+                done
+                if [[ -e ~/.mpw.d/"$fullName.mpsites" ]]; then
+                    IFS=$'\n' read -d '' -ra COMPREPLY < <(awk -F$'\t' '!/^ *#/{sub(/^ */, "", $2); print $2}' ~/.mpw.d/"$fullName.mpsites")
+                    printf -v _comp_title 'Sites for %s' "$fullName"
+                else
+                    # Default list from the Alexa Top 500
+                    COMPREPLY=(
+                        163.com 360.cn 9gag.com adobe.com alibaba.com aliexpress.com amazon.com
+                        apple.com archive.org ask.com baidu.com battle.net booking.com buzzfeed.com
+                        chase.com cnn.com comcast.net craigslist.org dailymotion.com dell.com
+                        deviantart.com diply.com disqus.com dropbox.com ebay.com engadget.com
+                        espn.go.com evernote.com facebook.com fedex.com feedly.com flickr.com
+                        flipkart.com github.com gizmodo.com go.com goodreads.com google.com
+                        huffingtonpost.com hulu.com ign.com ikea.com imdb.com imgur.com
+                        indiatimes.com instagram.com jd.com kickass.to kickstarter.com linkedin.com
+                        live.com livedoor.com mail.ru mozilla.org naver.com netflix.com newegg.com
+                        nicovideo.jp nytimes.com pandora.com paypal.com pinterest.com pornhub.com
+                        qq.com rakuten.co.jp reddit.com redtube.com shutterstock.com skype.com
+                        soso.com spiegel.de spotify.com stackexchange.com steampowered.com
+                        stumbleupon.com taobao.com target.com thepiratebay.se tmall.com
+                        torrentz.eu tripadvisor.com tube8.com tubecup.com tudou.com tumblr.com
+                        twitter.com uol.com.br vimeo.com vk.com walmart.com weibo.com whatsapp.com
+                        wikia.com wikipedia.org wired.com wordpress.com xhamster.com xinhuanet.com
+                        xvideos.com yahoo.com yandex.ru yelp.com youku.com youporn.com ziddu.com
+                    )
+                fi
+            fi ;;
+    esac
+    _comp_finish_completions
+}
+
+#complete -F _show_args mpw
+complete -o nospace -F _comp_mpw mpw

platform-independent/cli-java/build.gradle

@@ -0,0 +1,14 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'com.github.johnrengelman.shadow' version '1.2.4'
+}
+
+description = 'Master Password CLI'
+mainClassName = 'com.lyndir.masterpassword.CLI'
+
+dependencies {
+    compile project(':masterpassword-algorithm')
+
+    compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
+}

platform-independent/cli-java/pom.xml

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- PROJECT METADATA -->
+    <parent>
+        <groupId>com.lyndir.masterpassword</groupId>
+        <artifactId>masterpassword</artifactId>
+        <version>GIT-SNAPSHOT</version>
+    </parent>
+
+    <name>Master Password CLI</name>
+    <description>A CLI interface to the Master Password algorithm</description>
+
+    <artifactId>masterpassword-cli</artifactId>
+    <packaging>jar</packaging>
+
+    <!-- BUILD CONFIGURATION -->
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/scripts</directory>
+                <filtering>true</filtering>
+                <targetPath>${project.build.directory}</targetPath>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <id>prepare-package</id>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <target>
+                                <chmod file="${project.build.directory}/install" perm="755" />
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>com.lyndir.masterpassword.CLI</mainClass>
+                                </transformer>
+                            </transformers>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- DEPENDENCY MANAGEMENT -->
+    <dependencies>
+
+        <!-- PROJECT REFERENCES -->
+        <dependency>
+            <groupId>com.lyndir.masterpassword</groupId>
+            <artifactId>masterpassword-algorithm</artifactId>
+            <version>GIT-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

platform-independent/cli-java/src/main/java/com/lyndir/masterpassword/CLI.java

@@ -0,0 +1,185 @@
+/*
+ *   Copyright 2008, Maarten Billemont
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+package com.lyndir.masterpassword;
+
+import static com.lyndir.lhunath.opal.system.util.ObjectUtils.ifNotNullElse;
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.Maps;
+import com.google.common.io.LineReader;
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.lhunath.opal.system.util.ConversionUtils;
+import com.lyndir.lhunath.opal.system.util.StringUtils;
+import java.io.*;
+import java.util.Arrays;
+import java.util.Map;
+
+
+/**
+ * <p> <i>Jun 10, 2008</i> </p>
+ *
+ * @author mbillemo
+ */
+public class CLI {
+
+    public static void main(final String[] args)
+            throws IOException {
+
+        // Read information from the environment.
+        char[] masterPassword;
+        String siteName = null, context = null;
+        String userName = System.getenv( MPConstant.env_userName );
+        String siteTypeName = ifNotNullElse( System.getenv( MPConstant.env_siteType ), "" );
+        MPSiteType siteType = siteTypeName.isEmpty()? MPSiteType.GeneratedLong: MPSiteType.forOption( siteTypeName );
+        MPSiteVariant variant = MPSiteVariant.Password;
+        String siteCounterName = ifNotNullElse( System.getenv( MPConstant.env_siteCounter ), "" );
+        UnsignedInteger siteCounter = siteCounterName.isEmpty()? UnsignedInteger.valueOf( 1 ): UnsignedInteger.valueOf( siteCounterName );
+
+        // Parse information from option arguments.
+        boolean userNameArg = false, typeArg = false, counterArg = false, variantArg = false, contextArg = false;
+        for (final String arg : Arrays.asList( args ))
+            // Full Name
+            if ("-u".equals( arg ) || "--username".equals( arg ))
+                userNameArg = true;
+            else if (userNameArg) {
+                userName = arg;
+                userNameArg = false;
+            }
+
+            // Type
+            else if ("-t".equals( arg ) || "--type".equals( arg ))
+                typeArg = true;
+            else if (typeArg) {
+                siteType = MPSiteType.forOption( arg );
+                typeArg = false;
+            }
+
+            // Counter
+            else if ("-c".equals( arg ) || "--counter".equals( arg ))
+                counterArg = true;
+            else if (counterArg) {
+                siteCounter = UnsignedInteger.valueOf( arg );
+                counterArg = false;
+            }
+
+            // Variant
+            else if ("-v".equals( arg ) || "--variant".equals( arg ))
+                variantArg = true;
+            else if (variantArg) {
+                variant = MPSiteVariant.forOption( arg );
+                variantArg = false;
+            }
+
+            // Context
+            else if ("-C".equals( arg ) || "--context".equals( arg ))
+                contextArg = true;
+            else if (contextArg) {
+                context = arg;
+                contextArg = false;
+            }
+
+            // Help
+            else if ("-h".equals( arg ) || "--help".equals( arg )) {
+                System.out.println();
+                System.out.format( "Usage: mpw [-u name] [-t type] [-c counter] site\n\n" );
+                System.out.format( "    -u name      Specify the full name of the user.\n" );
+                System.out.format( "                 Defaults to %s in env.\n\n", MPConstant.env_userName );
+                System.out.format( "    -t type      Specify the password's template.\n" );
+                System.out.format( "                 Defaults to %s in env or 'long' for password, 'name' for login.\n", MPConstant.env_siteType );
+
+                int optionsLength = 0;
+                Map<String, MPSiteType> typeMap = Maps.newLinkedHashMap();
+                for (MPSiteType elementType : MPSiteType.values()) {
+                    String options = Joiner.on( ", " ).join( elementType.getOptions() );
+                    typeMap.put( options, elementType );
+                    optionsLength = Math.max( optionsLength, options.length() );
+                }
+                for (Map.Entry<String, MPSiteType> entry : typeMap.entrySet()) {
+                    String infoString = strf( "                  -v %" + optionsLength + "s | ", entry.getKey() );
+                    String infoNewline = "\n" + StringUtils.repeat( " ", infoString.length() - 3 ) + " | ";
+                    infoString += entry.getValue().getDescription().replaceAll( "\n", infoNewline );
+                    System.out.println( infoString );
+                }
+                System.out.println();
+
+                System.out.format( "    -c counter   The value of the counter.\n" );
+                System.out.format( "                 Defaults to %s in env or '1'.\n\n", MPConstant.env_siteCounter );
+                System.out.format( "    -v variant   The kind of content to generate.\n" );
+                System.out.format( "                 Defaults to 'password'.\n" );
+
+                optionsLength = 0;
+                Map<String, MPSiteVariant> variantMap = Maps.newLinkedHashMap();
+                for (MPSiteVariant elementVariant : MPSiteVariant.values()) {
+                    String options = Joiner.on( ", " ).join( elementVariant.getOptions() );
+                    variantMap.put( options, elementVariant );
+                    optionsLength = Math.max( optionsLength, options.length() );
+                }
+                for (Map.Entry<String, MPSiteVariant> entry : variantMap.entrySet()) {
+                    String infoString = strf( "                  -v %" + optionsLength + "s | ", entry.getKey() );
+                    String infoNewline = "\n" + StringUtils.repeat( " ", infoString.length() - 3 ) + " | ";
+                    infoString += entry.getValue().getDescription().replaceAll( "\n", infoNewline );
+                    System.out.println( infoString );
+                }
+                System.out.println();
+
+                System.out.format( "    -C context   A variant-specific context.\n" );
+                System.out.format( "                 Defaults to empty.\n" );
+                for (Map.Entry<String, MPSiteVariant> entry : variantMap.entrySet()) {
+                    String infoString = strf( "                  -v %" + optionsLength + "s | ", entry.getKey() );
+                    String infoNewline = "\n" + StringUtils.repeat( " ", infoString.length() - 3 ) + " | ";
+                    infoString += entry.getValue().getContextDescription().replaceAll( "\n", infoNewline );
+                    System.out.println( infoString );
+                }
+                System.out.println();
+
+                System.out.format( "    ENVIRONMENT\n\n" );
+                System.out.format( "        MP_USERNAME    | The full name of the user.\n" );
+                System.out.format( "        MP_SITETYPE    | The default password template.\n" );
+                System.out.format( "        MP_SITECOUNTER | The default counter value.\n\n" );
+                return;
+            } else
+                siteName = arg;
+
+        // Read missing information from the console.
+        Console console = System.console();
+        try (InputStreamReader inReader = new InputStreamReader( System.in )) {
+            LineReader lineReader = new LineReader( inReader );
+
+            if (siteName == null) {
+                System.err.format( "Site name: " );
+                siteName = lineReader.readLine();
+            }
+
+            if (userName == null) {
+                System.err.format( "User's name: " );
+                userName = lineReader.readLine();
+            }
+
+            if (console != null)
+                masterPassword = console.readPassword( "%s's master password: ", userName );
+
+            else {
+                System.err.format( "%s's master password: ", userName );
+                masterPassword = lineReader.readLine().toCharArray();
+            }
+        }
+
+        // Encode and write out the site password.
+        System.out.println( MasterKey.create( userName, masterPassword ).encode( siteName, siteType, siteCounter, variant, context ) );
+    }
+}

platform-independent/cli-java/src/main/java/com/lyndir/masterpassword/package-info.java

@@ -0,0 +1,10 @@
+/**
+ *
+ * @author lhunath, 15-02-04
+ */
+
+
+@ParametersAreNonnullByDefault
+package com.lyndir.masterpassword;
+
+import javax.annotation.ParametersAreNonnullByDefault;

platform-independent/cli-java/src/main/resources/logback.xml

@@ -0,0 +1,15 @@
+<configuration scan="false">
+
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%-8relative %22c{0} [%-5level] %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="com.lyndir" level="${mp.log.level:-INFO}" />
+
+    <root level="INFO">
+        <appender-ref ref="stdout" />
+    </root>
+
+</configuration>

platform-independent/cli-java/src/main/scripts/install

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+#
+# Install the Master Password CLI tool.
+set -e
+cd "${BASH_SOURCE%/*}"
+source bashlib
+
+inf "This will install the mpw tool."
+
+# Try to guess then ask for the bin dir to install to.
+IFS=: read -a paths <<< "$PATH"
+if inArray ~/bin "${paths[@]}"; then
+    bindir=~/bin
+elif inArray ~/.bin "${paths[@]}"; then
+    bindir=~/.bin
+elif inArray /usr/local/bin "${paths[@]}"; then
+    bindir=/usr/local/bin
+else
+    bindir=~/bin
+fi
+bindir=$(ask -d "$bindir" "What bin directory should I install to?")
+[[ -d "$bindir" ]] || mkdir "$bindir" || ftl 'Cannot create missing bin directory: %s' "$bindir" || exit
+[[ -w "$bindir" ]] || ftl 'Cannot write to bin directory: %s' "$bindir" || exit
+
+# Try to guess then ask for the share dir to install to.
+sharedir=$(cd -P "$bindir/.."; [[ $bindir = */.bin ]] && printf '%s/.share' "$PWD" || printf '%s/share' "$PWD")
+sharedir=$(ask -d "$sharedir" "What share directory should I install to?")
+[[ -d "$sharedir" ]] || mkdir "$sharedir" || ftl 'Cannot create missing share directory: %s' "$sharedir" || exit
+[[ -w "$sharedir" ]] || ftl 'Cannot write to share directory: %s' "$sharedir" || exit
+
+# Install Master Password.
+sharepath=$sharedir/masterpassword
+mkdir -p "$sharepath"
+cp -a "masterpassword-cli-"*".jar" bashlib mpw "$sharepath"
+ex -c "%s~%SHAREPATH%~$sharepath~g|x" "$sharepath/mpw"
+ln -sf "$sharepath/mpw" "$bindir/mpw"
+chmod +x "$sharepath/mpw"
+[[ ! -e "$bindir/bashlib" ]] && ln -s "$sharepath/bashlib" "$bindir/bashlib" ||:
+
+# Convenience bash function.
+inf "Installation successful!"
+echo
+inf "To improve usability, you can install an mpw function in your bash shell."
+inf "This function adds the following features:"
+inf "  - Ask the Master Password once, remember in the shell."
+inf "  - Automatically put the password in the clipboard (some platforms)."
+echo
+inf "To do this you need the following function in ~/.bashrc:\n%s" "$(<mpw.bashrc)"
+echo
+inf "We can do this for you automatically now."
+if ask -c Y!n "Append the mpw function to your .bashrc?"; then
+    cat mpw.bashrc >> ~/.bashrc
+    inf "Done!  Don't forget to run '%s' to apply the changes!" "source ~/.bashrc"
+fi
+echo
+inf "To begin using Master Password, type: mpw [site name]"

platform-independent/cli-java/src/main/scripts/mpw

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Uncomment this to set your user name.  Master Password will no longer ask you for a user name.
+# export MP_USERNAME="Robert Lee Mitchell"
+# Uncomment this to hardcode your master password.  Make sure this file's permissions are tight.  Master Password will not ask you for your master password anymore.  This is probably not a good idea.
+# export MP_PASSWORD="banana colored duckling"
+
+cd "%SHAREPATH%"
+exec java -jar masterpassword-cli-GIT-SNAPSHOT.jar "$@"

platform-independent/cli-java/src/main/scripts/mpw.bashrc

@@ -0,0 +1,15 @@
+source bashlib
+mpw() {
+    _nocopy() { echo >&2 "$(cat)"; }
+    _copy() { "$(type -P pbcopy || type -P xclip || echo _nocopy)"; }
+
+    # Empty the clipboard
+    :| _copy 2>/dev/null
+
+    # Ask for the user's name and password if not yet known.
+    MP_USERNAME=${MP_USERNAME:-$(ask -s 'Your Full Name:')}
+    MP_PASSWORD=${MP_PASSWORD:-$(ask -s 'Master Password:')}
+
+    # Start Master Password and copy the output.
+    printf %s "$(MP_USERNAME=$MP_USERNAME MP_PASSWORD=$MP_PASSWORD command mpw "$@")" | _copy
+}

platform-independent/gui-java/build.gradle

@@ -0,0 +1,15 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'com.github.johnrengelman.shadow' version '1.2.4'
+}
+
+description = 'Master Password GUI'
+mainClassName = 'com.lyndir.masterpassword.gui.GUI'
+
+dependencies {
+    compile project(':masterpassword-model')
+
+    compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
+    compile group: 'com.yuvimasory', name: 'orange-extensions', version:'1.3.0'
+}

platform-independent/gui-java/pom.xml

@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- PROJECT METADATA -->
+    <parent>
+        <groupId>com.lyndir.masterpassword</groupId>
+        <artifactId>masterpassword</artifactId>
+        <version>GIT-SNAPSHOT</version>
+    </parent>
+
+    <name>Master Password GUI</name>
+    <description>A GUI interface to the Master Password algorithm</description>
+
+    <artifactId>masterpassword-gui</artifactId>
+    <packaging>jar</packaging>
+
+    <!-- BUILD CONFIGURATION -->
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>com.lyndir.masterpassword.gui.GUI</mainClass>
+                                </transformer>
+                            </transformers>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                        <artifactId>android-maven-plugin</artifactId>
+
+                        <configuration>
+                            <sign>
+                                <debug>false</debug>
+                            </sign>
+                        </configuration>
+
+                        <executions>
+                            <execution>
+                                <id>manifest-update</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>manifest-update</goal>
+                                </goals>
+                                <configuration>
+                                    <manifestVersionCodeUpdateFromVersion>true</manifestVersionCodeUpdateFromVersion>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jarsigner-plugin</artifactId>
+                        <version>1.4</version>
+                        <executions>
+                            <execution>
+                                <id>signing</id>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                                <phase>package</phase>
+                                <inherited>true</inherited>
+                                <configuration>
+                                    <archiveDirectory />
+                                    <includes>
+                                        <include>target/*.jar</include>
+                                    </includes>
+                                    <keystore>release.jks</keystore>
+                                    <storepass>${env.PASSWORD}</storepass>
+                                    <keypass>${env.PASSWORD}</keypass>
+                                    <alias>masterpassword-desktop</alias>
+                                    <arguments>
+                                      <argument>-sigalg</argument><argument>MD5withRSA</argument>
+                                      <argument>-digestalg</argument><argument>SHA1</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <!-- DEPENDENCY MANAGEMENT -->
+    <dependencies>
+
+        <!-- PROJECT REFERENCES -->
+        <dependency>
+            <groupId>com.lyndir.masterpassword</groupId>
+            <artifactId>masterpassword-model</artifactId>
+            <version>GIT-SNAPSHOT</version>
+        </dependency>
+
+        <!-- EXTERNAL DEPENDENCIES -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+
+        <!-- STUBS -->
+        <dependency>
+            <!-- http://ymasory.github.io/OrangeExtensions/ -->
+            <groupId>com.yuvimasory</groupId>
+            <artifactId>orange-extensions</artifactId>
+            <version>1.3.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

platform-independent/gui-java/release.jks

@@ -0,0 +1 @@
+/Users/lhunath/SpiderOak Hive/secret/release-com.lyndir.masterpassword.jks

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/AuthenticationPanel.java

@@ -0,0 +1,64 @@
+package com.lyndir.masterpassword.gui;
+
+import com.google.common.collect.ImmutableList;
+import com.lyndir.masterpassword.MPIdenticon;
+import com.lyndir.masterpassword.gui.util.Components;
+import java.awt.*;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.swing.*;
+import org.jetbrains.annotations.NotNull;
+
+
+/**
+ * @author lhunath, 2014-06-11
+ */
+public abstract class AuthenticationPanel extends Components.GradientPanel {
+
+    protected final UnlockFrame unlockFrame;
+    protected final JLabel      avatarLabel;
+
+    public AuthenticationPanel(final UnlockFrame unlockFrame) {
+        super( null, null );
+        this.unlockFrame = unlockFrame;
+
+        setLayout( new BoxLayout( this, BoxLayout.PAGE_AXIS ) );
+
+        // Avatar
+        add( Box.createVerticalGlue() );
+        add( avatarLabel = new JLabel( Res.avatar( 0 ) ) {
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, Integer.MAX_VALUE );
+            }
+        } );
+        add( Box.createVerticalGlue() );
+
+        avatarLabel.setToolTipText( "The avatar for your user.  Click to change it." );
+    }
+
+    protected void updateUser(boolean repack) {
+        unlockFrame.updateUser( getSelectedUser() );
+        validate();
+
+        if (repack)
+            unlockFrame.repack();
+    }
+
+    @Nullable
+    protected abstract User getSelectedUser();
+
+    @NotNull
+    @Nonnull
+    public abstract char[] getMasterPassword();
+
+    public Component getFocusComponent() {
+        return null;
+    }
+
+    public Iterable<? extends JButton> getButtons() {
+        return ImmutableList.of();
+    }
+
+    public abstract void reset();
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Config.java

@@ -0,0 +1,21 @@
+package com.lyndir.masterpassword.gui;
+
+import com.lyndir.lhunath.opal.system.util.ConversionUtils;
+import com.lyndir.masterpassword.MPConstant;
+
+
+/**
+ * @author lhunath, 2014-08-31
+ */
+public class Config {
+
+    private static final Config instance = new Config();
+
+    public static Config get() {
+        return instance;
+    }
+
+    public boolean checkForUpdates() {
+        return ConversionUtils.toBoolean( System.getenv( MPConstant.env_checkUpdates ) ).or( true );
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java

@@ -0,0 +1,111 @@
+/*
+ *   Copyright 2008, Maarten Billemont
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+
+package com.lyndir.masterpassword.gui;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.*;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import com.lyndir.lhunath.opal.system.util.TypeUtils;
+
+import java.io.*;
+import java.net.URI;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.jar.*;
+import javax.swing.*;
+
+
+/**
+ * <p> <i>Jun 10, 2008</i> </p>
+ *
+ * @author mbillemo
+ */
+public class GUI implements UnlockFrame.SignInCallback {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( GUI.class );
+
+    private final UnlockFrame unlockFrame = new UnlockFrame( this );
+    private PasswordFrame passwordFrame;
+
+    public static void main(final String[] args)
+            throws IOException {
+
+        if (Config.get().checkForUpdates())
+            checkUpdate();
+
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        }
+        catch (UnsupportedLookAndFeelException | ClassNotFoundException | InstantiationException | IllegalAccessException ignored) {
+        }
+
+        TypeUtils.<GUI>newInstance( "com.lyndir.masterpassword.gui.platform.mac.AppleGUI" ).or( new GUI() ).open();
+    }
+
+    private static void checkUpdate() {
+        try {
+            Enumeration<URL> manifestURLs = Thread.currentThread().getContextClassLoader().getResources( JarFile.MANIFEST_NAME );
+            while (manifestURLs.hasMoreElements()) {
+                InputStream manifestStream = manifestURLs.nextElement().openStream();
+                Attributes attributes = new Manifest( manifestStream ).getMainAttributes();
+                if (!GUI.class.getCanonicalName().equals( attributes.getValue( Attributes.Name.MAIN_CLASS ) ))
+                    continue;
+
+                String manifestRevision = attributes.getValue( Attributes.Name.IMPLEMENTATION_VERSION );
+                String upstreamRevisionURL = "http://masterpasswordapp.com/masterpassword-gui.jar.rev";
+                CharSource upstream = Resources.asCharSource( URI.create( upstreamRevisionURL ).toURL(), Charsets.UTF_8 );
+                String upstreamRevision = upstream.readFirstLine();
+                logger.inf( "Local Revision:    <%s>", manifestRevision );
+                logger.inf( "Upstream Revision: <%s>", upstreamRevision );
+                if (manifestRevision != null && !manifestRevision.equalsIgnoreCase( upstreamRevision )) {
+                    logger.wrn( "You are not running the current official version.  Please update from:\n"
+                                + "http://masterpasswordapp.com/masterpassword-gui.jar" );
+                    JOptionPane.showMessageDialog( null, "A new version of Master Password is available.\n"
+                                                         + "Please download the latest version from http://masterpasswordapp.com",
+                                                   "Update Available", JOptionPane.WARNING_MESSAGE );
+                }
+            }
+        }
+        catch (IOException e) {
+            logger.wrn( e, "Couldn't check for version update." );
+        }
+    }
+
+    protected void open() {
+        SwingUtilities.invokeLater( new Runnable() {
+            @Override
+            public void run() {
+                if (passwordFrame == null)
+                    unlockFrame.setVisible( true );
+                else
+                    passwordFrame.setVisible( true );
+            }
+        } );
+    }
+
+    @Override
+    public void signedIn(final User user) {
+        passwordFrame = newPasswordFrame( user );
+        open();
+    }
+
+    protected PasswordFrame newPasswordFrame(final User user) {
+        return new PasswordFrame( user );
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/IncognitoAuthenticationPanel.java

@@ -0,0 +1,88 @@
+package com.lyndir.masterpassword.gui;
+
+import com.lyndir.masterpassword.gui.util.Components;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import org.jetbrains.annotations.NotNull;
+
+
+/**
+ * @author lhunath, 2014-06-11
+ */
+public class IncognitoAuthenticationPanel extends AuthenticationPanel implements DocumentListener, ActionListener {
+
+    private final JTextField     fullNameField;
+    private final JPasswordField masterPasswordField;
+
+    public IncognitoAuthenticationPanel(final UnlockFrame unlockFrame) {
+
+        // Full Name
+        super( unlockFrame );
+        add( Components.stud() );
+
+        JLabel fullNameLabel = Components.label( "Full Name:" );
+        add( fullNameLabel );
+
+        fullNameField = Components.textField();
+        fullNameField.setFont( Res.valueFont().deriveFont( 12f ) );
+        fullNameField.getDocument().addDocumentListener( this );
+        fullNameField.addActionListener( this );
+        add( fullNameField );
+        add( Components.stud() );
+
+        // Master Password
+        JLabel masterPasswordLabel = Components.label( "Master Password:" );
+        add( masterPasswordLabel );
+
+        masterPasswordField = Components.passwordField();
+        masterPasswordField.addActionListener( this );
+        masterPasswordField.getDocument().addDocumentListener( this );
+        add( masterPasswordField );
+    }
+
+    @Override
+    public Component getFocusComponent() {
+        return fullNameField;
+    }
+
+    @Override
+    public void reset() {
+        masterPasswordField.setText( "" );
+    }
+
+    @Override
+    protected User getSelectedUser() {
+        return new IncognitoUser( fullNameField.getText() );
+    }
+
+    @NotNull
+    @Override
+    public char[] getMasterPassword() {
+        return masterPasswordField.getPassword();
+    }
+
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        updateUser( false );
+        unlockFrame.trySignIn( fullNameField, masterPasswordField );
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/IncognitoSite.java

@@ -0,0 +1,59 @@
+package com.lyndir.masterpassword.gui;
+
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.masterpassword.MPSiteType;
+import com.lyndir.masterpassword.MasterKey;
+
+
+/**
+ * @author lhunath, 14-12-16
+ */
+public class IncognitoSite extends Site {
+
+    private String            siteName;
+    private MPSiteType        siteType;
+    private UnsignedInteger   siteCounter;
+    private MasterKey.Version algorithmVersion;
+
+    public IncognitoSite(final String siteName, final MPSiteType siteType, final UnsignedInteger siteCounter,
+                         final MasterKey.Version algorithmVersion) {
+        this.siteName = siteName;
+        this.siteType = siteType;
+        this.siteCounter = siteCounter;
+        this.algorithmVersion = algorithmVersion;
+    }
+
+    public String getSiteName() {
+        return siteName;
+    }
+
+    public void setSiteName(final String siteName) {
+        this.siteName = siteName;
+    }
+
+    public MPSiteType getSiteType() {
+        return siteType;
+    }
+
+    public void setSiteType(final MPSiteType siteType) {
+        this.siteType = siteType;
+    }
+
+    @Override
+    public MasterKey.Version getAlgorithmVersion() {
+        return algorithmVersion;
+    }
+
+    @Override
+    public void setAlgorithmVersion(final MasterKey.Version algorithmVersion) {
+        this.algorithmVersion = algorithmVersion;
+    }
+
+    public UnsignedInteger getSiteCounter() {
+        return siteCounter;
+    }
+
+    public void setSiteCounter(final UnsignedInteger siteCounter) {
+        this.siteCounter = siteCounter;
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/IncognitoUser.java

@@ -0,0 +1,48 @@
+package com.lyndir.masterpassword.gui;
+
+import com.google.common.collect.ImmutableList;
+import com.lyndir.masterpassword.model.IncorrectMasterPasswordException;
+import javax.annotation.Nullable;
+
+
+/**
+ * @author lhunath, 2014-06-08
+ */
+public class IncognitoUser extends User {
+
+    private final String fullName;
+    private       char[] masterPassword;
+
+    public IncognitoUser(final String fullName) {
+        this.fullName = fullName;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    @Nullable
+    @Override
+    protected char[] getMasterPassword() {
+        return masterPassword;
+    }
+
+    @Override
+    public void authenticate(final char[] masterPassword)
+            throws IncorrectMasterPasswordException {
+        this.masterPassword = masterPassword;
+    }
+
+    @Override
+    public Iterable<Site> findSitesByName(final String siteName) {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public void addSite(final Site site) {
+    }
+
+    @Override
+    public void deleteSite(Site site) {
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/ModelAuthenticationPanel.java

@@ -0,0 +1,211 @@
+package com.lyndir.masterpassword.gui;
+
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
+
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.*;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import com.lyndir.masterpassword.model.MPUser;
+import com.lyndir.masterpassword.model.MPUserFileManager;
+import com.lyndir.masterpassword.gui.util.Components;
+import java.awt.*;
+import java.awt.event.*;
+import javax.annotation.Nullable;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.plaf.metal.MetalComboBoxEditor;
+import org.jetbrains.annotations.NotNull;
+
+
+/**
+ * @author lhunath, 2014-06-11
+ */
+public class ModelAuthenticationPanel extends AuthenticationPanel implements ItemListener, ActionListener, DocumentListener {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( ModelAuthenticationPanel.class );
+
+    private final JComboBox<ModelUser> userField;
+    private final JLabel               masterPasswordLabel;
+    private final JPasswordField       masterPasswordField;
+
+    public ModelAuthenticationPanel(final UnlockFrame unlockFrame) {
+        super( unlockFrame );
+        add( Components.stud() );
+
+        // Avatar
+        avatarLabel.addMouseListener( new MouseAdapter() {
+            @Override
+            public void mouseClicked(final MouseEvent e) {
+                ModelUser selectedUser = getSelectedUser();
+                if (selectedUser != null) {
+                    selectedUser.setAvatar( selectedUser.getAvatar() + 1 );
+                    updateUser( false );
+                }
+            }
+        } );
+
+        // User
+        JLabel userLabel = Components.label( "User:" );
+        add( userLabel );
+
+        userField = Components.comboBox( readConfigUsers() );
+        userField.setFont( Res.valueFont().deriveFont( 12f ) );
+        userField.addItemListener( this );
+        userField.addActionListener( this );
+        userField.setEditor( new MetalComboBoxEditor() {
+            @Override
+            protected JTextField createEditorComponent() {
+                JTextField editorComponents = Components.textField();
+                editorComponents.setForeground( Color.red );
+                return editorComponents;
+            }
+        } );
+
+        add( userField );
+        add( Components.stud() );
+
+        // Master Password
+        masterPasswordLabel = Components.label( "Master Password:" );
+        add( masterPasswordLabel );
+
+        masterPasswordField = Components.passwordField();
+        masterPasswordField.addActionListener( this );
+        masterPasswordField.getDocument().addDocumentListener( this );
+        add( masterPasswordField );
+    }
+
+    @Override
+    public Component getFocusComponent() {
+        return masterPasswordField.isVisible()? masterPasswordField: null;
+    }
+
+    @Override
+    protected void updateUser(boolean repack) {
+        ModelUser selectedUser = getSelectedUser();
+        if (selectedUser != null) {
+            avatarLabel.setIcon( Res.avatar( selectedUser.getAvatar() ) );
+            boolean showPasswordField = !selectedUser.keySaved();
+            if (masterPasswordField.isVisible() != showPasswordField) {
+                masterPasswordLabel.setVisible( showPasswordField );
+                masterPasswordField.setVisible( showPasswordField );
+                repack = true;
+            }
+        }
+
+        super.updateUser( repack );
+    }
+
+    @Override
+    protected ModelUser getSelectedUser() {
+        int selectedIndex = userField.getSelectedIndex();
+        if (selectedIndex < 0)
+            return null;
+
+        return userField.getModel().getElementAt( selectedIndex );
+    }
+
+    @NotNull
+    @Override
+    public char[] getMasterPassword() {
+        return masterPasswordField.getPassword();
+    }
+
+    @Override
+    public Iterable<? extends JButton> getButtons() {
+        return ImmutableList.of( new JButton( Res.iconAdd() ) {
+            {
+                addActionListener( new ActionListener() {
+                    @Override
+                    public void actionPerformed(final ActionEvent e) {
+                        String fullName = JOptionPane.showInputDialog( ModelAuthenticationPanel.this, //
+                                                                       "Enter your full name, ensuring it is correctly spelled and capitalized:",
+                                                                       "New User", JOptionPane.QUESTION_MESSAGE );
+                        MPUserFileManager.get().addUser( new MPUser( fullName ) );
+                        userField.setModel( new DefaultComboBoxModel<>( readConfigUsers() ) );
+                        updateUser( true );
+                    }
+                } );
+                setToolTipText( "Add a new user to the list." );
+            }
+        }, new JButton( Res.iconDelete() ) {
+            {
+                addActionListener( new ActionListener() {
+                    @Override
+                    public void actionPerformed(final ActionEvent e) {
+                        ModelUser deleteUser = getSelectedUser();
+                        if (deleteUser == null)
+                            return;
+
+                        if (JOptionPane.showConfirmDialog( ModelAuthenticationPanel.this, //
+                                                       strf( "Are you sure you want to delete the user and sites remembered for:\n%s.",
+                                                             deleteUser.getFullName() ), //
+                                                       "Delete User", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE ) == JOptionPane.CANCEL_OPTION)
+                            return;
+
+                        MPUserFileManager.get().deleteUser( deleteUser.getModel() );
+                        userField.setModel( new DefaultComboBoxModel<>( readConfigUsers() ) );
+                        updateUser( true );
+                    }
+                } );
+                setToolTipText( "Delete the selected user." );
+            }
+        }, new JButton( Res.iconQuestion() ) {
+            {
+                addActionListener( new ActionListener() {
+                    @Override
+                    public void actionPerformed(final ActionEvent e) {
+                        JOptionPane.showMessageDialog( ModelAuthenticationPanel.this, //
+                                                       strf( "Reads users and sites from the directory at:\n%s",
+                                                             MPUserFileManager.get().getPath().getAbsolutePath() ), //
+                                                       "Help", JOptionPane.INFORMATION_MESSAGE );
+                    }
+                } );
+                setToolTipText( "More information." );
+            }
+        } );
+    }
+
+    @Override
+    public void reset() {
+        masterPasswordField.setText( "" );
+    }
+
+    private ModelUser[] readConfigUsers() {
+        return FluentIterable.from( MPUserFileManager.get().getUsers() ).transform( new Function<MPUser, ModelUser>() {
+            @Nullable
+            @Override
+            public ModelUser apply(@Nullable final MPUser model) {
+                return new ModelUser( Preconditions.checkNotNull( model ) );
+            }
+        } ).toArray( ModelUser.class );
+    }
+
+    @Override
+    public void itemStateChanged(final ItemEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        updateUser( false );
+        unlockFrame.trySignIn( userField );
+    }
+
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/ModelSite.java

@@ -0,0 +1,75 @@
+package com.lyndir.masterpassword.gui;
+
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.masterpassword.MPSiteType;
+import com.lyndir.masterpassword.MasterKey;
+import com.lyndir.masterpassword.model.*;
+
+
+/**
+ * @author lhunath, 14-12-16
+ */
+public class ModelSite extends Site {
+
+    private final MPSite model;
+
+    public ModelSite(final MPSiteResult result) {
+        this.model = result.getSite();
+    }
+
+    public MPSite getModel() {
+        return model;
+    }
+
+    public String getSiteName() {
+        return model.getSiteName();
+    }
+
+    @Override
+    public void setSiteName(final String siteName) {
+        model.setSiteName( siteName );
+        MPUserFileManager.get().save();
+    }
+
+    public MPSiteType getSiteType() {
+        return model.getSiteType();
+    }
+
+    @Override
+    public void setSiteType(final MPSiteType siteType) {
+        if (siteType != getSiteType()) {
+            model.setSiteType( siteType );
+            MPUserFileManager.get().save();
+        }
+    }
+
+    @Override
+    public MasterKey.Version getAlgorithmVersion() {
+        return model.getAlgorithmVersion();
+    }
+
+    @Override
+    public void setAlgorithmVersion(final MasterKey.Version algorithmVersion) {
+        if (algorithmVersion != getAlgorithmVersion()) {
+            model.setAlgorithmVersion( algorithmVersion );
+            MPUserFileManager.get().save();
+        }
+    }
+
+    public UnsignedInteger getSiteCounter() {
+        return model.getSiteCounter();
+    }
+
+    @Override
+    public void setSiteCounter(final UnsignedInteger siteCounter) {
+        if (siteCounter.equals( getSiteCounter() )) {
+            model.setSiteCounter( siteCounter );
+            MPUserFileManager.get().save();
+        }
+    }
+
+    public void use() {
+        model.updateLastUsed();
+        MPUserFileManager.get().save();
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/ModelUser.java

@@ -0,0 +1,97 @@
+package com.lyndir.masterpassword.gui;
+
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.FluentIterable;
+import com.lyndir.masterpassword.model.*;
+import java.util.Arrays;
+import javax.annotation.Nullable;
+
+
+/**
+ * @author lhunath, 14-12-08
+ */
+public class ModelUser extends User {
+
+    private final MPUser model;
+
+    @Nullable
+    private char[] masterPassword;
+
+    public ModelUser(MPUser model) {
+        this.model = model;
+    }
+
+    public MPUser getModel() {
+        return model;
+    }
+
+    @Override
+    public String getFullName() {
+        return model.getFullName();
+    }
+
+    @Nullable
+    @Override
+    protected char[] getMasterPassword() {
+        return masterPassword;
+    }
+
+    @Override
+    public int getAvatar() {
+        return model.getAvatar();
+    }
+
+    public void setAvatar(final int avatar) {
+        model.setAvatar(avatar % Res.avatars());
+        MPUserFileManager.get().save();
+    }
+
+    public void authenticate(final char[] masterPassword)
+            throws IncorrectMasterPasswordException {
+        putKey( model.authenticate( masterPassword ) );
+        this.masterPassword = masterPassword;
+        MPUserFileManager.get().save();
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+
+        if (masterPassword != null) {
+            Arrays.fill( masterPassword, (char) 0 );
+            masterPassword = null;
+        }
+    }
+
+    @Override
+    public Iterable<Site> findSitesByName(final String query) {
+        return FluentIterable.from( model.findSitesByName( query ) ).transform( new Function<MPSiteResult, Site>() {
+            @Nullable
+            @Override
+            public Site apply(@Nullable final MPSiteResult site) {
+                return new ModelSite( Preconditions.checkNotNull( site ) );
+            }
+        } );
+    }
+
+    @Override
+    public void addSite(final Site site) {
+        model.addSite( new MPSite( model, site.getSiteName(), site.getSiteType(), site.getSiteCounter() ) );
+        model.updateLastUsed();
+        MPUserFileManager.get().save();
+    }
+
+    @Override
+    public void deleteSite(Site site) {
+        if (site instanceof ModelSite) {
+            model.deleteSite(((ModelSite) site).getModel());
+            MPUserFileManager.get().save();
+        }
+    }
+
+    public boolean keySaved() {
+        // TODO
+        return false;
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/PasswordFrame.java

@@ -0,0 +1,293 @@
+package com.lyndir.masterpassword.gui;
+
+import static com.lyndir.lhunath.opal.system.util.ObjectUtils.ifNotNullElse;
+import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Iterables;
+import com.google.common.primitives.UnsignedInteger;
+import com.google.common.util.concurrent.*;
+import com.lyndir.masterpassword.*;
+import com.lyndir.masterpassword.gui.util.Components;
+import com.lyndir.masterpassword.gui.util.UnsignedIntegerModel;
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.*;
+import java.util.concurrent.Callable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.swing.*;
+import javax.swing.event.*;
+
+
+/**
+ * @author lhunath, 2014-06-08
+ */
+public class PasswordFrame extends JFrame implements DocumentListener {
+
+    private final User                         user;
+    private final Components.GradientPanel     root;
+    private final JTextField                   siteNameField;
+    private final JButton                      siteActionButton;
+    private final JComboBox<MPSiteType>        siteTypeField;
+    private final JComboBox<MasterKey.Version> siteVersionField;
+    private final JSpinner                     siteCounterField;
+    private final UnsignedIntegerModel         siteCounterModel;
+    private final JPasswordField               passwordField;
+    private final JLabel                       tipLabel;
+    private final JCheckBox                    maskPasswordField;
+    private final char                         passwordEchoChar;
+    private final Font                         passwordEchoFont;
+
+    @Nullable
+    private Site    currentSite;
+    private boolean updatingUI;
+
+    public PasswordFrame(User user)
+            throws HeadlessException {
+        super( "Master Password" );
+        this.user = user;
+
+        setDefaultCloseOperation( DISPOSE_ON_CLOSE );
+        setContentPane( root = Components.gradientPanel( new FlowLayout(), Res.colors().frameBg() ) );
+        root.setLayout( new BoxLayout( root, BoxLayout.PAGE_AXIS ) );
+        root.setBorder( BorderFactory.createEmptyBorder( 20, 20, 20, 20 ) );
+
+        // Site
+        JPanel sitePanel = Components.boxLayout( BoxLayout.PAGE_AXIS );
+        sitePanel.setOpaque( true );
+        sitePanel.setBackground( Res.colors().controlBg() );
+        sitePanel.setBorder( BorderFactory.createEmptyBorder( 20, 20, 20, 20 ) );
+        root.add( Components.borderPanel( sitePanel, BorderFactory.createRaisedBevelBorder(), Res.colors().frameBg() ) );
+
+        // User
+        sitePanel.add( Components.label( strf( "Generating passwords for: %s", user.getFullName() ), SwingConstants.CENTER ) );
+        sitePanel.add( Components.stud() );
+
+        // Site Name
+        sitePanel.add( Components.label( "Site Name:" ) );
+        JComponent siteControls = Components.boxLayout( BoxLayout.LINE_AXIS, //
+                                                        siteNameField = Components.textField(), Components.stud(),
+                                                        siteActionButton = Components.button( "Add Site" ) );
+        siteNameField.getDocument().addDocumentListener( this );
+        siteNameField.addActionListener( new ActionListener() {
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                Futures.addCallback( updatePassword( true ), new FutureCallback<String>() {
+                    @Override
+                    public void onSuccess(@Nullable final String sitePassword) {
+                        StringSelection clipboardContents = new StringSelection( sitePassword );
+                        Toolkit.getDefaultToolkit().getSystemClipboard().setContents( clipboardContents, null );
+
+                        SwingUtilities.invokeLater( new Runnable() {
+                            @Override
+                            public void run() {
+                                passwordField.setText( null );
+                                siteNameField.setText( null );
+
+                                dispatchEvent( new WindowEvent( PasswordFrame.this, WindowEvent.WINDOW_CLOSING ) );
+                            }
+                        } );
+                    }
+
+                    @Override
+                    public void onFailure(final Throwable t) {
+                    }
+                } );
+            }
+        } );
+        siteActionButton.addActionListener( new ActionListener() {
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                if (currentSite == null)
+                    return;
+                else if (currentSite instanceof ModelSite)
+                    PasswordFrame.this.user.deleteSite( currentSite );
+                else
+                    PasswordFrame.this.user.addSite( currentSite );
+                siteNameField.requestFocus();
+
+                updatePassword( true );
+            }
+        } );
+        sitePanel.add( siteControls );
+        sitePanel.add( Components.stud() );
+
+        // Site Type & Counter
+        siteCounterModel = new UnsignedIntegerModel( UnsignedInteger.ONE, UnsignedInteger.ONE );
+        MPSiteType[] types = Iterables.toArray( MPSiteType.forClass( MPSiteTypeClass.Generated ), MPSiteType.class );
+        JComponent siteSettings = Components.boxLayout( BoxLayout.LINE_AXIS,                                                  //
+                                                        siteTypeField = Components.comboBox( types ),                         //
+                                                        Components.stud(),                                                    //
+                                                        siteVersionField = Components.comboBox( MasterKey.Version.values() ), //
+                                                        Components.stud(),                                                    //
+                                                        siteCounterField = Components.spinner( siteCounterModel ) );
+        sitePanel.add( siteSettings );
+        siteTypeField.setFont( Res.valueFont().deriveFont( 12f ) );
+        siteTypeField.setSelectedItem( MPSiteType.GeneratedLong );
+        siteTypeField.addItemListener( new ItemListener() {
+            @Override
+            public void itemStateChanged(final ItemEvent e) {
+                updatePassword( true );
+            }
+        } );
+
+        siteVersionField.setFont( Res.valueFont().deriveFont( 12f ) );
+        siteVersionField.setAlignmentX( RIGHT_ALIGNMENT );
+        siteVersionField.setSelectedItem( MasterKey.Version.CURRENT );
+        siteVersionField.addItemListener( new ItemListener() {
+            @Override
+            public void itemStateChanged(final ItemEvent e) {
+                updatePassword( true );
+            }
+        } );
+
+        siteCounterField.setFont( Res.valueFont().deriveFont( 12f ) );
+        siteCounterField.setAlignmentX( RIGHT_ALIGNMENT );
+        siteCounterField.addChangeListener( new ChangeListener() {
+            @Override
+            public void stateChanged(final ChangeEvent e) {
+                updatePassword( true );
+            }
+        } );
+
+        // Mask
+        maskPasswordField = Components.checkBox( "Hide Password" );
+        maskPasswordField.setAlignmentX( Component.CENTER_ALIGNMENT );
+        maskPasswordField.setSelected( true );
+        maskPasswordField.addItemListener( new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                updateMask();
+            }
+        } );
+
+        // Password
+        passwordField = Components.passwordField();
+        passwordField.setAlignmentX( Component.CENTER_ALIGNMENT );
+        passwordField.setHorizontalAlignment( JTextField.CENTER );
+        passwordField.putClientProperty( "JPasswordField.cutCopyAllowed", true );
+        passwordField.setEditable( false );
+        passwordField.setBackground( null );
+        passwordField.setBorder( null );
+        passwordEchoChar = passwordField.getEchoChar();
+        passwordEchoFont = passwordField.getFont().deriveFont( 40f );
+        updateMask();
+
+        // Tip
+        tipLabel = Components.label( " ", SwingConstants.CENTER );
+        tipLabel.setAlignmentX( Component.CENTER_ALIGNMENT );
+        JPanel passwordContainer = Components.boxLayout( BoxLayout.PAGE_AXIS, maskPasswordField, Box.createGlue(), passwordField,
+                                                         Box.createGlue(), tipLabel );
+        passwordContainer.setOpaque( true );
+        passwordContainer.setBackground( Color.white );
+        passwordContainer.setBorder( BorderFactory.createEmptyBorder( 8, 8, 8, 8 ) );
+        root.add( Box.createVerticalStrut( 8 ) );
+        root.add( Components.borderPanel( passwordContainer, BorderFactory.createLoweredSoftBevelBorder(), Res.colors().frameBg() ),
+                  BorderLayout.SOUTH );
+
+        pack();
+        setMinimumSize( new Dimension( Math.max( 600, getPreferredSize().width ), Math.max( 300, getPreferredSize().height ) ) );
+        pack();
+
+        setLocationByPlatform( true );
+        setLocationRelativeTo( null );
+    }
+
+    private void updateMask() {
+        passwordField.setEchoChar( maskPasswordField.isSelected()? passwordEchoChar: (char) 0 );
+        passwordField.setFont( maskPasswordField.isSelected()? passwordEchoFont: Res.bigValueFont().deriveFont( 40f ) );
+    }
+
+    @Nonnull
+    private ListenableFuture<String> updatePassword(boolean allowNameCompletion) {
+
+        final String siteNameQuery = siteNameField.getText();
+        if (updatingUI)
+            return Futures.immediateCancelledFuture();
+        if (siteNameQuery == null || siteNameQuery.isEmpty() || !user.isKeyAvailable()) {
+            siteActionButton.setVisible( false );
+            tipLabel.setText( null );
+            passwordField.setText( null );
+            return Futures.immediateCancelledFuture();
+        }
+
+        final MPSiteType siteType = siteTypeField.getModel().getElementAt( siteTypeField.getSelectedIndex() );
+        final MasterKey.Version siteVersion = siteVersionField.getItemAt( siteVersionField.getSelectedIndex() );
+        final UnsignedInteger siteCounter = siteCounterModel.getNumber();
+
+        Iterable<Site> siteResults = user.findSitesByName( siteNameQuery );
+        if (!allowNameCompletion)
+            siteResults = FluentIterable.from( siteResults ).filter( new Predicate<Site>() {
+                @Override
+                public boolean apply(@Nullable Site siteResult) {
+                    return siteResult != null && siteNameQuery.equals( siteResult.getSiteName() );
+                }
+            } );
+        final Site site = ifNotNullElse( Iterables.getFirst( siteResults, null ),
+                                         new IncognitoSite( siteNameQuery, siteType, siteCounter, siteVersion ) );
+        if (currentSite != null && currentSite.getSiteName().equals( site.getSiteName() )) {
+            site.setSiteType( siteType );
+            site.setAlgorithmVersion( siteVersion );
+            site.setSiteCounter( siteCounter );
+        }
+
+        ListenableFuture<String> passwordFuture = Res.execute( this, new Callable<String>() {
+            @Override
+            public String call()
+                    throws Exception {
+                return user.getKey( site.getAlgorithmVersion() )
+                           .encode( site.getSiteName(), site.getSiteType(), site.getSiteCounter(), MPSiteVariant.Password, null );
+            }
+        } );
+        Futures.addCallback( passwordFuture, new FutureCallback<String>() {
+            @Override
+            public void onSuccess(@Nullable final String sitePassword) {
+                SwingUtilities.invokeLater( new Runnable() {
+                    @Override
+                    public void run() {
+                        updatingUI = true;
+                        currentSite = site;
+                        siteActionButton.setVisible( user instanceof ModelUser );
+                        if (currentSite instanceof ModelSite)
+                            siteActionButton.setText( "Delete Site" );
+                        else
+                            siteActionButton.setText( "Add Site" );
+                        siteTypeField.setSelectedItem( currentSite.getSiteType() );
+                        siteVersionField.setSelectedItem( currentSite.getAlgorithmVersion() );
+                        siteCounterField.setValue( currentSite.getSiteCounter() );
+                        siteNameField.setText( currentSite.getSiteName() );
+                        if (siteNameField.getText().startsWith( siteNameQuery ))
+                            siteNameField.select( siteNameQuery.length(), siteNameField.getText().length() );
+
+                        passwordField.setText( sitePassword );
+                        tipLabel.setText( "Press [Enter] to copy the password.  Then paste it into the password field." );
+                        updatingUI = false;
+                    }
+                } );
+            }
+
+            @Override
+            public void onFailure(final Throwable t) {
+            }
+        } );
+
+        return passwordFuture;
+    }
+
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        updatePassword( true );
+    }
+
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        updatePassword( false );
+    }
+
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+        updatePassword( true );
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Res.java

@@ -0,0 +1,338 @@
+package com.lyndir.masterpassword.gui;
+
+import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
+import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
+
+import com.google.common.base.Throwables;
+import com.google.common.collect.Maps;
+import com.google.common.io.Resources;
+import com.google.common.util.concurrent.JdkFutureAdapters;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import com.lyndir.masterpassword.MPIdenticon;
+import java.awt.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.image.ImageObserver;
+import java.io.IOException;
+import java.lang.ref.SoftReference;
+import java.net.URL;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.swing.*;
+
+
+/**
+ * @author lhunath, 2014-06-11
+ */
+public abstract class Res {
+
+    private static final WeakHashMap<Window, ExecutorService> executorByWindow = new WeakHashMap<>();
+    private static final Logger                               logger           = Logger.get( Res.class );
+    private static final Colors                               colors           = new Colors();
+
+    public static Future<?> execute(final Window host, final Runnable job) {
+        return getExecutor( host ).submit( new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    job.run();
+                }
+                catch (Throwable t) {
+                    logger.err( t, "Unexpected: %s", t.getLocalizedMessage() );
+                }
+            }
+        } );
+    }
+
+    public static <V> ListenableFuture<V> execute(final Window host, final Callable<V> job) {
+        ExecutorService executor = getExecutor( host );
+        return JdkFutureAdapters.listenInPoolThread( executor.submit( new Callable<V>() {
+            @Override
+            public V call()
+                    throws Exception {
+                try {
+                    return job.call();
+                }
+                catch (Throwable t) {
+                    logger.err( t, "Unexpected: %s", t.getLocalizedMessage() );
+                    throw t;
+                }
+            }
+        } ), executor );
+    }
+
+    private static ExecutorService getExecutor(final Window host) {
+        ExecutorService executor = executorByWindow.get( host );
+
+        if (executor == null) {
+            executorByWindow.put( host, executor = Executors.newSingleThreadExecutor() );
+
+            host.addWindowListener( new WindowAdapter() {
+                @Override
+                public void windowClosed(final WindowEvent e) {
+                    ExecutorService executor = executorByWindow.remove( host );
+                    if (executor != null)
+                        executor.shutdownNow();
+                }
+            } );
+        }
+
+        return executor;
+    }
+
+    public static Icon iconAdd() {
+        return new RetinaIcon( Resources.getResource( "media/icon_add@2x.png" ) );
+    }
+
+    public static Icon iconDelete() {
+        return new RetinaIcon( Resources.getResource( "media/icon_delete@2x.png" ) );
+    }
+
+    public static Icon iconQuestion() {
+        return new RetinaIcon( Resources.getResource( "media/icon_question@2x.png" ) );
+    }
+
+    public static Icon avatar(final int index) {
+        return new RetinaIcon( Resources.getResource( strf( "media/avatar-%d@2x.png", index % avatars() ) ) );
+    }
+
+    public static int avatars() {
+        return 19;
+    }
+
+    public static Font emoticonsFont() {
+        return emoticonsRegular();
+    }
+
+    public static Font controlFont() {
+        return arimoRegular();
+    }
+
+    public static Font valueFont() {
+        return sourceSansProRegular();
+    }
+
+    public static Font bigValueFont() {
+        return sourceSansProBlack();
+    }
+
+    public static Font emoticonsRegular() {
+        return font( "fonts/Emoticons-Regular.otf" );
+    }
+
+    public static Font sourceCodeProRegular() {
+        return font( "fonts/SourceCodePro-Regular.otf" );
+    }
+
+    public static Font sourceCodeProBlack() {
+        return font( "fonts/SourceCodePro-Bold.otf" );
+    }
+
+    public static Font sourceSansProRegular() {
+        return font( "fonts/SourceSansPro-Regular.otf" );
+    }
+
+    public static Font sourceSansProBlack() {
+        return font( "fonts/SourceSansPro-Bold.otf" );
+    }
+
+    public static Font exoBold() {
+        return font( "fonts/Exo2.0-Bold.otf" );
+    }
+
+    public static Font exoExtraBold() {
+        return font( "fonts/Exo2.0-ExtraBold.otf" );
+    }
+
+    public static Font exoRegular() {
+        return font( "fonts/Exo2.0-Regular.otf" );
+    }
+
+    public static Font exoThin() {
+        return font( "fonts/Exo2.0-Thin.otf" );
+    }
+
+    public static Font arimoBold() {
+        return font( "fonts/Arimo-Bold.ttf" );
+    }
+
+    public static Font arimoBoldItalic() {
+        return font( "fonts/Arimo-BoldItalic.ttf" );
+    }
+
+    public static Font arimoItalic() {
+        return font( "fonts/Arimo-Italic.ttf" );
+    }
+
+    public static Font arimoRegular() {
+        return font( "fonts/Arimo-Regular.ttf" );
+    }
+
+    private static Font font(String fontResourceName) {
+        Map<String, SoftReference<Font>> fontsByResourceName = Maps.newHashMap();
+        SoftReference<Font> fontRef = fontsByResourceName.get( fontResourceName );
+        Font font = fontRef == null? null: fontRef.get();
+        if (font == null)
+            try {
+                fontsByResourceName.put( fontResourceName, new SoftReference<>(
+                        font = Font.createFont( Font.TRUETYPE_FONT, Resources.getResource( fontResourceName ).openStream() ) ) );
+            }
+            catch (FontFormatException | IOException e) {
+                throw Throwables.propagate( e );
+            }
+
+        return font;
+    }
+
+    public static Colors colors() {
+        return colors;
+    }
+
+    private static final class RetinaIcon extends ImageIcon {
+
+        private static final Pattern scalePattern = Pattern.compile( ".*@(\\d+)x.[^.]+$" );
+
+        private final float scale;
+
+        public RetinaIcon(final URL url) {
+            super( url );
+
+            Matcher scaleMatcher = scalePattern.matcher( url.getPath() );
+            if (scaleMatcher.matches())
+                scale = Float.parseFloat( scaleMatcher.group( 1 ) );
+            else
+                scale = 1;
+        }
+
+        //private static URL retinaURL(final URL url) {
+        //    try {
+        //        final boolean[] isRetina = new boolean[1];
+        //        new apple.awt.CImage.HiDPIScaledImage(1,1, BufferedImage.TYPE_INT_ARGB) {
+        //            @Override
+        //            public void drawIntoImage(BufferedImage image, float v) {
+        //                isRetina[0] = v > 1;
+        //            }
+        //        };
+        //        return isRetina[0];
+        //    } catch (Throwable e) {
+        //        e.printStackTrace();
+        //        return url;
+        //    }
+        //}
+
+        @Override
+        public int getIconWidth() {
+            return (int) (super.getIconWidth() / scale);
+        }
+
+        @Override
+        public int getIconHeight() {
+            return (int) (super.getIconHeight() / scale);
+        }
+
+        public synchronized void paintIcon(Component c, Graphics g, int x, int y) {
+            ImageObserver observer = ifNotNullElse( getImageObserver(), c );
+
+            Image image = getImage();
+            int width = image.getWidth( observer );
+            int height = image.getHeight( observer );
+            final Graphics2D g2d = (Graphics2D) g.create( x, y, width, height );
+
+            g2d.scale( 1 / scale, 1 / scale );
+            g2d.drawImage( image, 0, 0, observer );
+            g2d.scale( 1, 1 );
+            g2d.dispose();
+        }
+    }
+
+
+    public static class Colors {
+
+        private final Color frameBg   = Color.decode( "#5A5D6B" );
+        private final Color controlBg = Color.decode( "#ECECEC" );
+        private final Color controlBorder = Color.decode( "#BFBFBF" );
+
+        public Color frameBg() {
+            return frameBg;
+        }
+
+        public Color controlBg() {
+            return controlBg;
+        }
+
+        public Color controlBorder() {
+            return controlBorder;
+        }
+
+        public Color fromIdenticonColor(MPIdenticon.Color identiconColor, BackgroundMode backgroundMode) {
+            switch (identiconColor) {
+                case RED:
+                    switch (backgroundMode) {
+                        case DARK:
+                            return Color.decode( "#dc322f" );
+                        case LIGHT:
+                            return Color.decode( "#dc322f" );
+                    }
+                    break;
+                case GREEN:
+                    switch (backgroundMode) {
+                        case DARK:
+                            return Color.decode( "#859900" );
+                        case LIGHT:
+                            return Color.decode( "#859900" );
+                    }
+                    break;
+                case YELLOW:
+                    switch (backgroundMode) {
+                        case DARK:
+                            return Color.decode( "#b58900" );
+                        case LIGHT:
+                            return Color.decode( "#b58900" );
+                    }
+                    break;
+                case BLUE:
+                    switch (backgroundMode) {
+                        case DARK:
+                            return Color.decode( "#268bd2" );
+                        case LIGHT:
+                            return Color.decode( "#268bd2" );
+                    }
+                    break;
+                case MAGENTA:
+                    switch (backgroundMode) {
+                        case DARK:
+                            return Color.decode( "#d33682" );
+                        case LIGHT:
+                            return Color.decode( "#d33682" );
+                    }
+                    break;
+                case CYAN:
+                    switch (backgroundMode) {
+                        case DARK:
+                            return Color.decode( "#2aa198" );
+                        case LIGHT:
+                            return Color.decode( "#2aa198" );
+                    }
+                    break;
+                case MONO:
+                    switch (backgroundMode) {
+                        case DARK:
+                            return Color.decode( "#93a1a1" );
+                        case LIGHT:
+                            return Color.decode( "#586e75" );
+                    }
+                    break;
+            }
+
+            throw new IllegalArgumentException( strf( "Color: %s or mode: %s not supported: ", identiconColor, backgroundMode ) );
+        }
+
+        public enum BackgroundMode {
+            DARK, LIGHT
+        }
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Site.java

@@ -0,0 +1,35 @@
+package com.lyndir.masterpassword.gui;
+
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
+
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.masterpassword.MPSiteType;
+import com.lyndir.masterpassword.MasterKey;
+
+
+/**
+ * @author lhunath, 14-12-16
+ */
+public abstract class Site {
+
+    public abstract String getSiteName();
+
+    public abstract void setSiteName(final String siteName);
+
+    public abstract MPSiteType getSiteType();
+
+    public abstract void setSiteType(final MPSiteType siteType);
+
+    public abstract MasterKey.Version getAlgorithmVersion();
+
+    public abstract void setAlgorithmVersion(final MasterKey.Version algorithmVersion);
+
+    public abstract UnsignedInteger getSiteCounter();
+
+    public abstract void setSiteCounter(final UnsignedInteger siteCounter);
+
+    @Override
+    public String toString() {
+        return strf( "{%s: %s}", getClass().getSimpleName(), getSiteName() );
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/UnlockFrame.java

@@ -0,0 +1,204 @@
+package com.lyndir.masterpassword.gui;
+
+import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
+
+import com.lyndir.masterpassword.MPIdenticon;
+import com.lyndir.masterpassword.gui.util.Components;
+import com.lyndir.masterpassword.model.IncorrectMasterPasswordException;
+import java.awt.*;
+import java.awt.event.*;
+import javax.annotation.Nullable;
+import javax.swing.*;
+
+
+/**
+ * @author lhunath, 2014-06-08
+ */
+public class UnlockFrame extends JFrame {
+
+    private final SignInCallback           signInCallback;
+    private final Components.GradientPanel root;
+    private final JLabel                   identiconLabel;
+    private final JButton                  signInButton;
+    private final JPanel                   authenticationContainer;
+    private       AuthenticationPanel      authenticationPanel;
+    private       boolean                  incognito;
+    public        User                     user;
+
+    public UnlockFrame(final SignInCallback signInCallback)
+            throws HeadlessException {
+        super( "Unlock Master Password" );
+        this.signInCallback = signInCallback;
+
+        setDefaultCloseOperation( DISPOSE_ON_CLOSE );
+        addWindowFocusListener( new WindowAdapter() {
+            @Override
+            public void windowGainedFocus(WindowEvent e) {
+                root.setGradientColor( Res.colors().frameBg() );
+            }
+
+            @Override
+            public void windowLostFocus(WindowEvent e) {
+                root.setGradientColor( Color.RED );
+            }
+        } );
+
+        // Sign In
+        JPanel signInBox = Components.boxLayout( BoxLayout.LINE_AXIS, Box.createGlue(), signInButton = Components.button( "Sign In" ),
+                                                 Box.createGlue() );
+        signInBox.setBackground( null );
+
+        setContentPane( root = Components.gradientPanel( new FlowLayout(), Res.colors().frameBg() ) );
+        root.setLayout( new BoxLayout( root, BoxLayout.PAGE_AXIS ) );
+        root.setBorder( BorderFactory.createEmptyBorder( 20, 20, 20, 20 ) );
+        root.add( Components.borderPanel( authenticationContainer = Components.boxLayout( BoxLayout.PAGE_AXIS ),
+                                          BorderFactory.createRaisedBevelBorder(), Res.colors().frameBg() ) );
+        root.add( Box.createVerticalStrut( 8 ) );
+        root.add( identiconLabel = Components.label( " ", SwingConstants.CENTER ) );
+        root.add( Box.createVerticalStrut( 8 ) );
+        root.add( signInBox );
+
+        authenticationContainer.setOpaque( true );
+        authenticationContainer.setBackground( Res.colors().controlBg() );
+        authenticationContainer.setBorder( BorderFactory.createEmptyBorder( 20, 20, 20, 20 ) );
+        identiconLabel.setFont( Res.emoticonsFont().deriveFont( 14.f ) );
+        identiconLabel.setToolTipText(
+                "A representation of your identity across all Master Password apps.\nIt should always be the same." );
+        signInButton.addActionListener( new AbstractAction() {
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                trySignIn();
+            }
+        } );
+
+        createAuthenticationPanel();
+
+        setLocationByPlatform( true );
+        setLocationRelativeTo( null );
+    }
+
+    protected void repack() {
+        pack();
+        setMinimumSize( new Dimension( Math.max( 300, getPreferredSize().width ), Math.max( 300, getPreferredSize().height ) ) );
+        pack();
+    }
+
+    private void createAuthenticationPanel() {
+        authenticationContainer.removeAll();
+
+        if (incognito) {
+            authenticationPanel = new IncognitoAuthenticationPanel( this );
+        } else {
+            authenticationPanel = new ModelAuthenticationPanel( this );
+        }
+        authenticationPanel.updateUser( false );
+        authenticationContainer.add( authenticationPanel );
+        authenticationContainer.add( Components.stud() );
+
+        final JCheckBox incognitoCheckBox = Components.checkBox( "Incognito" );
+        incognitoCheckBox.setToolTipText( "Log in without saving any information." );
+        incognitoCheckBox.setSelected( incognito );
+        incognitoCheckBox.addItemListener( new ItemListener() {
+            @Override
+            public void itemStateChanged(final ItemEvent e) {
+                incognito = incognitoCheckBox.isSelected();
+                SwingUtilities.invokeLater( new Runnable() {
+                    @Override
+                    public void run() {
+                        createAuthenticationPanel();
+                    }
+                } );
+            }
+        } );
+
+        JComponent toolsPanel = Components.boxLayout( BoxLayout.LINE_AXIS, incognitoCheckBox, Box.createGlue() );
+        authenticationContainer.add( toolsPanel );
+        for (JButton button : authenticationPanel.getButtons()) {
+            toolsPanel.add( button );
+            button.setBorder( BorderFactory.createEmptyBorder() );
+            button.setMargin( new Insets( 0, 0, 0, 0 ) );
+            button.setAlignmentX( RIGHT_ALIGNMENT );
+            button.setContentAreaFilled( false );
+        }
+
+        checkSignIn();
+        validate();
+        repack();
+
+        SwingUtilities.invokeLater( new Runnable() {
+            @Override
+            public void run() {
+                ifNotNullElse( authenticationPanel.getFocusComponent(), signInButton ).requestFocusInWindow();
+            }
+        } );
+    }
+
+    void updateUser(@Nullable User user) {
+        this.user = user;
+        checkSignIn();
+    }
+
+    boolean checkSignIn() {
+        String fullName = user == null? "": user.getFullName();
+        char[] masterPassword = authenticationPanel.getMasterPassword();
+        boolean enabled = !fullName.isEmpty() && masterPassword.length > 0;
+
+        if (fullName.isEmpty() || masterPassword.length == 0)
+            identiconLabel.setText( " " );
+        else {
+            MPIdenticon identicon = new MPIdenticon( fullName, masterPassword );
+            identiconLabel.setText( identicon.getText() );
+            identiconLabel.setForeground( Res.colors().fromIdenticonColor( identicon.getColor(), Res.Colors.BackgroundMode.DARK ) );
+        }
+
+        signInButton.setEnabled( enabled );
+
+        return enabled;
+    }
+
+    void trySignIn(final JComponent... signInComponents) {
+        if (!checkSignIn())
+            return;
+
+        for (JComponent signInComponent : signInComponents)
+            signInComponent.setEnabled( false );
+
+        signInButton.setEnabled( false );
+        signInButton.setText( "Signing In..." );
+
+        Res.execute( this, new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    user.authenticate( authenticationPanel.getMasterPassword() );
+
+                    SwingUtilities.invokeLater( new Runnable() {
+                        @Override
+                        public void run() {
+                            signInCallback.signedIn( user );
+                            dispose();
+                        }
+                    } );
+                }
+                catch (final IncorrectMasterPasswordException e) {
+                    SwingUtilities.invokeLater( new Runnable() {
+                        @Override
+                        public void run() {
+                            JOptionPane.showMessageDialog( null, e.getLocalizedMessage(), "Sign In Failed", JOptionPane.ERROR_MESSAGE );
+                            authenticationPanel.reset();
+                            signInButton.setText( "Sign In" );
+                            for (JComponent signInComponent : signInComponents)
+                                signInComponent.setEnabled( true );
+                            checkSignIn();
+                        }
+                    } );
+                }
+            }
+        } );
+    }
+
+    interface SignInCallback {
+
+        void signedIn(User user);
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/User.java

@@ -0,0 +1,81 @@
+package com.lyndir.masterpassword.gui;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
+import com.lyndir.masterpassword.MasterKey;
+import com.lyndir.masterpassword.model.IncorrectMasterPasswordException;
+import java.util.EnumMap;
+import java.util.Objects;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
+/**
+ * @author lhunath, 2014-06-08
+ */
+public abstract class User {
+
+    @Nonnull
+    private final EnumMap<MasterKey.Version, MasterKey> keyByVersion = Maps.newEnumMap( MasterKey.Version.class  );
+
+    public abstract String getFullName();
+
+    @Nullable
+    protected abstract char[] getMasterPassword();
+
+    public abstract void authenticate(final char[] masterPassword)
+            throws IncorrectMasterPasswordException;
+
+    public int getAvatar() {
+        return 0;
+    }
+
+    public boolean isKeyAvailable() {
+        return getMasterPassword() != null;
+    }
+
+    @Nonnull
+    public MasterKey getKey(MasterKey.Version algorithmVersion) {
+        char[] masterPassword = Preconditions.checkNotNull( getMasterPassword(), "User is not authenticated: " + getFullName() );
+
+        MasterKey key = keyByVersion.get( algorithmVersion );
+        if (key == null)
+            putKey( key = MasterKey.create( algorithmVersion, getFullName(), masterPassword ) );
+        if (!key.isValid())
+            key.revalidate( masterPassword );
+
+        return key;
+    }
+
+    protected void putKey(MasterKey masterKey) {
+        MasterKey oldKey = keyByVersion.put( masterKey.getAlgorithmVersion(), masterKey );
+        if (oldKey != null)
+            oldKey.invalidate();
+    }
+
+    public void reset() {
+        for (MasterKey key : keyByVersion.values())
+            key.invalidate();
+    }
+
+    public abstract Iterable<Site> findSitesByName(final String siteName);
+
+    public abstract void addSite(final Site site);
+
+    public abstract void deleteSite(final Site site);
+
+    @Override
+    public boolean equals(final Object obj) {
+        return this == obj || obj instanceof User && Objects.equals( getFullName(), ((User) obj).getFullName() );
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode( getFullName() );
+    }
+
+    @Override
+    public String toString() {
+        return getFullName();
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/package-info.java

@@ -0,0 +1,9 @@
+/**
+ *
+ * @author lhunath, 15-02-04
+ */
+
+@ParametersAreNonnullByDefault
+package com.lyndir.masterpassword.gui;
+
+import javax.annotation.ParametersAreNonnullByDefault;

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/platform/mac/AppleGUI.java

@@ -0,0 +1,45 @@
+package com.lyndir.masterpassword.gui.platform.mac;
+
+import com.apple.eawt.*;
+import com.lyndir.masterpassword.gui.GUI;
+import com.lyndir.masterpassword.gui.PasswordFrame;
+import com.lyndir.masterpassword.gui.User;
+
+import javax.swing.*;
+
+
+/**
+ * @author lhunath, 2014-06-10
+ */
+public class AppleGUI extends GUI {
+
+    public AppleGUI() {
+
+        Application application = Application.getApplication();
+        application.addAppEventListener( new AppForegroundListener() {
+
+            @Override
+            public void appMovedToBackground(AppEvent.AppForegroundEvent arg0) {
+            }
+
+            @Override
+            public void appRaisedToForeground(AppEvent.AppForegroundEvent arg0) {
+                open();
+            }
+        } );
+        application.addAppEventListener( new AppReOpenedListener() {
+            @Override
+            public void appReOpened(AppEvent.AppReOpenedEvent arg0) {
+                open();
+            }
+        } );
+    }
+
+    @Override
+    protected PasswordFrame newPasswordFrame(final User user) {
+        PasswordFrame frame = super.newPasswordFrame( user );
+        frame.setDefaultCloseOperation( WindowConstants.HIDE_ON_CLOSE );
+
+        return frame;
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/Components.java

@@ -0,0 +1,237 @@
+package com.lyndir.masterpassword.gui.util;
+
+import com.lyndir.masterpassword.gui.Res;
+import java.awt.*;
+import javax.annotation.Nullable;
+import javax.swing.*;
+import javax.swing.border.Border;
+import javax.swing.border.CompoundBorder;
+
+
+/**
+ * @author lhunath, 2014-06-08
+ */
+public abstract class Components {
+
+    public static GradientPanel boxLayout(int axis, Component... components) {
+        GradientPanel container = gradientPanel( null, null );
+        //        container.setBackground( Color.red );
+        container.setLayout( new BoxLayout( container, axis ) );
+        for (Component component : components)
+            container.add( component );
+
+        return container;
+    }
+
+    public static GradientPanel borderPanel(final JComponent component, @Nullable final Border border) {
+        return borderPanel( component, border, null );
+    }
+
+    public static GradientPanel borderPanel(final JComponent component, @Nullable final Border border, @Nullable Color background) {
+        GradientPanel box = boxLayout( BoxLayout.LINE_AXIS, component );
+
+        if (border != null)
+            box.setBorder( border );
+
+        if (background != null)
+            box.setBackground( background );
+
+        return box;
+    }
+
+    public static GradientPanel gradientPanel(@Nullable final LayoutManager layout, @Nullable final Color color) {
+        return new GradientPanel( layout, color ) {
+            {
+                setOpaque( color != null );
+                setBackground( null );
+                setAlignmentX( LEFT_ALIGNMENT );
+                setAlignmentY( BOTTOM_ALIGNMENT );
+            }
+        };
+    }
+
+    public static JTextField textField() {
+        return new JTextField() {
+            {
+                setBorder( BorderFactory.createCompoundBorder( BorderFactory.createLineBorder( Res.colors().controlBorder(), 1, true ),
+                                                               BorderFactory.createEmptyBorder( 4, 4, 4, 4 ) ) );
+                setFont( Res.valueFont().deriveFont( 12f ) );
+                setAlignmentX( LEFT_ALIGNMENT );
+                setAlignmentY( BOTTOM_ALIGNMENT );
+            }
+
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, getPreferredSize().height );
+            }
+        };
+    }
+
+    public static JPasswordField passwordField() {
+        return new JPasswordField() {
+            {
+                setBorder( BorderFactory.createCompoundBorder( BorderFactory.createLineBorder( Res.colors().controlBorder(), 1, true ),
+                                                               BorderFactory.createEmptyBorder( 4, 4, 4, 4 ) ) );
+                setAlignmentX( LEFT_ALIGNMENT );
+                setAlignmentY( BOTTOM_ALIGNMENT );
+            }
+
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, getPreferredSize().height );
+            }
+        };
+    }
+
+    public static JButton button(String label) {
+        return new JButton( label ) {
+            {
+                setFont( Res.controlFont().deriveFont( 12f ) );
+                setAlignmentX( LEFT_ALIGNMENT );
+                setAlignmentY( BOTTOM_ALIGNMENT );
+            }
+
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( 20, getPreferredSize().height );
+            }
+        };
+    }
+
+    public static Component stud() {
+        Dimension studDimension = new Dimension( 8, 8 );
+        Box.Filler rigidArea = new Box.Filler( studDimension, studDimension, studDimension );
+        rigidArea.setAlignmentX( Component.LEFT_ALIGNMENT );
+        rigidArea.setAlignmentY( Component.BOTTOM_ALIGNMENT );
+        rigidArea.setBackground( Color.red );
+        return rigidArea;
+    }
+
+    public static JSpinner spinner(final SpinnerModel model) {
+        return new JSpinner( model ) {
+            {
+                CompoundBorder editorBorder = BorderFactory.createCompoundBorder(
+                        BorderFactory.createLineBorder( Res.colors().controlBorder(), 1, true ),
+                        BorderFactory.createEmptyBorder( 4, 4, 4, 4 ) );
+                ((DefaultEditor) getEditor()).getTextField().setBorder( editorBorder );
+                setAlignmentX( LEFT_ALIGNMENT );
+                setAlignmentY( BOTTOM_ALIGNMENT );
+                setBorder( null );
+            }
+
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( 20, getPreferredSize().height );
+            }
+        };
+    }
+
+    public static JLabel label(@Nullable String label) {
+        return label( label, SwingConstants.LEADING );
+    }
+
+    /**
+     * @param horizontalAlignment One of the following constants
+     *                            defined in <code>SwingConstants</code>:
+     *                            <code>LEFT</code>,
+     *                            <code>CENTER</code>,
+     *                            <code>RIGHT</code>,
+     *                            <code>LEADING</code> or
+     *                            <code>TRAILING</code>.
+     */
+    public static JLabel label(@Nullable final String label, final int horizontalAlignment) {
+        return new JLabel( label, horizontalAlignment ) {
+            {
+                setFont( Res.controlFont().deriveFont( 12f ) );
+                setAlignmentX( LEFT_ALIGNMENT );
+                setAlignmentY( BOTTOM_ALIGNMENT );
+            }
+
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, getPreferredSize().height );
+            }
+        };
+    }
+
+    public static JCheckBox checkBox(final String label) {
+        return new JCheckBox( label ) {
+            {
+                setFont( Res.controlFont().deriveFont( 12f ) );
+                setBackground( null );
+                setAlignmentX( LEFT_ALIGNMENT );
+                setAlignmentY( BOTTOM_ALIGNMENT );
+            }
+        };
+    }
+
+    @SafeVarargs
+    public static <V> JComboBox<V> comboBox(final V... values) {
+        return comboBox( new DefaultComboBoxModel<>( values ) );
+    }
+
+    public static <M> JComboBox<M> comboBox(final ComboBoxModel<M> model) {
+        return new JComboBox<M>( model ) {
+            {
+                //                CompoundBorder editorBorder = BorderFactory.createCompoundBorder(
+                //                        BorderFactory.createLineBorder( Res.colors().controlBorder(), 1, true ),
+                //                        BorderFactory.createEmptyBorder( 4, 4, 4, 4 ) );
+                //                ((JComponent) ((BasicComboBoxEditor) getEditor()).getEditorComponent()).setBorder(editorBorder);
+                setFont( Res.controlFont().deriveFont( 12f ) );
+                setAlignmentX( LEFT_ALIGNMENT );
+                setAlignmentY( BOTTOM_ALIGNMENT );
+                //                setBorder(null);
+            }
+
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, getPreferredSize().height );
+            }
+        };
+    }
+
+    public static class GradientPanel extends JPanel {
+
+        @Nullable
+        private Color gradientColor;
+
+        @Nullable
+        private GradientPaint paint;
+
+        protected GradientPanel(@Nullable final LayoutManager layout, @Nullable final Color gradientColor) {
+            super( layout );
+            this.gradientColor = gradientColor;
+            setBackground( null );
+        }
+
+        @Nullable
+        public Color getGradientColor() {
+            return gradientColor;
+        }
+
+        public void setGradientColor(@Nullable final Color gradientColor) {
+            this.gradientColor = gradientColor;
+            revalidate();
+        }
+
+        @Override
+        public void doLayout() {
+            super.doLayout();
+
+            if (gradientColor != null) {
+                paint = new GradientPaint( new Point( 0, 0 ), gradientColor, new Point( getWidth(), getHeight() ), gradientColor.darker() );
+                repaint();
+            }
+        }
+
+        @Override
+        protected void paintComponent(final Graphics g) {
+            super.paintComponent( g );
+
+            if (paint != null) {
+                ((Graphics2D) g).setPaint( paint );
+                g.fillRect( 0, 0, getWidth(), getHeight() );
+            }
+        }
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/UnsignedIntegerModel.java

@@ -0,0 +1,37 @@
+package com.lyndir.masterpassword.gui.util;
+
+import com.google.common.primitives.UnsignedInteger;
+import javax.swing.*;
+
+
+/**
+ * @author lhunath, 2016-10-29
+ */
+public class UnsignedIntegerModel extends SpinnerNumberModel {
+
+    public UnsignedIntegerModel() {
+        this( UnsignedInteger.ZERO, UnsignedInteger.ZERO, UnsignedInteger.MAX_VALUE, UnsignedInteger.ONE );
+    }
+
+    public UnsignedIntegerModel(final UnsignedInteger value) {
+        this( value, UnsignedInteger.ZERO, UnsignedInteger.MAX_VALUE, UnsignedInteger.ONE );
+    }
+
+    public UnsignedIntegerModel(final UnsignedInteger value, final UnsignedInteger minimum) {
+        this( value, minimum, UnsignedInteger.MAX_VALUE, UnsignedInteger.ONE );
+    }
+
+    public UnsignedIntegerModel(final UnsignedInteger value, final UnsignedInteger minimum, final UnsignedInteger maximum) {
+        this( value, minimum, maximum, UnsignedInteger.ONE );
+    }
+
+    public UnsignedIntegerModel(final UnsignedInteger value, final UnsignedInteger minimum, final UnsignedInteger maximum,
+                                final UnsignedInteger stepSize) {
+        super( value, minimum, maximum, stepSize );
+    }
+
+    @Override
+    public UnsignedInteger getNumber() {
+        return (UnsignedInteger) super.getNumber();
+    }
+}

platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/package-info.java

@@ -0,0 +1,9 @@
+/**
+ *
+ * @author lhunath, 15-02-04
+ */
+
+@ParametersAreNonnullByDefault
+package com.lyndir.masterpassword.gui.util;
+
+import javax.annotation.ParametersAreNonnullByDefault;

platform-independent/gui-java/src/main/resources/logback.xml

@@ -0,0 +1,15 @@
+<configuration scan="false">
+
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%-8relative %22c{0} [%-5level] %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="com.lyndir" level="${mp.log.level:-INFO}" />
+
+    <root level="INFO">
+        <appender-ref ref="stdout" />
+    </root>
+
+</configuration>