.dockerignore

@@ -1,28 +0,0 @@
-# OS-Specific junk.
-.DS_Store
-Thumbs.db
-
-# IntelliJ
-.idea
-*.iml
-*.ipr
-*.iws
-
-# Xcode IDE
-xcuserdata/
-DerivedData/
-
-# Generated
-/platform-darwin/Resources/Media/Images.xcassets/
-/platform-darwin/Podfile.lock
-/platform-darwin/Pods/
-
-# Gradle
-build
-.gradle
-local.properties
-/builds
-/platform-android/.externalNativeBuild
-
-# Git
-.git

.gitignore

@@ -1,29 +1,47 @@
 # OS-Specific junk.
 .DS_Store
 Thumbs.db
-*~
 
 # IntelliJ
 .idea
 *.iml
 *.ipr
 *.iws
-out
 
 # Xcode IDE
 xcuserdata/
 DerivedData/
 
 # Generated
+/platform-independent/cli-c/VERSION
+/platform-independent/cli-c/mpw-*.tar.gz
 /platform-darwin/Resources/Media/Images.xcassets/
-/platform-darwin/Podfile.lock
-/platform-darwin/Pods/
+
+# Media
+public/Press/Background.png
+public/Press/Front-Page.png
+public/Press/MasterPassword_PressKit/MasterPassword_pressrelease_*.pdf
 
 # Gradle
 build
+!/build
 .gradle
 local.properties
-/builds
-/platform-android/.externalNativeBuild
-.cxx
 
+# Maven
+target
+dependency-reduced-pom.xml
+
+# C
+core/c/*.o
+core/c/lib/*/.unpacked
+core/c/lib/*/.patched
+core/c/lib/*/src
+core/c/lib/include
+platform-independent/cli-c/cli/*.o
+platform-independent/cli-c/mpw-*.tar.gz
+platform-independent/cli-c/mpw-*.tar.gz.sig
+platform-independent/cli-c/mpw
+platform-independent/cli-c/mpw-bench
+platform-independent/cli-c/mpw-tests
+platform-independent/cli-c/VERSION

.gitlab-ci.yml

@@ -1,20 +0,0 @@
-variables:
-  GIT_DEPTH: 3
-  GIT_SUBMODULE_STRATEGY: recursive
-
-build_project:
-  stage: build
-  script:
-    - "( brew bundle )"
-    - "( ./lib/bin/build_libsodium-macos clean && ./lib/bin/build_libsodium-macos )"
-    - "( ./lib/bin/build_libjson-c-macos clean && ./lib/bin/build_libjson-c-macos )"
-    - "( cd ./platform-independent/c/cli && ./clean && targets=all ./build && ./mpw-tests && ./mpw-cli-tests )"
-    - "( ./gradlew --stacktrace --info clean test )"
-    - "( cd platform-darwin && pod install )"
-    - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Release' -scheme 'MasterPassword iOS' -sdk iphonesimulator clean build )"
-    - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Release' -scheme 'MasterPassword macOS' clean build )"
-  tags:
-    - brew
-    - java
-    - cocoapods
-    - xcode

.gitmodules

@@ -1,20 +1,24 @@
 [submodule "External/Pearl"]
 	path = platform-darwin/External/Pearl
 	url = git://github.com/Lyndir/Pearl.git
+[submodule "External/InAppSettingsKit"]
+	path = platform-darwin/External/InAppSettingsKit
+	url = git://github.com/lhunath/InAppSettingsKit.git
+[submodule "External/KCOrderedAccessorFix"]
+	path = platform-darwin/External/KCOrderedAccessorFix
+	url = https://github.com/lhunath/KCOrderedAccessorFix.git
 [submodule "External/AttributedMarkdown"]
 	path = platform-darwin/External/AttributedMarkdown
 	url = https://github.com/dreamwieber/AttributedMarkdown.git
+[submodule "External/uicolor-utilities"]
+	path = platform-darwin/External/uicolor-utilities
+	url = git://github.com/lhunath/uicolor-utilities.git
+[submodule "External/jrswizzle"]
+	path = platform-darwin/External/jrswizzle
+	url = git://github.com/jonmarimba/jrswizzle.git
 [submodule "MasterPassword/Web/js/mpw-js"]
-	path = platform-independent/web/js/mpw-js
+	path = platform-independent/web-js/js/mpw-js
 	url = https://github.com/tmthrgd/mpw-js.git
-[submodule "lib/libsodium"]
-	path = lib/libsodium
+[submodule "platform-darwin/External/libsodium"]
+	path = platform-darwin/External/libsodium
 	url = https://github.com/jedisct1/libsodium.git
-[submodule "lib/libjson-c"]
-	path = lib/libjson-c
-	url = https://github.com/json-c/json-c.git
-[submodule "public/site"]
-	path = public/site
-	url = https://gitlab.com/MasterPassword/MasterPassword.git
-	branch = gh-pages
-	shallow = true

.travis.yml

@@ -0,0 +1,10 @@
+language: objective-c
+osx_image: xcode8.3
+env: TERM=dumb SHLVL=0
+git:
+  submodules: true
+script:
+  - "( brew install libsodium )"
+  - "( cd ./platform-independent/cli-c && ./clean && targets='mpw mpw-bench mpw-tests' ./build && ./mpw-tests )"
+  - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator )"
+  - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' )"

Brewfile

@@ -1,6 +0,0 @@
-brew "libsodium"
-brew "json-c"
-
-brew "libtool"
-brew "automake"
-brew "autoconf"

Dockerfile

@@ -1,12 +0,0 @@
-# Set up a container for doing gradle cross-compiling.
-#
-# docker build -t lhunath/mp-gradle --file Dockerfile /var/empty
-FROM debian:stable-slim
-
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
-RUN mkdir -p /usr/share/man/man1
-
-RUN apt-get update && apt-get install -y default-jdk-headless git-core bash libtool automake autoconf make g++-multilib
-RUN git clone --depth=3 $(: --shallow-submodules) --recurse-submodules https://gitlab.com/MasterPassword/MasterPassword.git /mpw
-RUN cd /mpw && ./gradlew -i clean
-RUN cd /mpw && git pull && git log -1 && ./gradlew -i check

README.md

@@ -1,41 +1,210 @@
-# [Master Password •••|](http://masterpassword.app)
+[![Travis CI](http://img.shields.io/travis-ci/Lyndir/MasterPassword.png)](https://travis-ci.org/Lyndir/MasterPassword)
+[![Join the chat at https://gitter.im/lyndir/MasterPassword](https://badges.gitter.im/lyndir/MasterPassword.svg)](https://gitter.im/lyndir/MasterPassword?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![license](https://img.shields.io/github/license/lyndir/masterpassword.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
+
+
+
+
+# [Master Password •••|](http://masterpasswordapp.com)
 
 Master Password is a completely new way of thinking about passwords.
 
 It consists of an algorithm that implements the core idea and applications for various platforms making the alogirthm available to users on a variety of devices and platforms.
 
+To skip the intro and go straight to the information on how to use the code, [click here](#source-code).
 
-## PROJECT MOVED
+Master Password is available for [📲 iOS](https://itunes.apple.com/app/id510296984), [🖥 macOS](https://ssl.masterpasswordapp.com/masterpassword-mac.zip), [📲 Android](https://ssl.masterpasswordapp.com/masterpassword-android.apk), [🖥 Desktop](https://ssl.masterpasswordapp.com/masterpassword-gui.jar), and [⌨ Console](https://ssl.masterpasswordapp.com/masterpassword-cli.tar.gz).
 
-Master Password is announcing a massive rewrite, modernizing the solution and clearing the way for exciting new capabilities.
-
-The project is re-launching as [Spectre](https://gitlab.com/spectre.app), still fully open-source Free Software here on GitLab.
-
-Any interested parties are invited to participate in [the alpha or beta programs](https://spectre.app/#beta), to participate in the new Spectre identity platform.
-
-The Beta program is now open for users with iOS devices.  The Spectre Beta introduces a new app, rewritten under Swift, and new capabilities such as AutoFill.
-
-All development effort has moved to the Spectre project.  Master Password is no longer actively maintained.
+Master Password is also available from the following package managers: [macOS: Homebrew](https://brew.sh/).  Get in touch if you are interested in adding Master Password to any other package managers.
 
 
-## FAQ
 
-1. Has there been a change in ownership?
+## What is a password?
 
-No. This project is still owned and maintained exclusively by [Maarten Billemont](https://gitlab.com/lhunath).
+The "password".  Somehow, passwords have become the default solution to authentication across the web.  We've long since accepted this as the way things are, but let's stop to think for a moment about what passwords actually are:
 
-2. How can I trust Spectre?
+A password is a secret that is known only to the party providing a service and the party that should be allowed access to this service.
 
-Spectre's code-base is based on the Master Password code-base.  The algorithm is exactly the same.  The license is the same.  The author is the same.
+Simple enough - a secret that you know and your website knows but nobody else, thereby guaranteeing that you and only you have access to your account on this website.  Unfortunately, in practice, the ubiquitous use of passwords has us completely overwhelmed.  And the only way we can cope with that is by finding ways of making the problem manageable.
 
-The applications are being rewritten for modern platforms.  Spectre has the exact same trust parameters as Master Password.
 
-3. Why is the project changing?
 
-Several reasons, in fact.  Master Password as a name is too ubiquitous in popular culture, which is a cause for confusion.  We are also looking to evolve the capabilities of the platform beyond simply passwords, into a fully decentralized identity platform.  We're also looking to be socially inclusive and conscious of the implicit biases present in terminology we've inherited from past societies.
+## What's the problem?
 
-All that said - Spectre is the mark of a complete refresh of the Master Password solution.  Hope you'll love it!
+Coming up with a secret password is pretty easy.  Say you're organizing a secret meeting and will only let people in if they know the password at the door.  You tell those you trust, the password for tonight's meeting is "purple oranges with a smile".
 
-4. How do I migrate?
+The problem we have in our daily lives, however, is the fact that we need secret passwords for almost everything now.  A password for our email, twitter, 9gag, facebook, imgur, amazon, ebay, paypal, bank, reddit, etc.  And every time we want to use a new site, we need another one.  The problem now becomes clear: passwords are meant to be remembered and recalled with ease when needed, but this becomes impossible when we have secrets for every distinct activity in our lives.
 
-Master Password export files are fully supported by Spectre.  Migration mechanism exist in Master Password which will trigger as soon as you install Spectre; for instance, as soon as you install Spectre on your iOS device, Master Password will show a pop-up which will copy your user over at a tap.
+We cannot recall passwords the way we are expected to when there are too many.
+
+
+
+## Coping
+
+Life gives us no advice on how to deal with this problem.  So we find our own ways:
+
+ - We use a single personal secret for all our websites, thereby violating the secrecy of these passwords (eg. you've given your email secret to twitter).
+ - We use simple variations of a personal secret or pattern, thereby trivializing the complexity of these passwords (eg. google98, twitter98; reversals, eg. 8991elgoog)
+ - We use external means of remembering passwords, thereby increasing the risk of loss (both loss of access when we lose the tool and theft when a thief finds our tool)
+
+These coping mechanisms come in various forms, and they all have down-sides, because at the root of each of these lies an undeniable truth:
+
+Our passwords are no longer true to the original definition.
+
+
+
+## Master Password's approach
+
+The theory behind Master Password starts with accepting that it is impossible to keep track of passwords for all your accounts.  Instead, we return to the core premise of the password: a secret phrase that you can remember easily, all by yourself.
+
+Master Password solves this problem by letting you remember one and only one password.  You use this password with Master Password only.  Master Password then gives you access to any website or service you want by creating a website-specific key for it.
+
+1. You sign into Master Password using your one password.
+2. You ask Master Password for the key to enter your website, eg. twitter.
+3. You log into twitter using your username and the key from Master Password.
+
+Master Password is *not* a password manager.  It does not store your website passwords.  Therefore, there is zero risk of you losing your website passwords (or them falling in the wrong hands).  Master Password simply uses your one password and the name of the site to generate a site-specific secret.
+
+
+
+## Benefits
+
+ - You don't need to come up with a secure password every time you make a new account - Master Password gives you the key for it.
+ - You don't need to try to remember a password you created two years ago for that one account - Master Password just gives you the key for it.
+ - You don't need to that you can't get into that account you made at work when you come home because you don't have your work passwords with you - Master Password is always available.
+ - You don't need to try to keep password lists in sync or stored somewhere easily accessible - Master Password is always available.
+ - You don't need to worry what you'll do if your computer dies or you need to log into your bank while you're in the airport transit zone - Master Password is always available.
+ - You don't need to worry about your password manager website getting hacked, your phone getting duplicated, somebody taking a picture of your passwords book - Master Password keeps no records.
+
+
+
+## How does it work?
+
+The details of how Master Password works [are available here](http://masterpasswordapp.com/algorithm.html).
+
+In short:
+
+    master-key = SCRYPT( user-name, master-password )
+    site-key = HMAC-SHA-256( site-name . site-counter, master-key )
+    site-password = PW-TEMPLATE( site-key, site-template )
+
+Master Password can derive the `site-password` in an entirely stateless manner.  It is therefore better defined as a calculator than a manager.  It is the user's responsibility to remember the inputs: `user-name`, `master-password`, `site-name`, `site-counter` and `site-template`.
+
+We standardize `user-name` as your full name, `site-name` as the domain name of the site, `site-counter` to `1` (unless you explicitly increment it) and `site-template` to `Long Password`; as a result the only token the user really needs to remember actively is `master-password`.
+
+
+
+
+# Source Code
+
+Master Password's algorithm is [documented](http://masterpasswordapp.com/algorithm.html) and its implementation is Free Software (GPLv3).
+
+
+
+## Components
+
+There are several components available here.  As an end-user, you can currently use the iOS app, the Android app, the OS X app, the Java desktop app, the C CLI app or the Java CLI app.  There are also several components that are useful for developers:
+
+ - `core/c`: This is the reference implementation of the Master Password algorithm, written in C.
+ - `core/java/algorithm`: This is a Java implementation of the Master Password algorithm.
+ - `core/java/model`: This is an object model to simplify use of Master Password by Java applications.
+ - `core/java/tests`: These are Java integration tests designed to ensure Master Password performs as expected.
+ - `platform-android`: This is the official Android implementation of Master Password in Java.
+ - `platform-darwin`: This is the official iOS and OS X implementation of Master Password in Objective-C.
+ - `platform-independent/cli-c`: This is the platform-independent console implementation of Master Password, written in C.
+ - `platform-independent/cli-java`: This is the platform-independent console implementation of Master Password, written in Java.
+ - `platform-independent/gui-java`: This is the platform-independent desktop implementation of Master Password, written in Java.
+ - `platform-independent/web-js`: This is the platform-independent browser application for Master Password, written in JavaScript.
+
+
+
+## Building and running
+
+
+### macOS or iOS
+
+Make sure you have all relevant submodules checked out.
+
+Go into `platform-darwin` and open `MasterPassword.xcworkspace` in Xcode.  Select the desired target from the Scheme Selector and build, run or archive.
+
+
+### Web
+
+Make sure you have all relevant submodules checked out.
+
+Go into `platform-independent/web-js` and open `index.html` in your browser.  You should be able to run this locally, there is no need for hosting or an application server.
+
+
+### Java
+
+Go into the `gradle` directory and run `./gradlew build`.  All Java components will then be built:
+
+ - `platform-independent/gui-java/build/distributions`:
+   contains an archive with the Master Password Java GUI.  Unpack it and run the `gui` script.
+ - `platform-independent/cli-java/build/distributions`:
+   contains an archive with the Master Password Java command-line interface.  Unpack it and run the `cli` script.
+ - `platform-android/build/outputs/apk`:
+   contains the Android application package.  Install it on your Android device.
+
+
+### Native CLI
+
+Go into the `platform-independent/cli-c` directory and run `./build`.  The native command-line client will then be built.
+
+When the build completes, you will have an `mpw` binary you can use.  You can copy it into your `PATH` or use the `./install` script to help you do so.
+
+For example:
+
+    ./build && sudo ./install
+    mpw -h
+
+Normally, this is all you need to do, however note that there are a few dependencies that need to be met, depending on which targets you are building:
+
+ - `mpw`
+
+The C implementation depends either on `libsodium` or Tarsnap's `scrypt` and `openssl-dev`.
+
+We recommend you install `libsodium`.  If `libsodium` is not installed when `./build` is executed, the script will try to download and statically link Tarsnap's `scrypt` instead.  Tarsnap's `scrypt` depends on you having `openssl-dev` installed.
+
+If you have `mpw_color` enabled (it is enabled by default), the build also depends on `ncurses-dev` to communicate with the terminal.
+
+ - `mpw-bench`
+
+This tool compares the performance of a few cryptographic algorithms, including bcrypt.  The `./build` script will try to automatically download and statically link `bcrypt`.
+
+ - `mpw-tests`
+
+This tool runs a suite of tests to ensure the correct passwords are being generated by the algorithm under various circumstances.  The test suite is declared in `mpw-tests.xml` which needs to exist in the current working directory when running the tool.  In addition, `libxml2` is used to parse the file, so this target depends on you having it installed when running `./build`.
+
+Finally, there are a few different ways you can modify the build process:
+
+ - You can change the targets that should be built.  By default, only `mpw` is built.  These are the available targets:
+    - `mpw`: This is the standard command-line `mpw` tool which implements all Master Password features.
+    - `mpw-tests`: This is a tool to perform the standard tests script on the `mpw` implementation.
+    - `mpw-bench`: This is a tool to run a benchmark on the `mpw` implementation, comparing it to the performance of other algorithms.
+ - You can specify custom arguments to the compiler, pass them as arguments to the build script.
+ - The build process involves some optionals, they can by toggled from their default setting by passing variables:
+    - `mpw_color`: [default: 1] Colorized Identicon, depends on 
+
+To change the targets to build, use:
+
+    targets='mpw mpw-tests' ./build
+
+To add a library search path, use:
+
+    ./build -L/usr/local/lib
+
+Change an optional feature:
+
+    mpw_color=0 ./build
+
+
+
+## Support
+
+Feel free to contribute by forking the project, reporting issues or joining the discussion on:
+
+ - [Gitter](https://gitter.im/lyndir/MasterPassword)
+ - #masterpassword (on chat.freenode.net)
+ - #masterpassword:lyndir.com (on Matrix)
+ - masterpassword@lyndir.com

RELEASE.md

@@ -1,15 +0,0 @@
-To build a release distribution:
-
-Desktop:
-
-    STORE_PW=$(mpw masterpassword.keystore) KEY_PW_DESKTOP=$(mpw masterpassword-desktop) gradle --no-daemon clean masterpassword-gui:shadowJar
-
-Android:
-
-    STORE_PW=$(mpw masterpassword.keystore) KEY_PW_ANDROID=$(mpw masterpassword-android) gradle --no-daemon clean masterpassword-android:assembleRelease
-
-
-Note:
-
- - At the time of writing, Android does not build with JDK 9+.  As such, the above command must be ran with JAVA_HOME pointing to JDK 7-8.
- - The release keystores are not included in the repository.  They are maintained by Maarten Billemont (lhunath@lyndir.com).

build.gradle

@@ -1,55 +0,0 @@
-import com.github.spotbugs.SpotBugsTask
-
-
-buildscript {
-    repositories {
-        google()
-        jcenter()
-        gradlePluginPortal()
-    }
-
-    dependencies {
-        classpath group: 'com.android.tools.build', name: 'gradle', version: '3.5.0'
-        classpath group: 'gradle.plugin.com.github.spotbugs', name: 'spotbugs-gradle-plugin', version: '2.0.0'
-    }
-}
-
-allprojects {
-    group = 'com.lyndir.masterpassword'
-    version = '2.7.12'
-}
-
-subprojects {
-    apply plugin: 'com.github.spotbugs'
-
-    repositories {
-        google()
-        jcenter()
-        mavenCentral()
-        maven { url 'https://maven.lyndir.com' }
-    }
-    dependencies {
-        //spotbugsPlugins group: 'com.h3xstream.findsecbugs', name: 'findsecbugs-plugin', version: '1.11.0'
-        //spotbugsPlugins group: 'com.mebigfatguy.sb-contrib', name: 'sb-contrib', version: '7.4.6'
-    }
-    spotbugs {
-        effort 'max'
-        showProgress true
-    }
-
-    tasks.withType( JavaCompile ) {
-        options.encoding = 'UTF-8'
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
-        options.compilerArgs << '-Xlint:unchecked'
-        if (it.name != JavaPlugin.COMPILE_JAVA_TASK_NAME) {
-            options.compilerArgs << '-Xlint:deprecation'
-        }
-    }
-    tasks.withType( SpotBugsTask ) {
-        reports {
-            xml.enabled = false
-            html.enabled = true
-        }
-    }
-}

core/c/lib/bcrypt/.source

@@ -0,0 +1,4 @@
+home=http://www.openwall.com/crypt/
+pkg=http://www.openwall.com/crypt/crypt_blowfish-1.3.tar.gz
+pkg_sha256=83fa01fca6996fe8d882b7f8e9ba0305a5664936100b01481ea3c6a8ce8d72fd
+patches=(arm)

core/c/lib/bcrypt/arm.patch

@@ -0,0 +1,12 @@
+--- x86.S	2014-11-21 09:09:58.000000000 -0500
++++ x86.S	2014-11-21 09:11:01.000000000 -0500
+@@ -199,5 +199,9 @@
+ #endif
+ 
+ #if defined(__ELF__) && defined(__linux__)
++#if defined(__arm__)
++.section .note.GNU-stack,"",%progbits
++#else
+ .section .note.GNU-stack,"",@progbits
+ #endif
++#endif

core/c/lib/scrypt/.source

@@ -0,0 +1,4 @@
+home=http://www.tarsnap.com/scrypt.html
+git=https://github.com/Tarsnap/scrypt.git
+pkg=https://www.tarsnap.com/scrypt/scrypt-1.2.1.tgz
+pkg_sha256=4621f5e7da2f802e20850436219370092e9fcda93bd598f6d4236cce33f4c577

core/c/lib/scrypt/osx.patch

@@ -0,0 +1,38 @@
+diff -ruN /Users/lhunath/.src/scrypt/Makefile ./Makefile
+--- /Users/lhunath/.src/scrypt/Makefile	2014-05-02 11:28:58.000000000 -0400
++++ ./Makefile	2014-05-02 12:07:27.000000000 -0400
+@@ -2,11 +2,11 @@
+ VER?=	nosse
+ SRCS=	main.c
+ LDADD+=	-lcrypto
+-WARNS?=	6
++WARNS?=	0
+ 
+ # We have a config file for FreeBSD
+ CFLAGS	+=	-I .
+-CFLAGS	+=	-DCONFIG_H_FILE=\"config_freebsd.h\"
++CFLAGS	+=	-DCONFIG_H_FILE=\"config_osx.h\"
+ 
+ # Include all possible object files containing built scrypt code.
+ CLEANFILES	+=	crypto_scrypt-ref.o
+diff -ruN /Users/lhunath/.src/scrypt/lib/util/memlimit.c ./lib/util/memlimit.c
+--- /Users/lhunath/.src/scrypt/lib/util/memlimit.c	2014-05-02 11:28:58.000000000 -0400
++++ ./lib/util/memlimit.c	2014-05-02 11:52:42.000000000 -0400
+@@ -75,7 +75,7 @@
+ 	 * have returned to us.
+ 	 */
+ 	if (usermemlen == sizeof(uint64_t))
+-		usermem = *(uint64_t *)usermembuf;
++		usermem = *(uint64_t *)(void *)usermembuf;
+ 	else if (usermemlen == sizeof(uint32_t))
+ 		usermem = SIZE_MAX;
+ 	else
+diff -ruN /Users/lhunath/.src/scrypt/lib/util/memlimit.c ./lib/util/memlimit.c
+--- /Users/lhunath/.src/scrypt/config_osx.h	1969-12-31 19:00:00.000000000 -0500
++++ config_osx.h	2014-05-02 12:06:55.000000000 -0400
+@@ -0,0 +1,5 @@
++/* A default configuration for FreeBSD, used if there is no config.h. */
++
++#define HAVE_POSIX_MEMALIGN 1
++#define HAVE_SYSCTL_HW_USERMEM 1
++#define HAVE_SYS_PARAM_H 1

core/c/mpw-algorithm.c

@@ -0,0 +1,69 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+#include "mpw-algorithm.h"
+#include "mpw-algorithm_v0.c"
+#include "mpw-algorithm_v1.c"
+#include "mpw-algorithm_v2.c"
+#include "mpw-algorithm_v3.c"
+
+#define MP_N                32768
+#define MP_r                8
+#define MP_p                2
+#define MP_hash             PearlHashSHA256
+
+const uint8_t *mpw_masterKeyForUser(const char *fullName, const char *masterPassword, const MPAlgorithmVersion algorithmVersion) {
+
+    if (!fullName || !masterPassword)
+        return NULL;
+
+    switch (algorithmVersion) {
+        case MPAlgorithmVersion0:
+            return mpw_masterKeyForUser_v0( fullName, masterPassword );
+        case MPAlgorithmVersion1:
+            return mpw_masterKeyForUser_v1( fullName, masterPassword );
+        case MPAlgorithmVersion2:
+            return mpw_masterKeyForUser_v2( fullName, masterPassword );
+        case MPAlgorithmVersion3:
+            return mpw_masterKeyForUser_v3( fullName, masterPassword );
+        default:
+            ftl( "Unsupported version: %d", algorithmVersion );
+            return NULL;
+    }
+}
+
+const char *mpw_passwordForSite(const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
+        const MPSiteVariant siteVariant, const char *siteContext, const MPAlgorithmVersion algorithmVersion) {
+
+    if (!masterKey || !siteName)
+        return NULL;
+
+    switch (algorithmVersion) {
+        case MPAlgorithmVersion0:
+            return mpw_passwordForSite_v0( masterKey, siteName, siteType, siteCounter, siteVariant, siteContext );
+        case MPAlgorithmVersion1:
+            return mpw_passwordForSite_v1( masterKey, siteName, siteType, siteCounter, siteVariant, siteContext );
+        case MPAlgorithmVersion2:
+            return mpw_passwordForSite_v2( masterKey, siteName, siteType, siteCounter, siteVariant, siteContext );
+        case MPAlgorithmVersion3:
+            return mpw_passwordForSite_v3( masterKey, siteName, siteType, siteCounter, siteVariant, siteContext );
+        default:
+            ftl( "Unsupported version: %d", algorithmVersion );
+            return NULL;
+    }
+}

core/c/mpw-algorithm.h

@@ -0,0 +1,43 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+// NOTE: mpw is currently NOT thread-safe.
+#include "mpw-types.h"
+
+typedef enum(unsigned int, MPAlgorithmVersion) {
+    /** V0 did math with chars whose signedness was platform-dependent. */
+            MPAlgorithmVersion0,
+    /** V1 miscounted the byte-length of multi-byte site names. */
+            MPAlgorithmVersion1,
+    /** V2 miscounted the byte-length of multi-byte user names. */
+            MPAlgorithmVersion2,
+    /** V3 is the current version. */
+            MPAlgorithmVersion3,
+};
+#define MPAlgorithmVersionCurrent MPAlgorithmVersion3
+
+/** Derive the master key for a user based on their name and master password.
+ * @return A new MP_dkLen-byte allocated buffer or NULL if an allocation error occurred. */
+const uint8_t *mpw_masterKeyForUser(
+        const char *fullName, const char *masterPassword, const MPAlgorithmVersion algorithmVersion);
+
+/** Encode a password for the site from the given master key and site parameters.
+ * @return A newly allocated string or NULL if an allocation error occurred. */
+const char *mpw_passwordForSite(
+        const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
+        const MPSiteVariant siteVariant, const char *siteContext, const MPAlgorithmVersion algorithmVersion);

core/c/mpw-algorithm_v0.c

@@ -0,0 +1,140 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+#include <string.h>
+#include <errno.h>
+#include <arpa/inet.h>
+
+#include "mpw-types.h"
+#include "mpw-util.h"
+
+#define MP_N                32768
+#define MP_r                8
+#define MP_p                2
+#define MP_hash             PearlHashSHA256
+
+static const char *mpw_templateForType_v0(MPSiteType type, uint16_t seedByte) {
+
+    size_t count = 0;
+    const char **templates = mpw_templatesForType( type, &count );
+    char const *template = count? templates[seedByte % count]: NULL;
+    free( templates );
+    return template;
+}
+
+static const char mpw_characterFromClass_v0(char characterClass, uint16_t seedByte) {
+
+    const char *classCharacters = mpw_charactersInClass( characterClass );
+    return classCharacters[seedByte % strlen( classCharacters )];
+}
+
+static const uint8_t *mpw_masterKeyForUser_v0(const char *fullName, const char *masterPassword) {
+
+    const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
+    trc( "algorithm: v%d\n", 0 );
+    trc( "fullName: %s (%zu)\n", fullName, mpw_utf8_strlen( fullName ) );
+    trc( "masterPassword: %s\n", masterPassword );
+    trc( "key scope: %s\n", mpKeyScope );
+
+    // Calculate the master key salt.
+    // masterKeySalt = mpKeyScope . #fullName . fullName
+    size_t masterKeySaltSize = 0;
+    uint8_t *masterKeySalt = NULL;
+    mpw_push_string( &masterKeySalt, &masterKeySaltSize, mpKeyScope );
+    mpw_push_int( &masterKeySalt, &masterKeySaltSize, htonl( mpw_utf8_strlen( fullName ) ) );
+    mpw_push_string( &masterKeySalt, &masterKeySaltSize, fullName );
+    if (!masterKeySalt) {
+        ftl( "Could not allocate master key salt: %d\n", errno );
+        return NULL;
+    }
+    trc( "masterKeySalt ID: %s\n", mpw_id_buf( masterKeySalt, masterKeySaltSize ) );
+
+    // Calculate the master key.
+    // masterKey = scrypt( masterPassword, masterKeySalt )
+    const uint8_t *masterKey = mpw_scrypt( MP_dkLen, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
+    mpw_free( masterKeySalt, masterKeySaltSize );
+    if (!masterKey) {
+        ftl( "Could not allocate master key: %d\n", errno );
+        return NULL;
+    }
+    trc( "masterKey ID: %s\n", mpw_id_buf( masterKey, MP_dkLen ) );
+
+    return masterKey;
+}
+
+static const char *mpw_passwordForSite_v0(const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
+        const MPSiteVariant siteVariant, const char *siteContext) {
+
+    const char *siteScope = mpw_scopeForVariant( siteVariant );
+    trc( "algorithm: v%d\n", 0 );
+    trc( "siteName: %s\n", siteName );
+    trc( "siteCounter: %d\n", siteCounter );
+    trc( "siteVariant: %d\n", siteVariant );
+    trc( "siteType: %d\n", siteType );
+    trc( "site scope: %s, context: %s\n", siteScope, siteContext? "<empty>": siteContext );
+    trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)\n",
+            siteScope, mpw_hex_l( htonl( strlen( siteName ) ) ), siteName,
+            mpw_hex_l( htonl( siteCounter ) ),
+            mpw_hex_l( htonl( siteContext? strlen( siteContext ): 0 ) ), siteContext? "(null)": siteContext );
+
+    // Calculate the site seed.
+    // sitePasswordSeed = hmac-sha256( masterKey, siteScope . #siteName . siteName . siteCounter . #siteContext . siteContext )
+    size_t sitePasswordInfoSize = 0;
+    uint8_t *sitePasswordInfo = NULL;
+    mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteScope );
+    mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( mpw_utf8_strlen( siteName ) ) );
+    mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteName );
+    mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( siteCounter ) );
+    if (siteContext) {
+        mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( mpw_utf8_strlen( siteContext ) ) );
+        mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteContext );
+    }
+    if (!sitePasswordInfo) {
+        ftl( "Could not allocate site seed info: %d\n", errno );
+        return NULL;
+    }
+    trc( "sitePasswordInfo ID: %s\n", mpw_id_buf( sitePasswordInfo, sitePasswordInfoSize ) );
+
+    const char *sitePasswordSeed = (const char *)mpw_hmac_sha256( masterKey, MP_dkLen, sitePasswordInfo, sitePasswordInfoSize );
+    mpw_free( sitePasswordInfo, sitePasswordInfoSize );
+    if (!sitePasswordSeed) {
+        ftl( "Could not allocate site seed: %d\n", errno );
+        return NULL;
+    }
+    trc( "sitePasswordSeed ID: %s\n", mpw_id_buf( sitePasswordSeed, 32 ) );
+
+    // Determine the template.
+    const char *template = mpw_templateForType_v0( siteType, htons( sitePasswordSeed[0] ) );
+    trc( "type %d, template: %s\n", siteType, template );
+    if (strlen( template ) > 32) {
+        ftl( "Template too long for password seed: %lu", strlen( template ) );
+        mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
+        return NULL;
+    }
+
+    // Encode the password from the seed using the template.
+    char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
+    for (size_t c = 0; c < strlen( template ); ++c) {
+        sitePassword[c] = mpw_characterFromClass_v0( template[c], htons( sitePasswordSeed[c + 1] ) );
+        trc( "class %c, index %u (0x%02X) -> character: %c\n",
+                template[c], htons( sitePasswordSeed[c + 1] ), htons( sitePasswordSeed[c + 1] ), sitePassword[c] );
+    }
+    mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
+
+    return sitePassword;
+}

core/c/mpw-algorithm_v1.c

@@ -0,0 +1,125 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+#include <string.h>
+#include <errno.h>
+#include <arpa/inet.h>
+
+#include "mpw-types.h"
+#include "mpw-util.h"
+
+#define MP_N                32768
+#define MP_r                8
+#define MP_p                2
+#define MP_hash             PearlHashSHA256
+
+static const uint8_t *mpw_masterKeyForUser_v1(const char *fullName, const char *masterPassword) {
+
+    const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
+    trc( "algorithm: v%d\n", 1 );
+    trc( "fullName: %s (%zu)\n", fullName, mpw_utf8_strlen( fullName ) );
+    trc( "masterPassword: %s\n", masterPassword );
+    trc( "key scope: %s\n", mpKeyScope );
+
+    // Calculate the master key salt.
+    // masterKeySalt = mpKeyScope . #fullName . fullName
+    size_t masterKeySaltSize = 0;
+    uint8_t *masterKeySalt = NULL;
+    mpw_push_string( &masterKeySalt, &masterKeySaltSize, mpKeyScope );
+    mpw_push_int( &masterKeySalt, &masterKeySaltSize, htonl( mpw_utf8_strlen( fullName ) ) );
+    mpw_push_string( &masterKeySalt, &masterKeySaltSize, fullName );
+    if (!masterKeySalt) {
+        ftl( "Could not allocate master key salt: %d\n", errno );
+        return NULL;
+    }
+    trc( "masterKeySalt ID: %s\n", mpw_id_buf( masterKeySalt, masterKeySaltSize ) );
+
+    // Calculate the master key.
+    // masterKey = scrypt( masterPassword, masterKeySalt )
+    const uint8_t *masterKey = mpw_scrypt( MP_dkLen, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
+    mpw_free( masterKeySalt, masterKeySaltSize );
+    if (!masterKey) {
+        ftl( "Could not allocate master key: %d\n", errno );
+        return NULL;
+    }
+    trc( "masterKey ID: %s\n", mpw_id_buf( masterKey, MP_dkLen ) );
+
+    return masterKey;
+}
+
+static const char *mpw_passwordForSite_v1(const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
+        const MPSiteVariant siteVariant, const char *siteContext) {
+
+    const char *siteScope = mpw_scopeForVariant( siteVariant );
+    trc( "algorithm: v%d\n", 1 );
+    trc( "siteName: %s\n", siteName );
+    trc( "siteCounter: %d\n", siteCounter );
+    trc( "siteVariant: %d\n", siteVariant );
+    trc( "siteType: %d\n", siteType );
+    trc( "site scope: %s, context: %s\n", siteScope, siteContext? "<empty>": siteContext );
+    trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)\n",
+            siteScope, mpw_hex_l( htonl( strlen( siteName ) ) ), siteName,
+            mpw_hex_l( htonl( siteCounter ) ),
+            mpw_hex_l( htonl( siteContext? strlen( siteContext ): 0 ) ), siteContext? "(null)": siteContext );
+
+    // Calculate the site seed.
+    // sitePasswordSeed = hmac-sha256( masterKey, siteScope . #siteName . siteName . siteCounter . #siteContext . siteContext )
+    size_t sitePasswordInfoSize = 0;
+    uint8_t *sitePasswordInfo = NULL;
+    mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteScope );
+    mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( mpw_utf8_strlen( siteName ) ) );
+    mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteName );
+    mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( siteCounter ) );
+    if (siteContext) {
+        mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( mpw_utf8_strlen( siteContext ) ) );
+        mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteContext );
+    }
+    if (!sitePasswordInfo) {
+        ftl( "Could not allocate site seed info: %d\n", errno );
+        return NULL;
+    }
+    trc( "sitePasswordInfo ID: %s\n", mpw_id_buf( sitePasswordInfo, sitePasswordInfoSize ) );
+
+    const uint8_t *sitePasswordSeed = mpw_hmac_sha256( masterKey, MP_dkLen, sitePasswordInfo, sitePasswordInfoSize );
+    mpw_free( sitePasswordInfo, sitePasswordInfoSize );
+    if (!sitePasswordSeed) {
+        ftl( "Could not allocate site seed: %d\n", errno );
+        return NULL;
+    }
+    trc( "sitePasswordSeed ID: %s\n", mpw_id_buf( sitePasswordSeed, 32 ) );
+
+    // Determine the template.
+    const char *template = mpw_templateForType( siteType, sitePasswordSeed[0] );
+    trc( "type %d, template: %s\n", siteType, template );
+    if (strlen( template ) > 32) {
+        ftl( "Template too long for password seed: %lu", strlen( template ) );
+        mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
+        return NULL;
+    }
+
+    // Encode the password from the seed using the template.
+    char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
+    for (size_t c = 0; c < strlen( template ); ++c) {
+        sitePassword[c] = mpw_characterFromClass( template[c], sitePasswordSeed[c + 1] );
+        trc( "class %c, index %u (0x%02X) -> character: %c\n", template[c], sitePasswordSeed[c + 1], sitePasswordSeed[c + 1],
+                sitePassword[c] );
+    }
+    mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
+
+    return sitePassword;
+}

core/c/mpw-algorithm_v2.c

@@ -0,0 +1,125 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+#include <string.h>
+#include <errno.h>
+#include <arpa/inet.h>
+
+#include "mpw-types.h"
+#include "mpw-util.h"
+
+#define MP_N                32768
+#define MP_r                8
+#define MP_p                2
+#define MP_hash             PearlHashSHA256
+
+static const uint8_t *mpw_masterKeyForUser_v2(const char *fullName, const char *masterPassword) {
+
+    const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
+    trc( "algorithm: v%d\n", 2 );
+    trc( "fullName: %s (%zu)\n", fullName, mpw_utf8_strlen( fullName ) );
+    trc( "masterPassword: %s\n", masterPassword );
+    trc( "key scope: %s\n", mpKeyScope );
+
+    // Calculate the master key salt.
+    // masterKeySalt = mpKeyScope . #fullName . fullName
+    size_t masterKeySaltSize = 0;
+    uint8_t *masterKeySalt = NULL;
+    mpw_push_string( &masterKeySalt, &masterKeySaltSize, mpKeyScope );
+    mpw_push_int( &masterKeySalt, &masterKeySaltSize, htonl( mpw_utf8_strlen( fullName ) ) );
+    mpw_push_string( &masterKeySalt, &masterKeySaltSize, fullName );
+    if (!masterKeySalt) {
+        ftl( "Could not allocate master key salt: %d\n", errno );
+        return NULL;
+    }
+    trc( "masterKeySalt ID: %s\n", mpw_id_buf( masterKeySalt, masterKeySaltSize ) );
+
+    // Calculate the master key.
+    // masterKey = scrypt( masterPassword, masterKeySalt )
+    const uint8_t *masterKey = mpw_scrypt( MP_dkLen, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
+    mpw_free( masterKeySalt, masterKeySaltSize );
+    if (!masterKey) {
+        ftl( "Could not allocate master key: %d\n", errno );
+        return NULL;
+    }
+    trc( "masterKey ID: %s\n", mpw_id_buf( masterKey, MP_dkLen ) );
+
+    return masterKey;
+}
+
+static const char *mpw_passwordForSite_v2(const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
+        const MPSiteVariant siteVariant, const char *siteContext) {
+
+    const char *siteScope = mpw_scopeForVariant( siteVariant );
+    trc( "algorithm: v%d\n", 2 );
+    trc( "siteName: %s\n", siteName );
+    trc( "siteCounter: %d\n", siteCounter );
+    trc( "siteVariant: %d\n", siteVariant );
+    trc( "siteType: %d\n", siteType );
+    trc( "site scope: %s, context: %s\n", siteScope, siteContext? "<empty>": siteContext );
+    trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)\n",
+            siteScope, mpw_hex_l( htonl( strlen( siteName ) ) ), siteName,
+            mpw_hex_l( htonl( siteCounter ) ),
+            mpw_hex_l( htonl( siteContext? strlen( siteContext ): 0 ) ), siteContext? "(null)": siteContext );
+
+    // Calculate the site seed.
+    // sitePasswordSeed = hmac-sha256( masterKey, siteScope . #siteName . siteName . siteCounter . #siteContext . siteContext )
+    size_t sitePasswordInfoSize = 0;
+    uint8_t *sitePasswordInfo = NULL;
+    mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteScope );
+    mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( strlen( siteName ) ) );
+    mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteName );
+    mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( siteCounter ) );
+    if (siteContext) {
+        mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( strlen( siteContext ) ) );
+        mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteContext );
+    }
+    if (!sitePasswordInfo) {
+        ftl( "Could not allocate site seed info: %d\n", errno );
+        return NULL;
+    }
+    trc( "sitePasswordInfo ID: %s\n", mpw_id_buf( sitePasswordInfo, sitePasswordInfoSize ) );
+
+    const uint8_t *sitePasswordSeed = mpw_hmac_sha256( masterKey, MP_dkLen, sitePasswordInfo, sitePasswordInfoSize );
+    mpw_free( sitePasswordInfo, sitePasswordInfoSize );
+    if (!sitePasswordSeed) {
+        ftl( "Could not allocate site seed: %d\n", errno );
+        return NULL;
+    }
+    trc( "sitePasswordSeed ID: %s\n", mpw_id_buf( sitePasswordSeed, 32 ) );
+
+    // Determine the template.
+    const char *template = mpw_templateForType( siteType, sitePasswordSeed[0] );
+    trc( "type %d, template: %s\n", siteType, template );
+    if (strlen( template ) > 32) {
+        ftl( "Template too long for password seed: %lu", strlen( template ) );
+        mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
+        return NULL;
+    }
+
+    // Encode the password from the seed using the template.
+    char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
+    for (size_t c = 0; c < strlen( template ); ++c) {
+        sitePassword[c] = mpw_characterFromClass( template[c], sitePasswordSeed[c + 1] );
+        trc( "class %c, index %u (0x%02X) -> character: %c\n", template[c], sitePasswordSeed[c + 1], sitePasswordSeed[c + 1],
+                sitePassword[c] );
+    }
+    mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
+
+    return sitePassword;
+}

core/c/mpw-algorithm_v3.c

@@ -0,0 +1,125 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+#include <string.h>
+#include <errno.h>
+#include <arpa/inet.h>
+
+#include "mpw-types.h"
+#include "mpw-util.h"
+
+#define MP_N                32768
+#define MP_r                8
+#define MP_p                2
+#define MP_hash             PearlHashSHA256
+
+static const uint8_t *mpw_masterKeyForUser_v3(const char *fullName, const char *masterPassword) {
+
+    const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
+    trc( "algorithm: v%d\n", 3 );
+    trc( "fullName: %s (%zu)\n", fullName, strlen( fullName ) );
+    trc( "masterPassword: %s\n", masterPassword );
+    trc( "key scope: %s\n", mpKeyScope );
+
+    // Calculate the master key salt.
+    // masterKeySalt = mpKeyScope . #fullName . fullName
+    size_t masterKeySaltSize = 0;
+    uint8_t *masterKeySalt = NULL;
+    mpw_push_string( &masterKeySalt, &masterKeySaltSize, mpKeyScope );
+    mpw_push_int( &masterKeySalt, &masterKeySaltSize, htonl( strlen( fullName ) ) );
+    mpw_push_string( &masterKeySalt, &masterKeySaltSize, fullName );
+    if (!masterKeySalt) {
+        ftl( "Could not allocate master key salt: %d\n", errno );
+        return NULL;
+    }
+    trc( "masterKeySalt ID: %s\n", mpw_id_buf( masterKeySalt, masterKeySaltSize ) );
+
+    // Calculate the master key.
+    // masterKey = scrypt( masterPassword, masterKeySalt )
+    const uint8_t *masterKey = mpw_scrypt( MP_dkLen, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
+    mpw_free( masterKeySalt, masterKeySaltSize );
+    if (!masterKey) {
+        ftl( "Could not allocate master key: %d\n", errno );
+        return NULL;
+    }
+    trc( "masterKey ID: %s\n", mpw_id_buf( masterKey, MP_dkLen ) );
+
+    return masterKey;
+}
+
+static const char *mpw_passwordForSite_v3(const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
+        const MPSiteVariant siteVariant, const char *siteContext) {
+
+    const char *siteScope = mpw_scopeForVariant( siteVariant );
+    trc( "algorithm: v%d\n", 3 );
+    trc( "siteName: %s\n", siteName );
+    trc( "siteCounter: %d\n", siteCounter );
+    trc( "siteVariant: %d\n", siteVariant );
+    trc( "siteType: %d\n", siteType );
+    trc( "site scope: %s, context: %s\n", siteScope, siteContext? "<empty>": siteContext );
+    trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)\n",
+            siteScope, mpw_hex_l( htonl( strlen( siteName ) ) ), siteName,
+            mpw_hex_l( htonl( siteCounter ) ),
+            mpw_hex_l( htonl( siteContext? strlen( siteContext ): 0 ) ), siteContext? "(null)": siteContext );
+
+    // Calculate the site seed.
+    // sitePasswordSeed = hmac-sha256( masterKey, siteScope . #siteName . siteName . siteCounter . #siteContext . siteContext )
+    size_t sitePasswordInfoSize = 0;
+    uint8_t *sitePasswordInfo = NULL;
+    mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteScope );
+    mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( strlen( siteName ) ) );
+    mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteName );
+    mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( siteCounter ) );
+    if (siteContext) {
+        mpw_push_int( &sitePasswordInfo, &sitePasswordInfoSize, htonl( strlen( siteContext ) ) );
+        mpw_push_string( &sitePasswordInfo, &sitePasswordInfoSize, siteContext );
+    }
+    if (!sitePasswordInfo) {
+        ftl( "Could not allocate site seed info: %d\n", errno );
+        return NULL;
+    }
+    trc( "sitePasswordInfo ID: %s\n", mpw_id_buf( sitePasswordInfo, sitePasswordInfoSize ) );
+
+    const uint8_t *sitePasswordSeed = mpw_hmac_sha256( masterKey, MP_dkLen, sitePasswordInfo, sitePasswordInfoSize );
+    mpw_free( sitePasswordInfo, sitePasswordInfoSize );
+    if (!sitePasswordSeed) {
+        ftl( "Could not allocate site seed: %d\n", errno );
+        return NULL;
+    }
+    trc( "sitePasswordSeed ID: %s\n", mpw_id_buf( sitePasswordSeed, 32 ) );
+
+    // Determine the template.
+    const char *template = mpw_templateForType( siteType, sitePasswordSeed[0] );
+    trc( "type %d, template: %s\n", siteType, template );
+    if (strlen( template ) > 32) {
+        ftl( "Template too long for password seed: %lu", strlen( template ) );
+        mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
+        return NULL;
+    }
+
+    // Encode the password from the seed using the template.
+    char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
+    for (size_t c = 0; c < strlen( template ); ++c) {
+        sitePassword[c] = mpw_characterFromClass( template[c], sitePasswordSeed[c + 1] );
+        trc( "class %c, index %u (0x%02X) -> character: %c\n", template[c], sitePasswordSeed[c + 1], sitePasswordSeed[c + 1],
+                sitePassword[c] );
+    }
+    mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
+
+    return sitePassword;
+}

core/c/mpw-types.c

@@ -0,0 +1,203 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#ifdef COLOR
+#include <curses.h>
+#include <term.h>
+#endif
+
+#include "mpw-types.h"
+#include "mpw-util.h"
+
+const MPSiteType mpw_typeWithName(const char *typeName) {
+
+    // Lower-case and trim optionally leading "Generated" string from typeName to standardize it.
+    size_t stdTypeNameOffset = 0;
+    size_t stdTypeNameSize = strlen( typeName );
+    if (strstr(typeName, "Generated" ) == typeName)
+        stdTypeNameSize -= (stdTypeNameOffset = strlen( "Generated" ));
+    char stdTypeName[stdTypeNameSize + 1];
+    for (size_t c = 0; c < stdTypeNameSize; ++c)
+        stdTypeName[c] = (char)tolower( typeName[c + stdTypeNameOffset] );
+    stdTypeName[stdTypeNameSize] = '\0';
+
+    // Find what site type is represented by the type name.
+    if (0 == strcmp( stdTypeName, "x" ) || 0 == strcmp( stdTypeName, "max" ) || 0 == strcmp( stdTypeName, "maximum" ))
+        return MPSiteTypeGeneratedMaximum;
+    if (0 == strcmp( stdTypeName, "l" ) || 0 == strcmp( stdTypeName, "long" ))
+        return MPSiteTypeGeneratedLong;
+    if (0 == strcmp( stdTypeName, "m" ) || 0 == strcmp( stdTypeName, "med" ) || 0 == strcmp( stdTypeName, "medium" ))
+        return MPSiteTypeGeneratedMedium;
+    if (0 == strcmp( stdTypeName, "b" ) || 0 == strcmp( stdTypeName, "basic" ))
+        return MPSiteTypeGeneratedBasic;
+    if (0 == strcmp( stdTypeName, "s" ) || 0 == strcmp( stdTypeName, "short" ))
+        return MPSiteTypeGeneratedShort;
+    if (0 == strcmp( stdTypeName, "i" ) || 0 == strcmp( stdTypeName, "pin" ))
+        return MPSiteTypeGeneratedPIN;
+    if (0 == strcmp( stdTypeName, "n" ) || 0 == strcmp( stdTypeName, "name" ))
+        return MPSiteTypeGeneratedName;
+    if (0 == strcmp( stdTypeName, "p" ) || 0 == strcmp( stdTypeName, "phrase" ))
+        return MPSiteTypeGeneratedPhrase;
+
+    ftl( "Not a generated type name: %s", stdTypeName );
+    return MPSiteTypeGeneratedLong;
+}
+
+const char **mpw_templatesForType(MPSiteType type, size_t *count) {
+
+    if (!(type & MPSiteTypeClassGenerated)) {
+        ftl( "Not a generated type: %d", type );
+        *count = 0;
+        return NULL;
+    }
+
+    switch (type) {
+        case MPSiteTypeGeneratedMaximum: {
+            return mpw_alloc_array( *count, const char *,
+                    "anoxxxxxxxxxxxxxxxxx", "axxxxxxxxxxxxxxxxxno" );
+        }
+        case MPSiteTypeGeneratedLong: {
+            return mpw_alloc_array( *count, const char *,
+                    "CvcvnoCvcvCvcv", "CvcvCvcvnoCvcv", "CvcvCvcvCvcvno",
+                    "CvccnoCvcvCvcv", "CvccCvcvnoCvcv", "CvccCvcvCvcvno",
+                    "CvcvnoCvccCvcv", "CvcvCvccnoCvcv", "CvcvCvccCvcvno",
+                    "CvcvnoCvcvCvcc", "CvcvCvcvnoCvcc", "CvcvCvcvCvccno",
+                    "CvccnoCvccCvcv", "CvccCvccnoCvcv", "CvccCvccCvcvno",
+                    "CvcvnoCvccCvcc", "CvcvCvccnoCvcc", "CvcvCvccCvccno",
+                    "CvccnoCvcvCvcc", "CvccCvcvnoCvcc", "CvccCvcvCvccno" );
+        }
+        case MPSiteTypeGeneratedMedium: {
+            return mpw_alloc_array( *count, const char *,
+                    "CvcnoCvc", "CvcCvcno" );
+        }
+        case MPSiteTypeGeneratedBasic: {
+            return mpw_alloc_array( *count, const char *,
+                    "aaanaaan", "aannaaan", "aaannaaa" );
+        }
+        case MPSiteTypeGeneratedShort: {
+            return mpw_alloc_array( *count, const char *,
+                    "Cvcn" );
+        }
+        case MPSiteTypeGeneratedPIN: {
+            return mpw_alloc_array( *count, const char *,
+                    "nnnn" );
+        }
+        case MPSiteTypeGeneratedName: {
+            return mpw_alloc_array( *count, const char *,
+                    "cvccvcvcv" );
+        }
+        case MPSiteTypeGeneratedPhrase: {
+            return mpw_alloc_array( *count, const char *,
+                    "cvcc cvc cvccvcv cvc", "cvc cvccvcvcv cvcv", "cv cvccv cvc cvcvccv" );
+        }
+        default: {
+            ftl( "Unknown generated type: %d", type );
+            *count = 0;
+            return NULL;
+        }
+    }
+}
+
+const char *mpw_templateForType(MPSiteType type, uint8_t seedByte) {
+
+    size_t count = 0;
+    const char **templates = mpw_templatesForType( type, &count );
+    char const *template = count? templates[seedByte % count]: NULL;
+    free( templates );
+    return template;
+}
+
+const MPSiteVariant mpw_variantWithName(const char *variantName) {
+
+    // Lower-case and trim optionally leading "generated" string from typeName to standardize it.
+    size_t stdVariantNameSize = strlen( variantName );
+    char stdVariantName[stdVariantNameSize + 1];
+    for (size_t c = 0; c < stdVariantNameSize; ++c)
+        stdVariantName[c] = (char)tolower( variantName[c] );
+    stdVariantName[stdVariantNameSize] = '\0';
+
+    if (0 == strcmp( stdVariantName, "p" ) || 0 == strcmp( stdVariantName, "password" ))
+        return MPSiteVariantPassword;
+    if (0 == strcmp( stdVariantName, "l" ) || 0 == strcmp( stdVariantName, "login" ))
+        return MPSiteVariantLogin;
+    if (0 == strcmp( stdVariantName, "a" ) || 0 == strcmp( stdVariantName, "answer" ))
+        return MPSiteVariantAnswer;
+
+    fprintf( stderr, "Not a variant name: %s", stdVariantName );
+    abort();
+}
+
+const char *mpw_scopeForVariant(MPSiteVariant variant) {
+
+    switch (variant) {
+        case MPSiteVariantPassword: {
+            return "com.lyndir.masterpassword";
+        }
+        case MPSiteVariantLogin: {
+            return "com.lyndir.masterpassword.login";
+        }
+        case MPSiteVariantAnswer: {
+            return "com.lyndir.masterpassword.answer";
+        }
+        default: {
+            fprintf( stderr, "Unknown variant: %d", variant );
+            abort();
+        }
+    }
+}
+
+const char *mpw_charactersInClass(char characterClass) {
+
+    switch (characterClass) {
+        case 'V':
+            return "AEIOU";
+        case 'C':
+            return "BCDFGHJKLMNPQRSTVWXYZ";
+        case 'v':
+            return "aeiou";
+        case 'c':
+            return "bcdfghjklmnpqrstvwxyz";
+        case 'A':
+            return "AEIOUBCDFGHJKLMNPQRSTVWXYZ";
+        case 'a':
+            return "AEIOUaeiouBCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz";
+        case 'n':
+            return "0123456789";
+        case 'o':
+            return "@&%?,=[]_:-+*$#!'^~;()/.";
+        case 'x':
+            return "AEIOUaeiouBCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz0123456789!@#$%^&*()";
+        case ' ':
+            return " ";
+        default: {
+            fprintf( stderr, "Unknown character class: %c", characterClass );
+            abort();
+        }
+    }
+}
+
+const char mpw_characterFromClass(char characterClass, uint8_t seedByte) {
+
+    const char *classCharacters = mpw_charactersInClass( characterClass );
+    return classCharacters[seedByte % strlen( classCharacters )];
+}

core/c/mpw-types.h

@@ -0,0 +1,109 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+#ifndef _MPW_TYPES_H
+#define _MPW_TYPES_H
+#include <stdlib.h>
+#include <stdint.h>
+
+#ifdef NS_ENUM
+#define enum(_type, _name) NS_ENUM(_type, _name)
+#else
+#define enum(_type, _name) _type _name; enum
+#endif
+
+#define MP_dkLen            64
+
+//// Types.
+
+typedef enum( unsigned int, MPSiteVariant ) {
+    /** Generate a key for authentication. */
+            MPSiteVariantPassword,
+    /** Generate a name for identification. */
+            MPSiteVariantLogin,
+    /** Generate an answer to a security question. */
+            MPSiteVariantAnswer,
+};
+
+typedef enum( unsigned int, MPSiteTypeClass ) {
+    /** Generate the password. */
+            MPSiteTypeClassGenerated = 1 << 4,
+    /** Store the password. */
+            MPSiteTypeClassStored = 1 << 5,
+};
+
+typedef enum( unsigned int, MPSiteFeature ) {
+    /** Export the key-protected content data. */
+            MPSiteFeatureExportContent = 1 << 10,
+    /** Never export content. */
+            MPSiteFeatureDevicePrivate = 1 << 11,
+};
+
+typedef enum( unsigned int, MPSiteType) {
+    MPSiteTypeGeneratedMaximum = 0x0 | MPSiteTypeClassGenerated | 0x0,
+    MPSiteTypeGeneratedLong = 0x1 | MPSiteTypeClassGenerated | 0x0,
+    MPSiteTypeGeneratedMedium = 0x2 | MPSiteTypeClassGenerated | 0x0,
+    MPSiteTypeGeneratedBasic = 0x4 | MPSiteTypeClassGenerated | 0x0,
+    MPSiteTypeGeneratedShort = 0x3 | MPSiteTypeClassGenerated | 0x0,
+    MPSiteTypeGeneratedPIN = 0x5 | MPSiteTypeClassGenerated | 0x0,
+    MPSiteTypeGeneratedName = 0xE | MPSiteTypeClassGenerated | 0x0,
+    MPSiteTypeGeneratedPhrase = 0xF | MPSiteTypeClassGenerated | 0x0,
+
+    MPSiteTypeStoredPersonal = 0x0 | MPSiteTypeClassStored | MPSiteFeatureExportContent,
+    MPSiteTypeStoredDevicePrivate = 0x1 | MPSiteTypeClassStored | MPSiteFeatureDevicePrivate,
+};
+
+//// Type utilities.
+
+/**
+ * @return The variant represented by the given name.
+ */
+const MPSiteVariant mpw_variantWithName(const char *variantName);
+/**
+ * @return An internal string containing the scope identifier to apply when encoding for the given variant.
+ */
+const char *mpw_scopeForVariant(MPSiteVariant variant);
+
+/**
+ * @return The type represented by the given name.
+ */
+const MPSiteType mpw_typeWithName(const char *typeName);
+
+/**
+ * @return A newly allocated array of internal strings that express the templates to use for the given type.
+ *         The amount of elements in the array is stored in count.
+ *         If an unsupported type is given, count will be 0 and will return NULL.
+*          The array needs to be free'ed, the strings themselves must not be free'ed or modified.
+ */
+const char **mpw_templatesForType(MPSiteType type, size_t *count);
+/**
+ * @return An internal string that contains the password encoding template of the given type
+ *         for a seed that starts with the given byte.
+ */
+const char *mpw_templateForType(MPSiteType type, uint8_t seedByte);
+
+/**
+ * @return An internal string that contains all the characters that occur in the given character class.
+ */
+const char *mpw_charactersInClass(char characterClass);
+/**
+ * @return A character from given character class that encodes the given byte.
+ */
+const char mpw_characterFromClass(char characterClass, uint8_t seedByte);
+
+#endif // _MPW_TYPES_H

core/c/mpw-util.c

@@ -0,0 +1,282 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if COLOR
+#include <unistd.h>
+#include <curses.h>
+#include <term.h>
+#endif
+
+#if HAS_CPERCIVA
+#include <scrypt/crypto_scrypt.h>
+#include <scrypt/sha256.h>
+#elif HAS_SODIUM
+#include "sodium.h"
+#endif
+
+#ifndef trc
+int mpw_verbosity;
+#endif
+
+#include "mpw-util.h"
+
+void mpw_push_buf(uint8_t **const buffer, size_t *const bufferSize, const void *pushBuffer, const size_t pushSize) {
+
+    if (*bufferSize == (size_t)-1)
+        // The buffer was marked as broken, it is missing a previous push.  Abort to avoid corrupt content.
+        return;
+
+    *bufferSize += pushSize;
+    uint8_t *resizedBuffer = realloc( *buffer, *bufferSize );
+    if (!resizedBuffer) {
+        // realloc failed, we can't push.  Mark the buffer as broken.
+        mpw_free( *buffer, *bufferSize - pushSize );
+        *bufferSize = (size_t)-1;
+        *buffer = NULL;
+        return;
+    }
+
+    *buffer = resizedBuffer;
+    uint8_t *pushDst = *buffer + *bufferSize - pushSize;
+    memcpy( pushDst, pushBuffer, pushSize );
+}
+
+void mpw_push_string(uint8_t **buffer, size_t *const bufferSize, const char *pushString) {
+
+    mpw_push_buf( buffer, bufferSize, pushString, strlen( pushString ) );
+}
+
+void mpw_push_int(uint8_t **const buffer, size_t *const bufferSize, const uint32_t pushInt) {
+
+    mpw_push_buf( buffer, bufferSize, &pushInt, sizeof( pushInt ) );
+}
+
+void mpw_free(const void *buffer, const size_t bufferSize) {
+
+    if (buffer) {
+        memset( (void *)buffer, 0, bufferSize );
+        free( (void *)buffer );
+    }
+}
+
+void mpw_free_string(const char *string) {
+
+    mpw_free( string, strlen( string ) );
+}
+
+uint8_t const *mpw_scrypt(const size_t keySize, const char *secret, const uint8_t *salt, const size_t saltSize,
+        uint64_t N, uint32_t r, uint32_t p) {
+
+    if (!secret || !salt)
+        return NULL;
+
+    uint8_t *key = malloc( keySize );
+    if (!key)
+        return NULL;
+
+#if HAS_CPERCIVA
+    if (crypto_scrypt( (const uint8_t *)secret, strlen( secret ), salt, saltSize, N, r, p, key, keySize ) < 0) {
+        mpw_free( key, keySize );
+        return NULL;
+    }
+#elif HAS_SODIUM
+    if (crypto_pwhash_scryptsalsa208sha256_ll( (const uint8_t *)secret, strlen( secret ), salt, saltSize, N, r, p, key, keySize) != 0 ) {
+        mpw_free( key, keySize );
+        return NULL;
+    }
+#endif
+
+    return key;
+}
+
+uint8_t const *mpw_hmac_sha256(const uint8_t *key, const size_t keySize, const uint8_t *salt, const size_t saltSize) {
+
+#if HAS_CPERCIVA
+    uint8_t *const buffer = malloc( 32 );
+    if (!buffer)
+        return NULL;
+
+    HMAC_SHA256_Buf( key, keySize, salt, saltSize, buffer );
+    return buffer;
+#elif HAS_SODIUM
+    uint8_t *const buffer = malloc( crypto_auth_hmacsha256_BYTES );
+    if (!buffer)
+        return NULL;
+
+    crypto_auth_hmacsha256_state state;
+    if (crypto_auth_hmacsha256_init( &state, key, keySize ) != 0 ||
+        crypto_auth_hmacsha256_update( &state, salt, saltSize ) != 0 ||
+        crypto_auth_hmacsha256_final( &state, buffer ) != 0) {
+        mpw_free( buffer, crypto_auth_hmacsha256_BYTES );
+        return NULL;
+    }
+
+    return buffer;
+#endif
+
+    return NULL;
+}
+
+const char *mpw_id_buf(const void *buf, size_t length) {
+
+#if HAS_CPERCIVA
+    uint8_t hash[32];
+    SHA256_Buf( buf, length, hash );
+
+    return mpw_hex( hash, 32 );
+#elif HAS_SODIUM
+    uint8_t hash[crypto_hash_sha256_BYTES];
+    crypto_hash_sha256( hash, buf, length );
+
+    return mpw_hex( hash, crypto_hash_sha256_BYTES );
+#endif
+}
+
+static char **mpw_hex_buf = NULL;
+static unsigned int mpw_hex_buf_i = 0;
+
+const char *mpw_hex(const void *buf, size_t length) {
+
+    // FIXME
+    if (!mpw_hex_buf) {
+        mpw_hex_buf = malloc( 10 * sizeof( char * ) );
+        for (uint8_t i = 0; i < 10; ++i)
+            mpw_hex_buf[i] = NULL;
+    }
+    mpw_hex_buf_i = (mpw_hex_buf_i + 1) % 10;
+
+    mpw_hex_buf[mpw_hex_buf_i] = realloc( mpw_hex_buf[mpw_hex_buf_i], length * 2 + 1 );
+    for (size_t kH = 0; kH < length; kH++)
+        sprintf( &(mpw_hex_buf[mpw_hex_buf_i][kH * 2]), "%02X", ((const uint8_t *)buf)[kH] );
+
+    return mpw_hex_buf[mpw_hex_buf_i];
+}
+
+const char *mpw_hex_l(uint32_t number) {
+
+    return mpw_hex( &number, sizeof( number ) );
+}
+
+#ifdef COLOR
+static int putvari;
+static char *putvarc = NULL;
+static int termsetup;
+static int initputvar() {
+    if (!isatty(STDERR_FILENO))
+        return 0;
+    if (putvarc)
+        free( putvarc );
+    if (!termsetup) {
+        int status;
+        if (! (termsetup = (setupterm( NULL, STDERR_FILENO, &status ) == 0 && status == 1))) {
+            wrn( "Terminal doesn't support color (setupterm errno %d).\n", status );
+            return 0;
+        }
+    }
+
+    putvarc=(char *)calloc(256, sizeof(char));
+    putvari=0;
+    return 1;
+}
+static int putvar(int c) {
+    putvarc[putvari++]=c;
+    return 0;
+}
+#endif
+
+const char *mpw_identicon(const char *fullName, const char *masterPassword) {
+
+    const char *leftArm[] = { "╔", "╚", "╰", "═" };
+    const char *rightArm[] = { "╗", "╝", "╯", "═" };
+    const char *body[] = { "█", "░", "▒", "▓", "☺", "☻" };
+    const char *accessory[] = {
+            "◈", "◎", "◐", "◑", "◒", "◓", "☀", "☁", "☂", "☃", "☄", "★", "☆", "☎", "☏", "⎈", "⌂", "☘", "☢", "☣",
+            "☕", "⌚", "⌛", "⏰", "⚡", "⛄", "⛅", "☔", "♔", "♕", "♖", "♗", "♘", "♙", "♚", "♛", "♜", "♝", "♞", "♟",
+            "♨", "♩", "♪", "♫", "⚐", "⚑", "⚔", "⚖", "⚙", "⚠", "⌘", "⏎", "✄", "✆", "✈", "✉", "✌"
+    };
+
+    const uint8_t *identiconSeed = mpw_hmac_sha256( (const uint8_t *)masterPassword, strlen( masterPassword ), (const uint8_t *)fullName, strlen( fullName ) );
+    if (!identiconSeed)
+        return NULL;
+
+    char *colorString, *resetString;
+#ifdef COLOR
+    if (initputvar()) {
+        uint8_t colorIdentifier = (uint8_t)(identiconSeed[4] % 7 + 1);
+        tputs(tparm(tgetstr("AF", NULL), colorIdentifier), 1, putvar);
+        colorString = calloc(strlen(putvarc) + 1, sizeof(char));
+        strcpy(colorString, putvarc);
+        tputs(tgetstr("me", NULL), 1, putvar);
+        resetString = calloc(strlen(putvarc) + 1, sizeof(char));
+        strcpy(resetString, putvarc);
+    } else
+#endif
+    {
+        colorString = calloc( 1, sizeof( char ) );
+        resetString = calloc( 1, sizeof( char ) );
+    }
+
+    char *identicon = (char *)calloc( 256, sizeof( char ) );
+    snprintf( identicon, 256, "%s%s%s%s%s%s",
+            colorString,
+            leftArm[identiconSeed[0] % (sizeof( leftArm ) / sizeof( leftArm[0] ))],
+            body[identiconSeed[1] % (sizeof( body ) / sizeof( body[0] ))],
+            rightArm[identiconSeed[2] % (sizeof( rightArm ) / sizeof( rightArm[0] ))],
+            accessory[identiconSeed[3] % (sizeof( accessory ) / sizeof( accessory[0] ))],
+            resetString );
+
+    mpw_free( identiconSeed, 32 );
+    free( colorString );
+    free( resetString );
+    return identicon;
+}
+
+/**
+* @return the amount of bytes used by UTF-8 to encode a single character that starts with the given byte.
+*/
+static int mpw_utf8_sizeof(unsigned char utf8Byte) {
+
+    if (!utf8Byte)
+        return 0;
+    if ((utf8Byte & 0x80) == 0)
+        return 1;
+    if ((utf8Byte & 0xC0) != 0xC0)
+        return 0;
+    if ((utf8Byte & 0xE0) == 0xC0)
+        return 2;
+    if ((utf8Byte & 0xF0) == 0xE0)
+        return 3;
+    if ((utf8Byte & 0xF8) == 0xF0)
+        return 4;
+
+    return 0;
+}
+
+const size_t mpw_utf8_strlen(const char *utf8String) {
+
+    size_t charlen = 0;
+    char *remainingString = (char *)utf8String;
+    for (int charByteSize; (charByteSize = mpw_utf8_sizeof( (unsigned char)*remainingString )); remainingString += charByteSize)
+        ++charlen;
+
+    return charlen;
+}

core/c/mpw-util.h

@@ -0,0 +1,119 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+#include <stdio.h>
+#include <stdint.h>
+
+//// Logging.
+
+#ifndef trc
+extern int mpw_verbosity;
+    #define trc_level 3
+    #define trc(...) \
+        if (mpw_verbosity >= 3) \
+            fprintf( stderr, __VA_ARGS__ )
+#endif
+#ifndef dbg
+    #define dbg_level 2
+    #define dbg(...) \
+        if (mpw_verbosity >= 2) \
+            fprintf( stderr, __VA_ARGS__ )
+#endif
+#ifndef inf
+    #define inf_level 1
+    #define inf(...) \
+        if (mpw_verbosity >= 1) \
+            fprintf( stderr, __VA_ARGS__ )
+#endif
+#ifndef wrn
+    #define wrn_level 0
+    #define wrn(...) \
+        if (mpw_verbosity >= 0) \
+            fprintf( stderr, __VA_ARGS__ )
+#endif
+#ifndef err
+    #define err_level -1
+    #define err(...) \
+        if (mpw_verbosity >= -1) \
+            fprintf( stderr, __VA_ARGS__ )
+#endif
+#ifndef ftl
+    #define ftl_level -2
+    #define ftl(...) \
+        do { \
+            if (mpw_verbosity >= -2) \
+                fprintf( stderr, __VA_ARGS__ ); \
+            exit( 2 ); \
+        } while (0)
+#endif
+
+//// Buffers and memory.
+
+#define mpw_alloc_array(_count, _type, ...) ({ \
+    _type stackElements[] = { __VA_ARGS__ }; \
+    _count = sizeof( stackElements ) / sizeof( _type ); \
+    _type *allocElements = malloc( sizeof( stackElements ) ); \
+    memcpy( allocElements, stackElements, sizeof( stackElements ) ); \
+    allocElements; \
+ })
+
+/** Push a buffer onto a buffer.  reallocs the given buffer and appends the given buffer. */
+void mpw_push_buf(
+        uint8_t **const buffer, size_t *const bufferSize, const void *pushBuffer, const size_t pushSize);
+/** Push a string onto a buffer.  reallocs the given buffer and appends the given string. */
+void mpw_push_string(
+        uint8_t **buffer, size_t *const bufferSize, const char *pushString);
+/** Push an integer onto a buffer.  reallocs the given buffer and appends the given integer. */
+void mpw_push_int(
+        uint8_t **const buffer, size_t *const bufferSize, const uint32_t pushInt);
+/** Free a buffer after zero'ing its contents. */
+void mpw_free(
+        const void *buffer, const size_t bufferSize);
+/** Free a string after zero'ing its contents. */
+void mpw_free_string(
+        const char *string);
+
+//// Cryptographic functions.
+
+/** Perform a scrypt-based key derivation on the given key using the given salt and scrypt parameters.
+  * @return A new keySize-size allocated buffer. */
+uint8_t const *mpw_scrypt(
+        const size_t keySize, const char *secret, const uint8_t *salt, const size_t saltSize,
+        uint64_t N, uint32_t r, uint32_t p);
+/** Calculate a SHA256-based HMAC by encrypting the given salt with the given key.
+  * @return A new 32-byte allocated buffer. */
+uint8_t const *mpw_hmac_sha256(
+        const uint8_t *key, const size_t keySize, const uint8_t *salt, const size_t saltSize);
+
+//// Visualizers.
+
+/** Encode a buffer as a string of hexadecimal characters.
+  * @return A C-string in a reused buffer, do not free or store it. */
+const char *mpw_hex(const void *buf, size_t length);
+const char *mpw_hex_l(uint32_t number);
+/** Encode a fingerprint for a buffer.
+  * @return A C-string in a reused buffer, do not free or store it. */
+const char *mpw_id_buf(const void *buf, size_t length);
+/** Encode a visual fingerprint for a user.
+  * @return A newly allocated string. */
+const char *mpw_identicon(const char *fullName, const char *masterPassword);
+
+//// String utilities.
+
+/** @return The amount of display characters in the given UTF-8 string. */
+const size_t mpw_utf8_strlen(const char *utf8String);

core/java/algorithm/build.gradle

@@ -0,0 +1,15 @@
+plugins {
+    id 'java'
+}
+
+description = 'Master Password Algorithm Implementation'
+
+dependencies {
+    compile (group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.6-p10') {
+        exclude( module: 'joda-time' )
+    }
+
+    compile group: 'com.lambdaworks', name: 'scrypt', version: '1.4.0'
+    compile group: 'org.jetbrains', name: 'annotations', version: '13.0'
+    compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
+}

core/java/algorithm/pom.xml

@@ -0,0 +1,44 @@
+<?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 Algorithm Implementation</name>
+    <description>The implementation of the Master Password algorithm</description>
+
+    <artifactId>masterpassword-algorithm</artifactId>
+    <packaging>jar</packaging>
+
+    <!-- DEPENDENCY MANAGEMENT -->
+    <dependencies>
+
+        <!-- PROJECT REFERENCES -->
+        <dependency>
+            <groupId>com.lyndir.lhunath.opal</groupId>
+            <artifactId>opal-system</artifactId>
+            <version>1.6-p9</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>joda-time</groupId>
+                    <artifactId>joda-time</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- EXTERNAL DEPENDENCIES -->
+        <dependency>
+            <groupId>com.lambdaworks</groupId>
+            <artifactId>scrypt</artifactId>
+            <version>1.4.0</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPConstant.java

@@ -0,0 +1,99 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+package com.lyndir.masterpassword;
+
+import com.google.common.base.Charsets;
+import com.lyndir.lhunath.opal.system.MessageAuthenticationDigests;
+import com.lyndir.lhunath.opal.system.MessageDigests;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+
+
+/**
+ * @author lhunath, 2016-10-29
+ */
+public final class MPConstant {
+
+    /* Environment */
+
+    /**
+     * mpw: default user name if one is not provided.
+     */
+    public static final String env_userName     = "MP_USERNAME";
+    /**
+     * mpw: default site type if one is not provided.
+     *
+     * @see MPSiteType#forOption(String)
+     */
+    public static final String env_siteType     = "MP_SITETYPE";
+    /**
+     * mpw: default site counter value if one is not provided.
+     */
+    public static final String env_siteCounter  = "MP_SITECOUNTER";
+    /**
+     * mpw: default path to look for run configuration files if the platform default is not desired.
+     */
+    public static final String env_rcDir        = "MP_RCDIR";
+    /**
+     * mpw: permit automatic update checks.
+     */
+    public static final String env_checkUpdates = "MP_CHECKUPDATES";
+
+    /* Algorithm */
+
+    /**
+     * scrypt: CPU cost parameter.
+     */
+    public static final int                          scrypt_N      = 32768;
+    /**
+     * scrypt: Memory cost parameter.
+     */
+    public static final int                          scrypt_r      = 8;
+    /**
+     * scrypt: Parallelization parameter.
+     */
+    public static final int                          scrypt_p      = 2;
+    /**
+     * mpw: Master key size (byte).
+     */
+    public static final int                          mpw_dkLen     = 64;
+    /**
+     * mpw: Input character encoding.
+     */
+    public static final Charset                      mpw_charset         = Charsets.UTF_8;
+    /**
+     * mpw: Platform-agnostic byte order.
+     */
+    public static final ByteOrder                    mpw_byteOrder       = ByteOrder.BIG_ENDIAN;
+    /**
+     * mpw: Site digest.
+     */
+    public static final MessageAuthenticationDigests mpw_digest          = MessageAuthenticationDigests.HmacSHA256;
+    /**
+     * mpw: Key ID hash.
+     */
+    public static final MessageDigests               mpw_hash            = MessageDigests.SHA256;
+    /**
+     * mpw: validity for the time-based rolling counter.
+     */
+    public static final int                          mpw_counter_timeout = 5 * 60 /* s */;
+
+
+    public static final int MS_PER_S = 1000;
+}

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java

@@ -0,0 +1,98 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+package com.lyndir.masterpassword;
+
+import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
+
+import com.google.common.base.Charsets;
+import com.lyndir.lhunath.opal.system.MessageAuthenticationDigests;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.nio.*;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+
+
+/**
+ * @author lhunath, 15-03-29
+ */
+public class MPIdenticon {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MPIdenticon.class );
+
+    private static final Charset charset   = Charsets.UTF_8;
+    private static final Color[] colors    = {
+            Color.RED, Color.GREEN, Color.YELLOW, Color.BLUE, Color.MAGENTA, Color.CYAN, Color.MONO };
+    private static final char[]  leftArm   = { '╔', '╚', '╰', '═' };
+    private static final char[]  rightArm  = { '╗', '╝', '╯', '═' };
+    private static final char[]  body      = { '█', '░', '▒', '▓', '☺', '☻' };
+    private static final char[]  accessory = {
+            '◈', '◎', '◐', '◑', '◒', '◓', '☀', '☁', '☂', '☃', '☄', '★', '☆', '☎', '☏', '⎈', '⌂', '☘', '☢', '☣', '☕', '⌚', '⌛', '⏰', '⚡',
+            '⛄', '⛅', '☔', '♔', '♕', '♖', '♗', '♘', '♙', '♚', '♛', '♜', '♝', '♞', '♟', '♨', '♩', '♪', '♫', '⚐', '⚑', '⚔', '⚖', '⚙', '⚠',
+            '⌘', '⏎', '✄', '✆', '✈', '✉', '✌' };
+
+    private final String fullName;
+    private final Color  color;
+    private final String text;
+
+    public MPIdenticon(final String fullName, final String masterPassword) {
+        this( fullName, masterPassword.toCharArray() );
+    }
+
+    @SuppressWarnings("MethodCanBeVariableArityMethod")
+    public MPIdenticon(final String fullName, final char[] masterPassword) {
+        this.fullName = fullName;
+
+        byte[] masterPasswordBytes = charset.encode( CharBuffer.wrap( masterPassword ) ).array();
+        ByteBuffer identiconSeedBytes = ByteBuffer.wrap(
+                MessageAuthenticationDigests.HmacSHA256.of( masterPasswordBytes, fullName.getBytes( charset ) ) );
+        Arrays.fill( masterPasswordBytes, (byte) 0 );
+
+        IntBuffer identiconSeedBuffer = IntBuffer.allocate( identiconSeedBytes.capacity() );
+        while (identiconSeedBytes.hasRemaining())
+            identiconSeedBuffer.put( identiconSeedBytes.get() & 0xFF );
+        int[] identiconSeed = identiconSeedBuffer.array();
+
+        color = colors[identiconSeed[4] % colors.length];
+        text = strf( "%c%c%c%c", leftArm[identiconSeed[0] % leftArm.length], body[identiconSeed[1] % body.length],
+                     rightArm[identiconSeed[2] % rightArm.length], accessory[identiconSeed[3] % accessory.length] );
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public Color getColor() {
+        return color;
+    }
+
+    public enum Color {
+        RED,
+        GREEN,
+        YELLOW,
+        BLUE,
+        MAGENTA,
+        CYAN,
+        MONO
+    }
+}

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java

@@ -24,7 +24,6 @@ package com.lyndir.masterpassword;
  * @author lhunath
  */
 public enum MPSiteFeature {
-    // bit 10 - 15
 
     /**
      * Export the key-protected content data.
@@ -34,12 +33,7 @@ public enum MPSiteFeature {
     /**
      * Never export content.
      */
-    DevicePrivate( 1 << 11 ),
-
-    /**
-     * Don't use this as the primary authentication result type.
-     */
-    Alternative( 1 << 12 );
+    DevicePrivate( 1 << 11 );
 
     MPSiteFeature(final int mask) {
         this.mask = mask;

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteType.java

@@ -0,0 +1,236 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+package com.lyndir.masterpassword;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.util.*;
+import javax.annotation.Nullable;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NonNls;
+
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public enum MPSiteType {
+
+    GeneratedMaximum( "Max", "20 characters, contains symbols.", //
+                      ImmutableList.of( "x", "max", "maximum" ), // NON-NLS
+                      ImmutableList.of( new MPTemplate( "anoxxxxxxxxxxxxxxxxx" ), new MPTemplate( "axxxxxxxxxxxxxxxxxno" ) ), //
+                      MPSiteTypeClass.Generated, 0x0 ),
+
+    GeneratedLong( "Long", "Copy-friendly, 14 characters, contains symbols.", //
+                   ImmutableList.of( "l", "long" ), // NON-NLS
+                   ImmutableList.of( new MPTemplate( "CvcvnoCvcvCvcv" ), new MPTemplate( "CvcvCvcvnoCvcv" ),
+                                     new MPTemplate( "CvcvCvcvCvcvno" ), new MPTemplate( "CvccnoCvcvCvcv" ),
+                                     new MPTemplate( "CvccCvcvnoCvcv" ), new MPTemplate( "CvccCvcvCvcvno" ),
+                                     new MPTemplate( "CvcvnoCvccCvcv" ), new MPTemplate( "CvcvCvccnoCvcv" ),
+                                     new MPTemplate( "CvcvCvccCvcvno" ), new MPTemplate( "CvcvnoCvcvCvcc" ),
+                                     new MPTemplate( "CvcvCvcvnoCvcc" ), new MPTemplate( "CvcvCvcvCvccno" ),
+                                     new MPTemplate( "CvccnoCvccCvcv" ), new MPTemplate( "CvccCvccnoCvcv" ),
+                                     new MPTemplate( "CvccCvccCvcvno" ), new MPTemplate( "CvcvnoCvccCvcc" ),
+                                     new MPTemplate( "CvcvCvccnoCvcc" ), new MPTemplate( "CvcvCvccCvccno" ),
+                                     new MPTemplate( "CvccnoCvcvCvcc" ), new MPTemplate( "CvccCvcvnoCvcc" ),
+                                     new MPTemplate( "CvccCvcvCvccno" ) ), //
+                   MPSiteTypeClass.Generated, 0x1 ),
+
+    GeneratedMedium( "Medium", "Copy-friendly, 8 characters, contains symbols.", //
+                     ImmutableList.of( "m", "med", "medium" ), // NON-NLS
+                     ImmutableList.of( new MPTemplate( "CvcnoCvc" ), new MPTemplate( "CvcCvcno" ) ), //
+                     MPSiteTypeClass.Generated, 0x2 ),
+
+    GeneratedBasic( "Basic", "8 characters, no symbols.", //
+                    ImmutableList.of( "b", "basic" ), // NON-NLS
+                    ImmutableList.of( new MPTemplate( "aaanaaan" ), new MPTemplate( "aannaaan" ), new MPTemplate( "aaannaaa" ) ), //
+                    MPSiteTypeClass.Generated, 0x3 ),
+
+    GeneratedShort( "Short", "Copy-friendly, 4 characters, no symbols.", //
+                    ImmutableList.of( "s", "short" ), // NON-NLS
+                    ImmutableList.of( new MPTemplate( "Cvcn" ) ), //
+                    MPSiteTypeClass.Generated, 0x4 ),
+
+    GeneratedPIN( "PIN", "4 numbers.", //
+                  ImmutableList.of( "i", "pin" ), // NON-NLS
+                  ImmutableList.of( new MPTemplate( "nnnn" ) ), //
+                  MPSiteTypeClass.Generated, 0x5 ),
+
+    GeneratedName( "Name", "9 letter name.", //
+                   ImmutableList.of( "n", "name" ), // NON-NLS
+                   ImmutableList.of( new MPTemplate( "cvccvcvcv" ) ), //
+                   MPSiteTypeClass.Generated, 0xE ),
+
+    GeneratedPhrase( "Phrase", "20 character sentence.", //
+                     ImmutableList.of( "p", "phrase" ), // NON-NLS
+                     ImmutableList.of( new MPTemplate( "cvcc cvc cvccvcv cvc" ), new MPTemplate( "cvc cvccvcvcv cvcv" ),
+                                       new MPTemplate( "cv cvccv cvc cvcvccv" ) ), //
+                     MPSiteTypeClass.Generated, 0xF ),
+
+    StoredPersonal( "Personal", "AES-encrypted, exportable.", //
+                    ImmutableList.of( "personal" ), // NON-NLS
+                    ImmutableList.<MPTemplate>of(), //
+                    MPSiteTypeClass.Stored, 0x0, MPSiteFeature.ExportContent ),
+
+    StoredDevicePrivate( "Device", "AES-encrypted, not exported.", //
+                         ImmutableList.of( "device" ), // NON-NLS
+                         ImmutableList.<MPTemplate>of(), //
+                         MPSiteTypeClass.Stored, 0x1, MPSiteFeature.DevicePrivate );
+
+    static final Logger logger = Logger.get( MPSiteType.class );
+
+    private final String             shortName;
+    private final String             description;
+    private final List<String>       options;
+    private final List<MPTemplate>   templates;
+    private final MPSiteTypeClass    typeClass;
+    private final int                typeIndex;
+    private final Set<MPSiteFeature> typeFeatures;
+
+    MPSiteType(final String shortName, final String description, final List<String> options, final List<MPTemplate> templates,
+               final MPSiteTypeClass typeClass, final int typeIndex, final MPSiteFeature... typeFeatures) {
+
+        this.shortName = shortName;
+        this.description = description;
+        this.options = options;
+        this.templates = templates;
+        this.typeClass = typeClass;
+        this.typeIndex = typeIndex;
+
+        ImmutableSet.Builder<MPSiteFeature> typeFeaturesBuilder = ImmutableSet.builder();
+        for (final MPSiteFeature typeFeature : typeFeatures) {
+            typeFeaturesBuilder.add( typeFeature );
+        }
+        this.typeFeatures = typeFeaturesBuilder.build();
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public String getDescription() {
+
+        return description;
+    }
+
+    public List<String> getOptions() {
+        return options;
+    }
+
+    public MPSiteTypeClass getTypeClass() {
+
+        return typeClass;
+    }
+
+    public Set<MPSiteFeature> getTypeFeatures() {
+
+        return typeFeatures;
+    }
+
+    public int getType() {
+        int mask = typeIndex | typeClass.getMask();
+        for (final MPSiteFeature typeFeature : typeFeatures)
+            mask |= typeFeature.getMask();
+
+        return mask;
+    }
+
+    /**
+     * @param option The option to select a type with.  It is matched case insensitively.
+     *
+     * @return The type registered for the given option.
+     */
+    public static MPSiteType forOption(final String option) {
+
+        for (final MPSiteType type : values())
+            if (type.getOptions().contains( option.toLowerCase( Locale.ROOT ) ))
+                return type;
+
+        throw logger.bug( "No type for option: %s", option );
+    }
+
+    /**
+     * @param name The name fromInt the type to look up.  It is matched case insensitively.
+     *
+     * @return The type registered with the given name.
+     */
+    @Contract("!null -> !null")
+    public static MPSiteType forName(@Nullable final String name) {
+
+        if (name == null)
+            return null;
+
+        for (final MPSiteType type : values())
+            if (type.name().equalsIgnoreCase( name ))
+                return type;
+
+        throw logger.bug( "No type for name: %s", name );
+    }
+
+    /**
+     * @param typeClass The class for which we look up types.
+     *
+     * @return All types that support the given class.
+     */
+    public static ImmutableList<MPSiteType> forClass(final MPSiteTypeClass typeClass) {
+
+        ImmutableList.Builder<MPSiteType> types = ImmutableList.builder();
+        for (final MPSiteType type : values())
+            if (type.getTypeClass() == typeClass)
+                types.add( type );
+
+        return types.build();
+    }
+
+    /**
+     * @param type The type for which we look up types.
+     *
+     * @return The type registered with the given type.
+     */
+    public static MPSiteType forType(final int type) {
+
+        for (final MPSiteType siteType : values())
+            if (siteType.getType() == type)
+                return siteType;
+
+        throw logger.bug( "No type: %s", type );
+    }
+
+    /**
+     * @param mask The mask for which we look up types.
+     *
+     * @return All types that support the given mask.
+     */
+    public static ImmutableList<MPSiteType> forMask(final int mask) {
+
+        int typeMask = mask & ~0xF;
+        ImmutableList.Builder<MPSiteType> types = ImmutableList.builder();
+        for (final MPSiteType siteType : values())
+            if (((siteType.getType() & ~0xF) & typeMask) != 0)
+                types.add( siteType );
+
+        return types.build();
+    }
+
+    public MPTemplate getTemplateAtRollingIndex(final int templateIndex) {
+        return templates.get( templateIndex % templates.size() );
+    }
+}

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteTypeClass.java

@@ -19,15 +19,21 @@
 package com.lyndir.masterpassword;
 
 /**
- * @author lhunath, 2018-06-03
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
  */
-public class MPException extends Exception {
+public enum MPSiteTypeClass {
+    Generated( 1 << 4 ),
+    Stored( 1 << 5 );
 
-    public MPException(final String message) {
-        super( message );
+    private final int mask;
+
+    MPSiteTypeClass(final int mask) {
+        this.mask = mask;
     }
 
-    public MPException(final String message, final Throwable cause) {
-        super( message, cause );
+    public int getMask() {
+        return mask;
     }
 }

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteVariant.java

@@ -0,0 +1,103 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+package com.lyndir.masterpassword;
+
+import com.google.common.collect.ImmutableList;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.util.List;
+import java.util.Locale;
+import javax.annotation.Nullable;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NonNls;
+
+
+/**
+ * @author lhunath, 14-12-02
+ */
+public enum MPSiteVariant {
+    Password( "Generate a key for authentication.", "Doesn't currently use a context.", //
+              ImmutableList.of( "p", "password" ), "com.lyndir.masterpassword" ), // NON-NLS
+    Login( "Generate a name for identification.", "Doesn't currently use a context.", //
+           ImmutableList.of( "l", "login" ), "com.lyndir.masterpassword.login" ), // NON-NLS
+    Answer( "Generate an answer to a security question.", "Empty for a universal site answer or\nthe most significant word(s) of the question.", //
+            ImmutableList.of( "a", "answer" ), "com.lyndir.masterpassword.answer" ); // NON-NLS
+
+    static final Logger logger = Logger.get( MPSiteType.class );
+
+    private final String       description;
+    private final String       contextDescription;
+    private final List<String> options;
+    private final String       scope;
+
+    MPSiteVariant(final String description, final String contextDescription, final List<String> options, @NonNls final String scope) {
+        this.contextDescription = contextDescription;
+
+        this.options = options;
+        this.description = description;
+        this.scope = scope;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getContextDescription() {
+        return contextDescription;
+    }
+
+    public List<String> getOptions() {
+        return options;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    /**
+     * @param option The option to select a variant with.  It is matched case insensitively.
+     *
+     * @return The variant registered for the given option.
+     */
+    public static MPSiteVariant forOption(final String option) {
+
+        for (final MPSiteVariant variant : values())
+            if (variant.getOptions().contains( option.toLowerCase( Locale.ROOT ) ))
+                return variant;
+
+        throw logger.bug( "No variant for option: %s", option );
+    }
+    /**
+     * @param name The name fromInt the variant to look up.  It is matched case insensitively.
+     *
+     * @return The variant registered with the given name.
+     */
+    @Contract("!null -> !null")
+    public static MPSiteVariant forName(@Nullable final String name) {
+
+        if (name == null)
+            return null;
+
+        for (final MPSiteVariant type : values())
+            if (type.name().equalsIgnoreCase( name ))
+                return type;
+
+        throw logger.bug( "No variant for name: %s", name );
+    }
+
+}

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java

@@ -18,7 +18,7 @@
 
 package com.lyndir.masterpassword;
 
-import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
 
 import com.google.common.collect.ImmutableList;
 import com.lyndir.lhunath.opal.system.util.MetaObject;
@@ -36,7 +36,7 @@ public class MPTemplate extends MetaObject implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private final String                         templateString;
+    private final String templateString;
     private final List<MPTemplateCharacterClass> template;
 
     MPTemplate(@NonNls final String templateString) {

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java

@@ -27,7 +27,6 @@ import org.jetbrains.annotations.NonNls;
  *
  * @author lhunath
  */
-@SuppressWarnings({ "HardcodedFileSeparator", "SpellCheckingInspection" })
 public enum MPTemplateCharacterClass {
 
     UpperVowel( 'V', "AEIOU" ),

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKey.java

@@ -0,0 +1,219 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+package com.lyndir.masterpassword;
+
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
+
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.lhunath.opal.system.*;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.util.Arrays;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
+/**
+ * @author lhunath, 2014-08-30
+ */
+public abstract class MasterKey {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger  logger               = Logger.get( MasterKey.class );
+    private static       boolean allowNativeByDefault = true;
+
+    @Nonnull
+    private final String fullName;
+    private boolean allowNative = allowNativeByDefault;
+
+    @Nullable
+    private byte[] masterKey;
+
+    @SuppressWarnings("MethodCanBeVariableArityMethod")
+    public static MasterKey create(final String fullName, final char[] masterPassword) {
+
+        return create( Version.CURRENT, fullName, masterPassword );
+    }
+
+    @Nonnull
+    @SuppressWarnings("MethodCanBeVariableArityMethod")
+    public static MasterKey create(final Version version, final String fullName, final char[] masterPassword) {
+
+        switch (version) {
+            case V0:
+                return new MasterKeyV0( fullName ).revalidate( masterPassword );
+            case V1:
+                return new MasterKeyV1( fullName ).revalidate( masterPassword );
+            case V2:
+                return new MasterKeyV2( fullName ).revalidate( masterPassword );
+            case V3:
+                return new MasterKeyV3( fullName ).revalidate( masterPassword );
+        }
+
+        throw new UnsupportedOperationException( strf( "Unsupported version: %s", version ) );
+    }
+
+    public static boolean isAllowNativeByDefault() {
+        return allowNativeByDefault;
+    }
+
+    /**
+     * Native libraries are useful for speeding up the performance of cryptographical functions.
+     * Sometimes, however, we may prefer to use Java-only code.
+     * For instance, for auditability / trust or because the native code doesn't work on our CPU/platform.
+     * <p/>
+     * This setter affects the default setting for any newly created {@link MasterKey}s.
+     *
+     * @param allowNative false to disallow the use of native libraries.
+     */
+    public static void setAllowNativeByDefault(final boolean allowNative) {
+        allowNativeByDefault = allowNative;
+    }
+
+    protected MasterKey(@Nonnull final String fullName) {
+
+        this.fullName = fullName;
+        logger.trc( "fullName: %s", fullName );
+    }
+
+    @Nullable
+    @SuppressWarnings("MethodCanBeVariableArityMethod")
+    protected abstract byte[] deriveKey(char[] masterPassword);
+
+    public abstract Version getAlgorithmVersion();
+
+    @Nonnull
+    public String getFullName() {
+
+        return fullName;
+    }
+
+    public boolean isAllowNative() {
+        return allowNative;
+    }
+
+    public MasterKey setAllowNative(final boolean allowNative) {
+        this.allowNative = allowNative;
+        return this;
+    }
+
+    @Nonnull
+    protected byte[] getKey() {
+
+        Preconditions.checkState( isValid() );
+        return Preconditions.checkNotNull( masterKey );
+    }
+
+    public byte[] getKeyID() {
+
+        return idForBytes( getKey() );
+    }
+
+    public abstract String encode(@Nonnull String siteName, MPSiteType siteType, @Nonnull UnsignedInteger siteCounter,
+                                  MPSiteVariant siteVariant, @Nullable String siteContext);
+
+    public boolean isValid() {
+        return masterKey != null;
+    }
+
+    public void invalidate() {
+
+        if (masterKey != null) {
+            Arrays.fill( masterKey, (byte) 0 );
+            masterKey = null;
+        }
+    }
+
+    @SuppressWarnings("MethodCanBeVariableArityMethod")
+    public MasterKey revalidate(final char[] masterPassword) {
+        invalidate();
+
+        logger.trc( "masterPassword: %s", new String( masterPassword ) );
+
+        long start = System.currentTimeMillis();
+        masterKey = deriveKey( masterPassword );
+
+        if (masterKey == null)
+            logger.dbg( "masterKey calculation failed after %.2fs.", (double)(System.currentTimeMillis() - start) / MPConstant.MS_PER_S );
+        else
+            logger.trc( "masterKey ID: %s (derived in %.2fs)", CodeUtils.encodeHex( idForBytes( masterKey ) ),
+                        (double)(System.currentTimeMillis() - start) / MPConstant.MS_PER_S );
+
+        return this;
+    }
+
+    protected abstract byte[] bytesForInt(int number);
+
+    protected abstract byte[] bytesForInt(@Nonnull UnsignedInteger number);
+
+    protected abstract byte[] idForBytes(byte[] bytes);
+
+    public enum Version {
+        /**
+         * bugs:
+         * - does math with chars whose signedness was platform-dependent.
+         * - miscounted the byte-length fromInt multi-byte site names.
+         * - miscounted the byte-length fromInt multi-byte full names.
+         */
+        V0,
+        /**
+         * bugs:
+         * - miscounted the byte-length fromInt multi-byte site names.
+         * - miscounted the byte-length fromInt multi-byte full names.
+         */
+        V1,
+        /**
+         * bugs:
+         * - miscounted the byte-length fromInt multi-byte full names.
+         */
+        V2,
+        /**
+         * bugs:
+         * - no known issues.
+         */
+        V3;
+
+        public static final Version CURRENT = V3;
+
+        public static Version fromInt(final int algorithmVersion) {
+
+            return values()[algorithmVersion];
+        }
+
+        public int toInt() {
+
+            return ordinal();
+        }
+
+        public String toBundleVersion() {
+            switch (this) {
+                case V0:
+                    return "1.0";
+                case V1:
+                    return "2.0";
+                case V2:
+                    return "2.1";
+                case V3:
+                    return "2.2";
+            }
+
+            throw new UnsupportedOperationException( strf( "Unsupported version: %s", this ) );
+        }
+    }
+}

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV0.java

@@ -0,0 +1,170 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+package com.lyndir.masterpassword;
+
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Bytes;
+import com.google.common.primitives.UnsignedInteger;
+import com.lambdaworks.crypto.SCrypt;
+import com.lyndir.lhunath.opal.system.*;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.nio.*;
+import java.security.GeneralSecurityException;
+import java.util.Arrays;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
+/**
+ * bugs:
+ * - V2: miscounted the byte-length fromInt multi-byte full names.
+ * - V1: miscounted the byte-length fromInt multi-byte site names.
+ * - V0: does math with chars whose signedness was platform-dependent.
+ *
+ * @author lhunath, 2014-08-30
+ */
+public class MasterKeyV0 extends MasterKey {
+
+    private static final int                          MP_intLen    = 32;
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MasterKeyV0.class );
+
+    public MasterKeyV0(final String fullName) {
+        super( fullName );
+    }
+
+    @Override
+    public Version getAlgorithmVersion() {
+
+        return Version.V0;
+    }
+
+    @Nullable
+    @Override
+    protected byte[] deriveKey(final char[] masterPassword) {
+        String fullName = getFullName();
+        byte[] fullNameBytes = fullName.getBytes( MPConstant.mpw_charset );
+        byte[] fullNameLengthBytes = bytesForInt( fullName.length() );
+
+        String mpKeyScope = MPSiteVariant.Password.getScope();
+        byte[] masterKeySalt = Bytes.concat( mpKeyScope.getBytes( MPConstant.mpw_charset ), fullNameLengthBytes, fullNameBytes );
+        logger.trc( "key scope: %s", mpKeyScope );
+        logger.trc( "masterKeySalt ID: %s", CodeUtils.encodeHex( idForBytes( masterKeySalt ) ) );
+
+        ByteBuffer mpBytesBuf = MPConstant.mpw_charset.encode( CharBuffer.wrap( masterPassword ) );
+        byte[] mpBytes = new byte[mpBytesBuf.remaining()];
+        mpBytesBuf.get( mpBytes, 0, mpBytes.length );
+        Arrays.fill( mpBytesBuf.array(), (byte) 0 );
+
+        return scrypt( masterKeySalt, mpBytes );
+    }
+
+    @Nullable
+    protected byte[] scrypt(final byte[] masterKeySalt, final byte[] mpBytes) {
+        try {
+            if (isAllowNative())
+                return SCrypt.scrypt( mpBytes, masterKeySalt, MPConstant.scrypt_N, MPConstant.scrypt_r, MPConstant.scrypt_p, MPConstant.mpw_dkLen );
+            else
+                return SCrypt.scryptJ( mpBytes, masterKeySalt, MPConstant.scrypt_N, MPConstant.scrypt_r, MPConstant.scrypt_p, MPConstant.mpw_dkLen );
+        }
+        catch (final GeneralSecurityException e) {
+            logger.bug( e );
+            return null;
+        }
+        finally {
+            Arrays.fill( mpBytes, (byte) 0 );
+        }
+    }
+
+    @Override
+    public String encode(@Nonnull final String siteName, final MPSiteType siteType, @Nonnull UnsignedInteger siteCounter,
+                         final MPSiteVariant siteVariant, @Nullable final String siteContext) {
+        Preconditions.checkArgument( siteType.getTypeClass() == MPSiteTypeClass.Generated );
+        Preconditions.checkArgument( !siteName.isEmpty() );
+
+        logger.trc( "siteName: %s", siteName );
+        logger.trc( "siteCounter: %d", siteCounter.longValue() );
+        logger.trc( "siteVariant: %d (%s)", siteVariant.ordinal(), siteVariant );
+        logger.trc( "siteType: %d (%s)", siteType.ordinal(), siteType );
+
+        if (siteCounter.longValue() == 0)
+            siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (MPConstant.mpw_counter_timeout * 1000)) * MPConstant.mpw_counter_timeout );
+
+        String siteScope = siteVariant.getScope();
+        byte[] siteNameBytes = siteName.getBytes( MPConstant.mpw_charset );
+        byte[] siteNameLengthBytes = bytesForInt( siteName.length() );
+        byte[] siteCounterBytes = bytesForInt( siteCounter );
+        byte[] siteContextBytes = ((siteContext == null) || siteContext.isEmpty())? null: siteContext.getBytes( MPConstant.mpw_charset );
+        byte[] siteContextLengthBytes = bytesForInt( (siteContextBytes == null)? 0: siteContextBytes.length );
+        logger.trc( "site scope: %s, context: %s", siteScope, (siteContextBytes == null)? "<empty>": siteContext );
+        logger.trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)", siteScope, CodeUtils.encodeHex( siteNameLengthBytes ),
+                    siteName, CodeUtils.encodeHex( siteCounterBytes ), CodeUtils.encodeHex( siteContextLengthBytes ),
+                    (siteContextBytes == null)? "(null)": siteContext );
+
+        byte[] sitePasswordInfo = Bytes.concat( siteScope.getBytes( MPConstant.mpw_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes );
+        if (siteContextBytes != null)
+            sitePasswordInfo = Bytes.concat( sitePasswordInfo, siteContextLengthBytes, siteContextBytes );
+        logger.trc( "sitePasswordInfo ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordInfo ) ) );
+
+        byte[] sitePasswordSeedBytes = MPConstant.mpw_digest.of( getKey(), sitePasswordInfo );
+        int[] sitePasswordSeed = new int[sitePasswordSeedBytes.length];
+        for (int i = 0; i < sitePasswordSeedBytes.length; ++i) {
+            ByteBuffer buf = ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( ByteOrder.BIG_ENDIAN );
+            Arrays.fill( buf.array(), (byte) ((sitePasswordSeedBytes[i] > 0)? 0x00: 0xFF) );
+            buf.position( 2 );
+            buf.put( sitePasswordSeedBytes[i] ).rewind();
+            sitePasswordSeed[i] = buf.getInt() & 0xFFFF;
+        }
+        logger.trc( "sitePasswordSeed ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordSeedBytes ) ) );
+
+        Preconditions.checkState( sitePasswordSeed.length > 0 );
+        int templateIndex = sitePasswordSeed[0];
+        MPTemplate template = siteType.getTemplateAtRollingIndex( templateIndex );
+        logger.trc( "type %s, template: %s", siteType, template.getTemplateString() );
+
+        StringBuilder password = new StringBuilder( template.length() );
+        for (int i = 0; i < template.length(); ++i) {
+            int characterIndex = sitePasswordSeed[i + 1];
+            MPTemplateCharacterClass characterClass = template.getCharacterClassAtIndex( i );
+            char passwordCharacter = characterClass.getCharacterAtRollingIndex( characterIndex );
+            logger.trc( "class %c, index %d (0x%02X) -> character: %c", characterClass.getIdentifier(), characterIndex,
+                        sitePasswordSeed[i + 1], passwordCharacter );
+
+            password.append( passwordCharacter );
+        }
+
+        return password.toString();
+    }
+
+    @Override
+    protected byte[] bytesForInt(final int number) {
+        return ByteBuffer.allocate( MP_intLen / Byte.SIZE ).order( MPConstant.mpw_byteOrder ).putInt( number ).array();
+    }
+
+    @Override
+    protected byte[] bytesForInt(@Nonnull final UnsignedInteger number) {
+        return ByteBuffer.allocate( MP_intLen / Byte.SIZE ).order( MPConstant.mpw_byteOrder ).putInt( number.intValue() ).array();
+    }
+
+    @Override
+    protected byte[] idForBytes(final byte[] bytes) {
+        return MPConstant.mpw_hash.of( bytes );
+    }
+}

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV1.java

@@ -0,0 +1,103 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+package com.lyndir.masterpassword;
+
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Bytes;
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.lhunath.opal.system.*;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
+/**
+ * bugs:
+ * - V2: miscounted the byte-length fromInt multi-byte full names.
+ * - V1: miscounted the byte-length fromInt multi-byte site names.
+ *
+ * @author lhunath, 2014-08-30
+ */
+public class MasterKeyV1 extends MasterKeyV0 {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MasterKeyV1.class );
+
+    public MasterKeyV1(final String fullName) {
+        super( fullName );
+    }
+
+    @Override
+    public Version getAlgorithmVersion() {
+
+        return Version.V1;
+    }
+
+    @Override
+    public String encode(@Nonnull final String siteName, final MPSiteType siteType, @Nonnull UnsignedInteger siteCounter,
+                         final MPSiteVariant siteVariant, @Nullable final String siteContext) {
+        Preconditions.checkArgument( siteType.getTypeClass() == MPSiteTypeClass.Generated );
+        Preconditions.checkArgument( !siteName.isEmpty() );
+
+        logger.trc( "siteName: %s", siteName );
+        logger.trc( "siteCounter: %d", siteCounter.longValue() );
+        logger.trc( "siteVariant: %d (%s)", siteVariant.ordinal(), siteVariant );
+        logger.trc( "siteType: %d (%s)", siteType.ordinal(), siteType );
+
+        if (siteCounter.longValue() == 0)
+            siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (MPConstant.mpw_counter_timeout * 1000)) * MPConstant.mpw_counter_timeout );
+
+        String siteScope = siteVariant.getScope();
+        byte[] siteNameBytes = siteName.getBytes( MPConstant.mpw_charset );
+        byte[] siteNameLengthBytes = bytesForInt( siteName.length() );
+        byte[] siteCounterBytes = bytesForInt( siteCounter );
+        byte[] siteContextBytes = ((siteContext == null) || siteContext.isEmpty())? null: siteContext.getBytes( MPConstant.mpw_charset );
+        byte[] siteContextLengthBytes = bytesForInt( (siteContextBytes == null)? 0: siteContextBytes.length );
+        logger.trc( "site scope: %s, context: %s", siteScope, (siteContextBytes == null)? "<empty>": siteContext );
+        logger.trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)", siteScope, CodeUtils.encodeHex( siteNameLengthBytes ),
+                    siteName, CodeUtils.encodeHex( siteCounterBytes ), CodeUtils.encodeHex( siteContextLengthBytes ),
+                    (siteContextBytes == null)? "(null)": siteContext );
+
+        byte[] sitePasswordInfo = Bytes.concat( siteScope.getBytes( MPConstant.mpw_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes );
+        if (siteContextBytes != null)
+            sitePasswordInfo = Bytes.concat( sitePasswordInfo, siteContextLengthBytes, siteContextBytes );
+        logger.trc( "sitePasswordInfo ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordInfo ) ) );
+
+        byte[] sitePasswordSeed = MPConstant.mpw_digest.of( getKey(), sitePasswordInfo );
+        logger.trc( "sitePasswordSeed ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordSeed ) ) );
+
+        Preconditions.checkState( sitePasswordSeed.length > 0 );
+        int templateIndex = sitePasswordSeed[0] & 0xFF; // Mask the integer's sign.
+        MPTemplate template = siteType.getTemplateAtRollingIndex( templateIndex );
+        logger.trc( "type %s, template: %s", siteType, template.getTemplateString() );
+
+        StringBuilder password = new StringBuilder( template.length() );
+        for (int i = 0; i < template.length(); ++i) {
+            int characterIndex = sitePasswordSeed[i + 1] & 0xFF; // Mask the integer's sign.
+            MPTemplateCharacterClass characterClass = template.getCharacterClassAtIndex( i );
+            char passwordCharacter = characterClass.getCharacterAtRollingIndex( characterIndex );
+            logger.trc( "class %c, index %d (0x%02X) -> character: %c", characterClass.getIdentifier(), characterIndex,
+                        sitePasswordSeed[i + 1], passwordCharacter );
+
+            password.append( passwordCharacter );
+        }
+
+        return password.toString();
+    }
+}

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV2.java

@@ -0,0 +1,102 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+package com.lyndir.masterpassword;
+
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Bytes;
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.lhunath.opal.system.CodeUtils;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
+/**
+ * bugs:
+ * - V2: miscounted the byte-length fromInt multi-byte full names.
+ * 
+ * @author lhunath, 2014-08-30
+ */
+public class MasterKeyV2 extends MasterKeyV1 {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MasterKeyV2.class );
+
+    public MasterKeyV2(final String fullName) {
+        super( fullName );
+    }
+
+    @Override
+    public Version getAlgorithmVersion() {
+
+        return Version.V2;
+    }
+
+    @Override
+    public String encode(@Nonnull final String siteName, final MPSiteType siteType, @Nonnull UnsignedInteger siteCounter,
+                         final MPSiteVariant siteVariant, @Nullable final String siteContext) {
+        Preconditions.checkArgument( siteType.getTypeClass() == MPSiteTypeClass.Generated );
+        Preconditions.checkArgument( !siteName.isEmpty() );
+
+        logger.trc( "siteName: %s", siteName );
+        logger.trc( "siteCounter: %d", siteCounter.longValue() );
+        logger.trc( "siteVariant: %d (%s)", siteVariant.ordinal(), siteVariant );
+        logger.trc( "siteType: %d (%s)", siteType.ordinal(), siteType );
+
+        if (siteCounter.longValue() == 0)
+            siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (MPConstant.mpw_counter_timeout * 1000)) * MPConstant.mpw_counter_timeout );
+
+        String siteScope = siteVariant.getScope();
+        byte[] siteNameBytes = siteName.getBytes( MPConstant.mpw_charset );
+        byte[] siteNameLengthBytes = bytesForInt( siteNameBytes.length );
+        byte[] siteCounterBytes = bytesForInt( siteCounter );
+        byte[] siteContextBytes = ((siteContext == null) || siteContext.isEmpty())? null: siteContext.getBytes( MPConstant.mpw_charset );
+        byte[] siteContextLengthBytes = bytesForInt( (siteContextBytes == null)? 0: siteContextBytes.length );
+        logger.trc( "site scope: %s, context: %s", siteScope, (siteContextBytes == null)? "<empty>": siteContext );
+        logger.trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)", siteScope, CodeUtils.encodeHex( siteNameLengthBytes ),
+                    siteName, CodeUtils.encodeHex( siteCounterBytes ), CodeUtils.encodeHex( siteContextLengthBytes ),
+                    (siteContextBytes == null)? "(null)": siteContext );
+
+        byte[] sitePasswordInfo = Bytes.concat( siteScope.getBytes( MPConstant.mpw_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes );
+        if (siteContextBytes != null)
+            sitePasswordInfo = Bytes.concat( sitePasswordInfo, siteContextLengthBytes, siteContextBytes );
+        logger.trc( "sitePasswordInfo ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordInfo ) ) );
+
+        byte[] sitePasswordSeed = MPConstant.mpw_digest.of( getKey(), sitePasswordInfo );
+        logger.trc( "sitePasswordSeed ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordSeed ) ) );
+
+        Preconditions.checkState( sitePasswordSeed.length > 0 );
+        int templateIndex = sitePasswordSeed[0] & 0xFF; // Mask the integer's sign.
+        MPTemplate template = siteType.getTemplateAtRollingIndex( templateIndex );
+        logger.trc( "type %s, template: %s", siteType, template.getTemplateString() );
+
+        StringBuilder password = new StringBuilder( template.length() );
+        for (int i = 0; i < template.length(); ++i) {
+            int characterIndex = sitePasswordSeed[i + 1] & 0xFF; // Mask the integer's sign.
+            MPTemplateCharacterClass characterClass = template.getCharacterClassAtIndex( i );
+            char passwordCharacter = characterClass.getCharacterAtRollingIndex( characterIndex );
+            logger.trc( "class %c, index %d (0x%02X) -> character: %c", characterClass.getIdentifier(), characterIndex,
+                        sitePasswordSeed[i + 1], passwordCharacter );
+
+            password.append( passwordCharacter );
+        }
+
+        return password.toString();
+    }
+}

core/java/algorithm/src/main/java/com/lyndir/masterpassword/MasterKeyV3.java

@@ -0,0 +1,69 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+package com.lyndir.masterpassword;
+
+import com.google.common.primitives.Bytes;
+import com.lyndir.lhunath.opal.system.CodeUtils;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.util.Arrays;
+import javax.annotation.Nullable;
+
+
+/**
+ * bugs:
+ * - no known issues.
+ *
+ * @author lhunath, 2014-08-30
+ */
+public class MasterKeyV3 extends MasterKeyV2 {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MasterKeyV3.class );
+
+    public MasterKeyV3(final String fullName) {
+        super( fullName );
+    }
+
+    @Override
+    public Version getAlgorithmVersion() {
+
+        return Version.V3;
+    }
+
+    @Nullable
+    @Override
+    protected byte[] deriveKey(final char[] masterPassword) {
+        byte[] fullNameBytes = getFullName().getBytes( MPConstant.mpw_charset );
+        byte[] fullNameLengthBytes = bytesForInt( fullNameBytes.length );
+
+        String mpKeyScope = MPSiteVariant.Password.getScope();
+        byte[] masterKeySalt = Bytes.concat( mpKeyScope.getBytes( MPConstant.mpw_charset ), fullNameLengthBytes, fullNameBytes );
+        logger.trc( "key scope: %s", mpKeyScope );
+        logger.trc( "masterKeySalt ID: %s", CodeUtils.encodeHex( idForBytes( masterKeySalt ) ) );
+
+        ByteBuffer mpBytesBuf = MPConstant.mpw_charset.encode( CharBuffer.wrap( masterPassword ) );
+        byte[] mpBytes = new byte[mpBytesBuf.remaining()];
+        mpBytesBuf.get( mpBytes, 0, mpBytes.length );
+        Arrays.fill( mpBytesBuf.array(), (byte) 0 );
+
+        return scrypt( masterKeySalt, mpBytes );
+    }
+}

core/java/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java

@@ -17,10 +17,11 @@
 //==============================================================================
 
 /**
+ *
  * @author lhunath, 15-02-04
  */
 
-@ParametersAreNonnullByDefault
-package com.lyndir.masterpassword.gui;
+
+@ParametersAreNonnullByDefault package com.lyndir.masterpassword;
 
 import javax.annotation.ParametersAreNonnullByDefault;

core/java/model/build.gradle

@@ -0,0 +1,18 @@
+plugins {
+    id 'java'
+    id 'net.ltgt.apt' version '0.9'
+}
+
+description = 'Master Password Site Model'
+
+dependencies {
+    compile     project(':masterpassword-algorithm')
+
+    compile     group: 'joda-time', name: 'joda-time', version:'2.4'
+    compileOnly group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
+    apt         group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
+
+    testCompile group: 'org.testng', name: 'testng', version:'6.8.5'
+    testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
+}
+test.useTestNG()

core/java/model/pom.xml

@@ -0,0 +1,55 @@
+<?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 Site Model</name>
+    <description>A persistence model for Master Password sites.</description>
+
+    <artifactId>masterpassword-model</artifactId>
+    <packaging>jar</packaging>
+
+    <!-- DEPENDENCY MANAGEMENT -->
+    <dependencies>
+
+        <!-- PROJECT REFERENCES -->
+        <dependency>
+            <groupId>com.lyndir.masterpassword</groupId>
+            <artifactId>masterpassword-algorithm</artifactId>
+            <version>GIT-SNAPSHOT</version>
+        </dependency>
+
+        <!-- EXTERNAL DEPENDENCIES -->
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.google.auto.value</groupId>
+          <artifactId>auto-value</artifactId>
+          <version>1.0-rc1</version>
+          <scope>provided</scope>
+        </dependency>
+
+        <!-- TESTING -->
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

core/java/model/src/main/java/com/lyndir/masterpassword/model/IncorrectMasterPasswordException.java

@@ -0,0 +1,19 @@
+package com.lyndir.masterpassword.model;
+
+/**
+ * @author lhunath, 14-12-17
+ */
+public class IncorrectMasterPasswordException extends Exception {
+
+    private final MPUser user;
+
+    public IncorrectMasterPasswordException(final MPUser user) {
+        super( "Incorrect master password for user: " + user.getFullName() );
+
+        this.user = user;
+    }
+
+    public MPUser getUser() {
+        return user;
+    }
+}

core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java

@@ -0,0 +1,143 @@
+package com.lyndir.masterpassword.model;
+
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
+
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.masterpassword.*;
+import java.util.Objects;
+import javax.annotation.Nullable;
+import org.joda.time.Instant;
+
+
+/**
+ * @author lhunath, 14-12-05
+ */
+public class MPSite {
+
+    public static final MPSiteType      DEFAULT_TYPE    = MPSiteType.GeneratedLong;
+    public static final UnsignedInteger DEFAULT_COUNTER = UnsignedInteger.valueOf( 1 );
+
+    private final MPUser            user;
+    private       MasterKey.Version algorithmVersion;
+    private       Instant           lastUsed;
+    private       String            siteName;
+    private       MPSiteType        siteType;
+    private       UnsignedInteger   siteCounter;
+    private       int               uses;
+    private       String            loginName;
+
+    public MPSite(final MPUser user, final String siteName) {
+        this( user, siteName, DEFAULT_TYPE, DEFAULT_COUNTER );
+    }
+
+    public MPSite(final MPUser user, final String siteName, final MPSiteType siteType, final UnsignedInteger siteCounter) {
+        this.user = user;
+        this.algorithmVersion = MasterKey.Version.CURRENT;
+        this.lastUsed = new Instant();
+        this.siteName = siteName;
+        this.siteType = siteType;
+        this.siteCounter = siteCounter;
+    }
+
+    protected MPSite(final MPUser user, final MasterKey.Version algorithmVersion, final Instant lastUsed, final String siteName,
+                     final MPSiteType siteType, final UnsignedInteger siteCounter, final int uses, @Nullable final String loginName,
+                     @Nullable final String importContent) {
+        this.user = user;
+        this.algorithmVersion = algorithmVersion;
+        this.lastUsed = lastUsed;
+        this.siteName = siteName;
+        this.siteType = siteType;
+        this.siteCounter = siteCounter;
+        this.uses = uses;
+        this.loginName = loginName;
+    }
+
+    public String resultFor(final MasterKey masterKey) {
+        return resultFor( masterKey, MPSiteVariant.Password, null );
+    }
+
+    public String resultFor(final MasterKey masterKey, final MPSiteVariant variant, @Nullable final String context) {
+        return masterKey.encode( siteName, siteType, siteCounter, variant, context );
+    }
+
+    public MPUser getUser() {
+        return user;
+    }
+
+    @Nullable
+    protected String exportContent() {
+        return null;
+    }
+
+    public MasterKey.Version getAlgorithmVersion() {
+        return algorithmVersion;
+    }
+
+    public void setAlgorithmVersion(final MasterKey.Version mpVersion) {
+        this.algorithmVersion = mpVersion;
+    }
+
+    public Instant getLastUsed() {
+        return lastUsed;
+    }
+
+    public void updateLastUsed() {
+        lastUsed = new Instant();
+        user.updateLastUsed();
+    }
+
+    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;
+    }
+
+    public UnsignedInteger getSiteCounter() {
+        return siteCounter;
+    }
+
+    public void setSiteCounter(final UnsignedInteger siteCounter) {
+        this.siteCounter = siteCounter;
+    }
+
+    public int getUses() {
+        return uses;
+    }
+
+    public void setUses(final int uses) {
+        this.uses = uses;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(final String loginName) {
+        this.loginName = loginName;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        return (this == obj) || ((obj instanceof MPSite) && Objects.equals( siteName, ((MPSite) obj).siteName ));
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode( siteName );
+    }
+
+    @Override
+    public String toString() {
+        return strf( "{MPSite: %s}", siteName );
+    }
+}

core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteMarshaller.java

@@ -0,0 +1,131 @@
+package com.lyndir.masterpassword.model;
+
+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.Preconditions;
+import com.lyndir.masterpassword.MasterKey;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.joda.time.Instant;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+
+
+/**
+ * @author lhunath, 14-12-07
+ */
+public class MPSiteMarshaller {
+
+    private static final DateTimeFormatter rfc3339 = ISODateTimeFormat.dateTimeNoMillis();
+
+    private final StringBuilder export      = new StringBuilder();
+    private       ContentMode   contentMode = ContentMode.PROTECTED;
+    private MasterKey masterKey;
+
+    public static MPSiteMarshaller marshallSafe(final MPUser user) {
+        MPSiteMarshaller marshaller = new MPSiteMarshaller();
+        marshaller.marshallHeaderForSafeContent( user );
+        for (final MPSite site : user.getSites())
+            marshaller.marshallSite( site );
+
+        return marshaller;
+    }
+
+    public static MPSiteMarshaller marshallVisible(final MPUser user, final MasterKey masterKey) {
+        MPSiteMarshaller marshaller = new MPSiteMarshaller();
+        marshaller.marshallHeaderForVisibleContentWithKey( user, masterKey );
+        for (final MPSite site : user.getSites())
+            marshaller.marshallSite( site );
+
+        return marshaller;
+    }
+
+    private String marshallHeaderForSafeContent(final MPUser user) {
+        return marshallHeader( ContentMode.PROTECTED, user, null );
+    }
+
+    private String marshallHeaderForVisibleContentWithKey(final MPUser user, final MasterKey masterKey) {
+        return marshallHeader( ContentMode.VISIBLE, user, masterKey );
+    }
+
+    private String marshallHeader(final ContentMode contentMode, final MPUser user, @Nullable final MasterKey masterKey) {
+        this.contentMode = contentMode;
+        this.masterKey = masterKey;
+
+        StringBuilder header = new StringBuilder();
+        header.append( "# Master Password site export\n" );
+        header.append( "#     " ).append( this.contentMode.description() ).append( '\n' );
+        header.append( "# \n" );
+        header.append( "##\n" );
+        header.append( "# Format: 1\n" );
+        header.append( "# Date: " ).append( rfc3339.print( new Instant() ) ).append( '\n' );
+        header.append( "# User Name: " ).append( user.getFullName() ).append( '\n' );
+        header.append( "# Full Name: " ).append( user.getFullName() ).append( '\n' );
+        header.append( "# Avatar: " ).append( user.getAvatar() ).append( '\n' );
+        header.append( "# Key ID: " ).append( user.exportKeyID() ).append( '\n' );
+        header.append( "# Version: " ).append( MasterKey.Version.CURRENT.toBundleVersion() ).append( '\n' );
+        header.append( "# Algorithm: " ).append( MasterKey.Version.CURRENT.toInt() ).append( '\n' );
+        header.append( "# Default Type: " ).append( user.getDefaultType().getType() ).append( '\n' );
+        header.append( "# Passwords: " ).append( this.contentMode.name() ).append( '\n' );
+        header.append( "##\n" );
+        header.append( "#\n" );
+        header.append( "#               Last     Times  Password                      Login\t                     Site\tSite\n" );
+        header.append( "#               used      used      type                       name\t                     name\tpassword\n" );
+
+        export.append( header );
+        return header.toString();
+    }
+
+    public String marshallSite(final MPSite site) {
+        String exportLine = strf( "%s  %8d  %8s  %25s\t%25s\t%s", //
+                                  rfc3339.print( site.getLastUsed() ), // lastUsed
+                                  site.getUses(), // uses
+                                  strf( "%d:%d:%d", //
+                                        site.getSiteType().getType(), // type
+                                        site.getAlgorithmVersion().toInt(), // algorithm
+                                        site.getSiteCounter().intValue() ), // counter
+                                  ifNotNullElse( site.getLoginName(), "" ), // loginName
+                                  site.getSiteName(), // siteName
+                                  ifNotNullElse( contentMode.contentForSite( site, masterKey ), "" ) // password
+        );
+        export.append( exportLine ).append( '\n' );
+
+        return exportLine;
+    }
+
+    public String getExport() {
+        return export.toString();
+    }
+
+    public ContentMode getContentMode() {
+        return contentMode;
+    }
+
+    public enum ContentMode {
+        PROTECTED( "Export of site names and stored passwords (unless device-private) encrypted with the master key." ) {
+            @Override
+            public String contentForSite(final MPSite site, @Nullable final MasterKey masterKey) {
+                return site.exportContent();
+            }
+        },
+        VISIBLE( "Export of site names and passwords in clear-text." ) {
+            @Override
+            public String contentForSite(final MPSite site, @Nonnull final MasterKey masterKey) {
+                return site.resultFor( Preconditions.checkNotNull( masterKey, "Master key is required when content mode is VISIBLE." ) );
+            }
+        };
+
+        private final String description;
+
+        ContentMode(final String description) {
+            this.description = description;
+        }
+
+        public String description() {
+            return description;
+        }
+
+        public abstract String contentForSite(MPSite site, MasterKey masterKey);
+    }
+}

core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java

@@ -0,0 +1,37 @@
+package com.lyndir.masterpassword.model;
+
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
+
+import java.util.Objects;
+
+
+/**
+ * @author lhunath, 14-12-07
+ */
+public class MPSiteResult {
+
+    private final MPSite site;
+
+    public MPSiteResult(final MPSite site) {
+        this.site = site;
+    }
+
+    public MPSite getSite() {
+        return site;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        return (this == obj) || ((obj instanceof MPSiteResult) && Objects.equals( site, ((MPSiteResult) obj).site ));
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode( site );
+    }
+
+    @Override
+    public String toString() {
+        return strf( "{MPSiteResult: %s}", site );
+    }
+}

core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteUnmarshaller.java

@@ -0,0 +1,163 @@
+package com.lyndir.masterpassword.model;
+
+import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.io.CharStreams;
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.lhunath.opal.system.CodeUtils;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import com.lyndir.lhunath.opal.system.util.ConversionUtils;
+import com.lyndir.lhunath.opal.system.util.NNOperation;
+import com.lyndir.masterpassword.MPSiteType;
+import com.lyndir.masterpassword.MasterKey;
+import java.io.*;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+
+
+/**
+ * @author lhunath, 14-12-07
+ */
+public class MPSiteUnmarshaller {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger            logger            = Logger.get( MPSite.class );
+    private static final DateTimeFormatter rfc3339           = ISODateTimeFormat.dateTimeNoMillis();
+    private static final Pattern[]         unmarshallFormats = {
+            Pattern.compile( "^([^ ]+) +(\\d+) +(\\d+)(:\\d+)? +([^\t]+)\t(.*)" ),
+            Pattern.compile( "^([^ ]+) +(\\d+) +(\\d+)(:\\d+)?(:\\d+)? +([^\t]*)\t *([^\t]+)\t(.*)" ) };
+    private static final Pattern           headerFormat      = Pattern.compile( "^#\\s*([^:]+): (.*)" );
+
+    private final int     importFormat;
+    @SuppressWarnings({ "FieldCanBeLocal", "unused" })
+    private final int     mpVersion;
+    @SuppressWarnings({ "FieldCanBeLocal", "unused" })
+    private final boolean clearContent;
+    private final MPUser  user;
+
+    @Nonnull
+    public static MPSiteUnmarshaller unmarshall(@Nonnull final File file)
+            throws IOException {
+        try (Reader reader = new InputStreamReader( new FileInputStream( file ), Charsets.UTF_8 )) {
+            return unmarshall( CharStreams.readLines( reader ) );
+        }
+    }
+
+    @Nonnull
+    public static MPSiteUnmarshaller unmarshall(@Nonnull final List<String> lines) {
+        byte[] keyID = null;
+        String fullName = null;
+        int mpVersion = 0, importFormat = 0, avatar = 0;
+        boolean clearContent = false, headerStarted = false;
+        MPSiteType defaultType = MPSiteType.GeneratedLong;
+        MPSiteUnmarshaller marshaller = null;
+        final ImmutableList.Builder<MPSite> sites = ImmutableList.builder();
+
+        for (final String line : lines)
+            // Header delimitor.
+            if (line.startsWith( "##" ))
+                if (!headerStarted)
+                    // Starts the header.
+                    headerStarted = true;
+                else
+                    // Ends the header.
+                    marshaller = new MPSiteUnmarshaller( importFormat, mpVersion, fullName, keyID, avatar, defaultType, clearContent );
+
+                // Comment.
+            else if (line.startsWith( "#" )) {
+                if (headerStarted && (marshaller == null)) {
+                    // In header.
+                    Matcher headerMatcher = headerFormat.matcher( line );
+                    if (headerMatcher.matches()) {
+                        String name = headerMatcher.group( 1 ), value = headerMatcher.group( 2 );
+                        if ("Full Name".equalsIgnoreCase( name ) || "User Name".equalsIgnoreCase( name ))
+                            fullName = value;
+                        else if ("Key ID".equalsIgnoreCase( name ))
+                            keyID = CodeUtils.decodeHex( value );
+                        else if ("Algorithm".equalsIgnoreCase( name ))
+                            mpVersion = ConversionUtils.toIntegerNN( value );
+                        else if ("Format".equalsIgnoreCase( name ))
+                            importFormat = ConversionUtils.toIntegerNN( value );
+                        else if ("Avatar".equalsIgnoreCase( name ))
+                            avatar = ConversionUtils.toIntegerNN( value );
+                        else if ("Passwords".equalsIgnoreCase( name ))
+                            clearContent = "visible".equalsIgnoreCase( value );
+                        else if ("Default Type".equalsIgnoreCase( name ))
+                            defaultType = MPSiteType.forType( ConversionUtils.toIntegerNN( value ) );
+                    }
+                }
+            }
+
+            // No comment.
+            else if (marshaller != null)
+                ifNotNull( marshaller.unmarshallSite( line ), new NNOperation<MPSite>() {
+                    @Override
+                    public void apply(@Nonnull final MPSite site) {
+                        sites.add( site );
+                    }
+                } );
+
+        return Preconditions.checkNotNull( marshaller, "No full header found in import file." );
+    }
+
+    protected MPSiteUnmarshaller(final int importFormat, final int mpVersion, final String fullName, final byte[] keyID, final int avatar,
+                                 final MPSiteType defaultType, final boolean clearContent) {
+        this.importFormat = importFormat;
+        this.mpVersion = mpVersion;
+        this.clearContent = clearContent;
+
+        user = new MPUser( fullName, keyID, MasterKey.Version.fromInt( mpVersion ), avatar, defaultType, new DateTime( 0 ) );
+    }
+
+    @Nullable
+    public MPSite unmarshallSite(@Nonnull final String siteLine) {
+        Matcher siteMatcher = unmarshallFormats[importFormat].matcher( siteLine );
+        if (!siteMatcher.matches())
+            return null;
+
+        MPSite site;
+        switch (importFormat) {
+            case 0:
+                site = new MPSite( user, //
+                                   MasterKey.Version.fromInt( ConversionUtils.toIntegerNN( siteMatcher.group( 4 ).replace( ":", "" ) ) ), //
+                                   rfc3339.parseDateTime( siteMatcher.group( 1 ) ).toInstant(), //
+                                   siteMatcher.group( 5 ), //
+                                   MPSiteType.forType( ConversionUtils.toIntegerNN( siteMatcher.group( 3 ) ) ), MPSite.DEFAULT_COUNTER, //
+                                   ConversionUtils.toIntegerNN( siteMatcher.group( 2 ) ), //
+                                   null, //
+                                   siteMatcher.group( 6 ) );
+                break;
+
+            case 1:
+                site = new MPSite( user, //
+                                   MasterKey.Version.fromInt( ConversionUtils.toIntegerNN( siteMatcher.group( 4 ).replace( ":", "" ) ) ), //
+                                   rfc3339.parseDateTime( siteMatcher.group( 1 ) ).toInstant(), //
+                                   siteMatcher.group( 7 ), //
+                                   MPSiteType.forType( ConversionUtils.toIntegerNN( siteMatcher.group( 3 ) ) ),
+                                   UnsignedInteger.valueOf( siteMatcher.group( 5 ).replace( ":", "" ) ), //
+                                   ConversionUtils.toIntegerNN( siteMatcher.group( 2 ) ), //
+                                   siteMatcher.group( 6 ), //
+                                   siteMatcher.group( 8 ) );
+                break;
+
+            default:
+                throw logger.bug( "Unexpected format: %d", importFormat );
+        }
+
+        user.addSite( site );
+        return site;
+    }
+
+    public MPUser getUser() {
+        return user;
+    }
+}

core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java

@@ -0,0 +1,153 @@
+package com.lyndir.masterpassword.model;
+
+import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Sets;
+import com.lyndir.lhunath.opal.system.CodeUtils;
+import com.lyndir.masterpassword.MPSiteType;
+import com.lyndir.masterpassword.MasterKey;
+import java.util.*;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.joda.time.*;
+
+
+/**
+ * @author lhunath, 14-12-07
+ */
+public class MPUser implements Comparable<MPUser> {
+
+    private final String fullName;
+    private final Collection<MPSite> sites = Sets.newHashSet();
+
+    @Nullable
+    private       byte[]            keyID;
+    private final MasterKey.Version algorithmVersion;
+    private       int               avatar;
+    private       MPSiteType        defaultType;
+    private       ReadableInstant   lastUsed;
+
+    public MPUser(final String fullName) {
+        this( fullName, null );
+    }
+
+    public MPUser(final String fullName, @Nullable final byte[] keyID) {
+        this( fullName, keyID, MasterKey.Version.CURRENT, 0, MPSiteType.GeneratedLong, new DateTime() );
+    }
+
+    public MPUser(final String fullName, @Nullable final byte[] keyID, final MasterKey.Version algorithmVersion, final int avatar,
+                  final MPSiteType defaultType, final ReadableInstant lastUsed) {
+        this.fullName = fullName;
+        this.keyID = (keyID == null)? null: keyID.clone();
+        this.algorithmVersion = algorithmVersion;
+        this.avatar = avatar;
+        this.defaultType = defaultType;
+        this.lastUsed = lastUsed;
+    }
+
+    public Collection<MPSiteResult> findSitesByName(final String query) {
+        ImmutableList.Builder<MPSiteResult> results = ImmutableList.builder();
+        for (final MPSite site : getSites())
+            if (site.getSiteName().startsWith( query ))
+                results.add( new MPSiteResult( site ) );
+
+        return results.build();
+    }
+
+    public void addSite(final MPSite site) {
+        sites.add( site );
+    }
+
+    public void deleteSite(final MPSite site) {
+        sites.remove( site );
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public boolean hasKeyID() {
+        return keyID != null;
+    }
+
+    public String exportKeyID() {
+        return CodeUtils.encodeHex( keyID );
+    }
+
+    /**
+     * Performs an authentication attempt against the keyID for this user.
+     *
+     * Note: If this user doesn't have a keyID set yet, authentication will always succeed and the key ID will be set as a result.
+     *
+     * @param masterPassword The password to authenticate with.
+     *
+     * @return The master key for the user if authentication was successful.
+     *
+     * @throws IncorrectMasterPasswordException If authentication fails due to the given master password not matching the user's keyID.
+     */
+    @Nonnull
+    @SuppressWarnings("MethodCanBeVariableArityMethod")
+    public MasterKey authenticate(final char[] masterPassword)
+            throws IncorrectMasterPasswordException {
+        MasterKey masterKey = MasterKey.create( algorithmVersion, getFullName(), masterPassword );
+        if ((keyID == null) || (keyID.length == 0))
+            keyID = masterKey.getKeyID();
+        else if (!Arrays.equals( masterKey.getKeyID(), keyID ))
+            throw new IncorrectMasterPasswordException( this );
+
+        return masterKey;
+    }
+
+    public int getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(final int avatar) {
+        this.avatar = avatar;
+    }
+
+    public MPSiteType getDefaultType() {
+        return defaultType;
+    }
+
+    public void setDefaultType(final MPSiteType defaultType) {
+        this.defaultType = defaultType;
+    }
+
+    public ReadableInstant getLastUsed() {
+        return lastUsed;
+    }
+
+    public void updateLastUsed() {
+        lastUsed = new Instant();
+    }
+
+    public Iterable<MPSite> getSites() {
+        return sites;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        return (this == obj) || ((obj instanceof MPUser) && Objects.equals( fullName, ((MPUser) obj).fullName ));
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode( fullName );
+    }
+
+    @Override
+    public String toString() {
+        return strf( "{MPUser: %s}", fullName );
+    }
+
+    @Override
+    public int compareTo(final MPUser o) {
+        int comparison = lastUsed.compareTo( o.lastUsed );
+        if (comparison == 0)
+            comparison = fullName.compareTo( o.fullName );
+
+        return comparison;
+    }
+}

core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserFileManager.java

@@ -0,0 +1,124 @@
+package com.lyndir.masterpassword.model;
+
+import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
+
+import com.google.common.base.*;
+import com.google.common.collect.*;
+import com.google.common.io.CharSink;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import com.lyndir.masterpassword.MPConstant;
+import java.io.*;
+import javax.annotation.Nullable;
+
+
+/**
+ * Manages user data stored in user-specific {@code .mpsites} files under {@code .mpw.d}.
+ * @author lhunath, 14-12-07
+ */
+public class MPUserFileManager extends MPUserManager {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MPUserFileManager.class );
+    private static final MPUserFileManager instance;
+
+    static {
+        String rcDir = System.getenv( MPConstant.env_rcDir );
+        if (rcDir != null)
+            instance = create( new File( rcDir ) );
+        else
+            instance = create( new File( ifNotNullElseNullable( System.getProperty( "user.home" ), System.getenv( "HOME" ) ), ".mpw.d" ) );
+    }
+
+    private final File userFilesDirectory;
+
+    public static MPUserFileManager get() {
+        MPUserManager.instance = instance;
+        return instance;
+    }
+
+    public static MPUserFileManager create(final File userFilesDirectory) {
+        return new MPUserFileManager( userFilesDirectory );
+    }
+
+    protected MPUserFileManager(final File userFilesDirectory) {
+
+        super( unmarshallUsers( userFilesDirectory ) );
+        this.userFilesDirectory = userFilesDirectory;
+    }
+
+    private static Iterable<MPUser> unmarshallUsers(final File userFilesDirectory) {
+        if (!userFilesDirectory.mkdirs() && !userFilesDirectory.isDirectory()) {
+            logger.err( "Couldn't create directory for user files: %s", userFilesDirectory );
+            return ImmutableList.of();
+        }
+
+        return FluentIterable.from( listUserFiles( userFilesDirectory ) ).transform( new Function<File, MPUser>() {
+            @Nullable
+            @Override
+            public MPUser apply(@Nullable final File file) {
+                try {
+                    return MPSiteUnmarshaller.unmarshall( Preconditions.checkNotNull( file ) ).getUser();
+                }
+                catch (final IOException e) {
+                    logger.err( e, "Couldn't read user from: %s", file );
+                    return null;
+                }
+            }
+        } ).filter( Predicates.notNull() );
+    }
+
+    private static ImmutableList<File> listUserFiles(final File userFilesDirectory) {
+        return ImmutableList.copyOf( ifNotNullElse( userFilesDirectory.listFiles( new FilenameFilter() {
+            @Override
+            public boolean accept(final File dir, final String name) {
+                return name.endsWith( ".mpsites" );
+            }
+        } ), new File[0] ) );
+    }
+
+    @Override
+    public void addUser(final MPUser user) {
+        super.addUser( user );
+        save();
+    }
+
+    @Override
+    public void deleteUser(final MPUser user) {
+        super.deleteUser( user );
+        save();
+    }
+
+    /**
+     * Write the current user state to disk.
+     */
+    public void save() {
+        // Save existing users.
+        for (final MPUser user : getUsers())
+            try {
+                new CharSink() {
+                    @Override
+                    public Writer openStream()
+                            throws IOException {
+                        File mpsitesFile = new File( userFilesDirectory, user.getFullName() + ".mpsites" );
+                        return new OutputStreamWriter( new FileOutputStream( mpsitesFile ), Charsets.UTF_8 );
+                    }
+                }.write( MPSiteMarshaller.marshallSafe( user ).getExport() );
+            }
+            catch (final IOException e) {
+                logger.err( e, "Unable to save sites for user: %s", user );
+            }
+
+        // Remove deleted users.
+        for (final File userFile : listUserFiles( userFilesDirectory ))
+            if (getUserNamed( userFile.getName().replaceFirst( "\\.mpsites$", "" ) ) == null)
+                if (!userFile.delete())
+                    logger.err( "Couldn't delete file: %s", userFile );
+    }
+
+    /**
+     * @return The location on the file system where the user models are stored.
+     */
+    public File getPath() {
+        return userFilesDirectory;
+    }
+}

core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java

@@ -0,0 +1,39 @@
+package com.lyndir.masterpassword.model;
+
+import com.google.common.collect.*;
+import java.util.*;
+
+
+/**
+ * @author lhunath, 14-12-05
+ */
+public abstract class MPUserManager {
+
+    private final Map<String, MPUser> usersByName = Maps.newHashMap();
+    static MPUserManager instance;
+
+    public static MPUserManager get() {
+        return instance;
+    }
+
+    protected MPUserManager(final Iterable<MPUser> users) {
+        for (final MPUser user : users)
+            usersByName.put( user.getFullName(), user );
+    }
+
+    public SortedSet<MPUser> getUsers() {
+        return FluentIterable.from( usersByName.values() ).toSortedSet( Ordering.natural() );
+    }
+
+    public MPUser getUserNamed(final String fullName) {
+        return usersByName.get( fullName );
+    }
+
+    public void addUser(final MPUser user) {
+        usersByName.put( user.getFullName(), user );
+    }
+
+    public void deleteUser(final MPUser user) {
+        usersByName.remove( user.getFullName() );
+    }
+}

core/java/model/src/main/java/com/lyndir/masterpassword/model/package-info.java

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

core/java/tests/build.gradle

@@ -0,0 +1,13 @@
+plugins {
+    id 'java'
+}
+
+description = 'Master Password Test Suite'
+
+dependencies {
+    compile     project(':masterpassword-algorithm')
+
+    testCompile group: 'org.testng', name: 'testng', version:'6.8.5'
+    testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
+}
+test.useTestNG()

core/java/tests/pom.xml

@@ -0,0 +1,43 @@
+<?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 Test Suite</name>
+    <description>The standard test suite to ensure the Master Password algorithm is operating as it should</description>
+
+    <artifactId>masterpassword-tests</artifactId>
+    <packaging>jar</packaging>
+
+    <!-- DEPENDENCY MANAGEMENT -->
+    <dependencies>
+
+        <!-- PROJECT REFERENCES -->
+        <dependency>
+            <groupId>com.lyndir.masterpassword</groupId>
+            <artifactId>masterpassword-algorithm</artifactId>
+            <version>GIT-SNAPSHOT</version>
+        </dependency>
+
+        <!-- TESTING -->
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

core/java/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java

@@ -23,37 +23,27 @@ import com.google.common.collect.Lists;
 import com.google.common.primitives.UnsignedInteger;
 import com.lyndir.lhunath.opal.system.logging.Logger;
 import com.lyndir.lhunath.opal.system.util.ConversionUtils;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import com.lyndir.lhunath.opal.system.util.NNFunctionNN;
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.*;
+import java.util.Deque;
+import java.util.List;
 import java.util.concurrent.Callable;
-import javax.xml.XMLConstants;
+import javax.annotation.Nonnull;
 import javax.xml.parsers.*;
-import org.xml.sax.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
 import org.xml.sax.ext.DefaultHandler2;
 
 
 /**
  * @author lhunath, 2015-12-22
  */
-@SuppressWarnings({ "HardCodedStringLiteral", "ProhibitedExceptionDeclared" })
+@SuppressWarnings("HardCodedStringLiteral")
 public class MPTestSuite implements Callable<Boolean> {
 
     @SuppressWarnings("UnusedDeclaration")
-    private static final Logger           logger                = Logger.get( MPTestSuite.class );
-    private static final String           DEFAULT_RESOURCE_NAME = "mpw_tests.xml";
-    private static final SAXParserFactory factory               = SAXParserFactory.newInstance();
-
-    static {
-        try {
-            factory.setFeature( XMLConstants.FEATURE_SECURE_PROCESSING, true );
-        }
-        catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) {
-            throw new UnsupportedOperationException( e );
-        }
-    }
+    private static final Logger logger                = Logger.get( MPTestSuite.class );
+    private static final String DEFAULT_RESOURCE_NAME = "mpw_tests.xml";
 
     private final MPTests  tests;
     private       Listener listener;
@@ -63,18 +53,13 @@ public class MPTestSuite implements Callable<Boolean> {
         this( DEFAULT_RESOURCE_NAME );
     }
 
-    @SuppressFBWarnings("XXE_SAXPARSER")
     public MPTestSuite(final String resourceName)
             throws UnavailableException {
         try {
             tests = new MPTests();
             tests.cases = Lists.newLinkedList();
-            SAXParser   parser         = factory.newSAXParser();
-            InputStream resourceStream = Thread.currentThread().getContextClassLoader().getResourceAsStream( resourceName );
-            if (resourceStream == null)
-                throw new UnavailableException( new NullPointerException( "Missing resource: " + resourceName ) );
-
-            parser.parse( resourceStream, new DefaultHandler2() {
+            SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
+            parser.parse( Thread.currentThread().getContextClassLoader().getResourceAsStream( resourceName ), new DefaultHandler2() {
                 private final Deque<String> currentTags = Lists.newLinkedList();
                 private final Deque<StringBuilder> currentTexts = Lists.newLinkedList();
                 private MPTests.Case currentCase;
@@ -98,12 +83,12 @@ public class MPTestSuite implements Callable<Boolean> {
                         throws SAXException {
                     super.endElement( uri, localName, qName );
                     Preconditions.checkState( qName.equals( currentTags.pop() ) );
-                    String text = Preconditions.checkNotNull( currentTexts.pop() ).toString();
+                    String text = currentTexts.pop().toString();
 
                     if ("case".equals( qName ))
                         tests.cases.add( currentCase );
                     if ("algorithm".equals( qName ))
-                        currentCase.algorithm = ConversionUtils.toInteger( text ).orElse( null );
+                        currentCase.algorithm = ConversionUtils.toInteger( text ).orNull();
                     if ("fullName".equals( qName ))
                         currentCase.fullName = text;
                     if ("masterPassword".equals( qName ))
@@ -114,12 +99,12 @@ public class MPTestSuite implements Callable<Boolean> {
                         currentCase.siteName = text;
                     if ("siteCounter".equals( qName ))
                         currentCase.siteCounter = text.isEmpty()? null: UnsignedInteger.valueOf( text );
-                    if ("resultType".equals( qName ))
-                        currentCase.resultType = text;
-                    if ("keyPurpose".equals( qName ))
-                        currentCase.keyPurpose = text;
-                    if ("keyContext".equals( qName ))
-                        currentCase.keyContext = text;
+                    if ("siteType".equals( qName ))
+                        currentCase.siteType = text;
+                    if ("siteVariant".equals( qName ))
+                        currentCase.siteVariant = text;
+                    if ("siteContext".equals( qName ))
+                        currentCase.siteContext = text;
                     if ("result".equals( qName ))
                         currentCase.result = text;
                 }
@@ -129,11 +114,11 @@ public class MPTestSuite implements Callable<Boolean> {
                         throws SAXException {
                     super.characters( ch, start, length );
 
-                    Preconditions.checkNotNull( currentTexts.peek() ).append( ch, start, length );
+                    currentTexts.peek().append( ch, start, length );
                 }
             } );
         }
-        catch (final IllegalArgumentException | ParserConfigurationException | SAXException | IOException e) {
+        catch (IllegalArgumentException | ParserConfigurationException | SAXException | IOException e) {
             throw new UnavailableException( e );
         }
 
@@ -149,8 +134,7 @@ public class MPTestSuite implements Callable<Boolean> {
         return tests;
     }
 
-    public boolean forEach(final String testName, final TestCase testFunction)
-            throws Exception {
+    public boolean forEach(final String testName, final NNFunctionNN<MPTests.Case, Boolean> testFunction) {
         List<MPTests.Case> cases = tests.getCases();
         for (int c = 0; c < cases.size(); c++) {
             MPTests.Case testCase = cases.get( c );
@@ -160,7 +144,7 @@ public class MPTestSuite implements Callable<Boolean> {
             progress( Logger.Target.INFO, c, cases.size(), //
                       "[%s] on %s...", testName, testCase.getIdentifier() );
 
-            if (!testFunction.run( testCase )) {
+            if (!testFunction.apply( testCase )) {
                 progress( Logger.Target.ERROR, cases.size(), cases.size(), //
                           "[%s] on %s: FAILED!", testName, testCase.getIdentifier() );
 
@@ -184,13 +168,16 @@ public class MPTestSuite implements Callable<Boolean> {
     @Override
     public Boolean call()
             throws Exception {
-        return forEach( "mpw", testCase -> {
-            MPMasterKey masterKey = new MPMasterKey( testCase.getFullName(), testCase.getMasterPassword().toCharArray() );
-            String sitePassword = masterKey.siteResult( testCase.getSiteName(), testCase.getAlgorithm(), testCase.getSiteCounter(),
-                                                        testCase.getKeyPurpose(), testCase.getKeyContext(),
-                                                        testCase.getResultType(), null );
+        return forEach( "mpw", new NNFunctionNN<MPTests.Case, Boolean>() {
+            @Nonnull
+            @Override
+            public Boolean apply(@Nonnull final MPTests.Case testCase) {
+                MasterKey masterKey = MasterKey.create( testCase.getAlgorithm(), testCase.getFullName(), testCase.getMasterPassword() );
+                String sitePassword = masterKey.encode( testCase.getSiteName(), testCase.getSiteType(), testCase.getSiteCounter(),
+                                                        testCase.getSiteVariant(), testCase.getSiteContext() );
 
-            return testCase.getResult().equals( sitePassword );
+                return testCase.getResult().equals( sitePassword );
+            }
         } );
     }
 
@@ -204,17 +191,8 @@ public class MPTestSuite implements Callable<Boolean> {
     }
 
 
-    @FunctionalInterface
     public interface Listener {
 
         void progress(int current, int max, String messageFormat, Object... args);
     }
-
-
-    @FunctionalInterface
-    public interface TestCase {
-
-        boolean run(MPTests.Case testCase)
-                throws Exception;
-    }
 }

core/java/tests/src/main/java/com/lyndir/masterpassword/MPTests.java

@@ -18,18 +18,16 @@
 
 package com.lyndir.masterpassword;
 
-import static com.google.common.base.Preconditions.*;
+import static com.google.common.base.Preconditions.checkNotNull;
 import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
-import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
 
 import com.google.common.primitives.UnsignedInteger;
 import com.lyndir.lhunath.opal.system.logging.Logger;
-import com.lyndir.lhunath.opal.system.util.NNSupplier;
-import java.util.*;
-import java.util.stream.Collectors;
+import com.lyndir.lhunath.opal.system.util.*;
+import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.xml.bind.annotation.XmlTransient;
 
 
 /**
@@ -42,25 +40,15 @@ public class MPTests {
     @SuppressWarnings("UnusedDeclaration")
     private static final Logger logger = Logger.get( MPTests.class );
 
-    private final Set<String> filters = new HashSet<>();
-
     List<Case> cases;
 
     @Nonnull
     public List<Case> getCases() {
-        if (filters.isEmpty())
-            return checkNotNull( cases );
-
-        return checkNotNull( cases ).stream().filter( testCase -> {
-            for (final String filter : filters)
-                if (testCase.getIdentifier().startsWith( filter ))
-                    return true;
-            return false;
-        } ).collect( Collectors.toList() );
+        return checkNotNull( cases );
     }
 
     public Case getCase(final String identifier) {
-        for (final Case testCase : cases)
+        for (final Case testCase : getCases())
             if (identifier.equals( testCase.getIdentifier() ))
                 return testCase;
 
@@ -72,33 +60,26 @@ public class MPTests {
             return getCase( ID_DEFAULT );
         }
         catch (final IllegalArgumentException e) {
-            throw new IllegalStateException( strf( "Missing default case in test suite.  Add a case with id: %s", ID_DEFAULT ), e );
+            throw new IllegalStateException( strf( "Missing default case in test suite.  Add a case with id: %d", ID_DEFAULT ), e );
         }
     }
 
-    public boolean addFilters(final String... filters) {
-        return this.filters.addAll( Arrays.asList( filters ) );
-    }
-
     public static class Case {
 
-        String identifier;
-        String parent;
-        @Nullable
+        String  identifier;
+        String  parent;
         Integer algorithm;
-        String fullName;
-        String masterPassword;
-        String keyID;
-        String siteName;
-        @Nullable
+        String  fullName;
+        String  masterPassword;
+        String  keyID;
+        String  siteName;
         UnsignedInteger siteCounter;
-        String resultType;
-        String keyPurpose;
-        String keyContext;
-        String result;
+        String  siteType;
+        String  siteVariant;
+        String  siteContext;
+        String  result;
 
-        @XmlTransient
-        private Case parentCase;
+        private transient Case parentCase;
 
         public void initializeParentHierarchy(final MPTests tests) {
 
@@ -149,25 +130,25 @@ public class MPTests {
                     return checkNotNull( parentCase.siteCounter );
                 }
             } );
-            resultType = ifNotNullElse( resultType, new NNSupplier<String>() {
+            siteType = ifNotNullElse( siteType, new NNSupplier<String>() {
                 @Nonnull
                 @Override
                 public String get() {
-                    return checkNotNull( parentCase.resultType );
+                    return checkNotNull( parentCase.siteType );
                 }
             } );
-            keyPurpose = ifNotNullElse( keyPurpose, new NNSupplier<String>() {
+            siteVariant = ifNotNullElse( siteVariant, new NNSupplier<String>() {
                 @Nonnull
                 @Override
                 public String get() {
-                    return checkNotNull( parentCase.keyPurpose );
+                    return checkNotNull( parentCase.siteVariant );
                 }
             } );
-            keyContext = ifNotNullElse( keyContext, new NNSupplier<String>() {
+            siteContext = ifNotNullElse( siteContext, new NNSupplier<String>() {
                 @Nonnull
                 @Override
                 public String get() {
-                    return (parentCase == null)? "": checkNotNull( parentCase.keyContext );
+                    return (parentCase == null)? "": checkNotNull( parentCase.siteContext );
                 }
             } );
             result = ifNotNullElse( result, new NNSupplier<String>() {
@@ -190,8 +171,8 @@ public class MPTests {
         }
 
         @Nonnull
-        public MPAlgorithm getAlgorithm() {
-            return MPAlgorithm.Version.fromInt( checkNotNull( algorithm ) );
+        public MasterKey.Version getAlgorithm() {
+            return MasterKey.Version.fromInt( checkNotNull( algorithm ) );
         }
 
         @Nonnull
@@ -200,8 +181,8 @@ public class MPTests {
         }
 
         @Nonnull
-        public String getMasterPassword() {
-            return checkNotNull( masterPassword );
+        public char[] getMasterPassword() {
+            return checkNotNull( masterPassword ).toCharArray();
         }
 
         @Nonnull
@@ -219,18 +200,18 @@ public class MPTests {
         }
 
         @Nonnull
-        public MPResultType getResultType() {
-            return MPResultType.forName( checkNotNull( resultType ) );
+        public MPSiteType getSiteType() {
+            return MPSiteType.forName( checkNotNull( siteType ) );
         }
 
         @Nonnull
-        public MPKeyPurpose getKeyPurpose() {
-            return MPKeyPurpose.forName( checkNotNull( keyPurpose ) );
+        public MPSiteVariant getSiteVariant() {
+            return MPSiteVariant.forName( checkNotNull( siteVariant ) );
         }
 
         @Nonnull
-        public String getKeyContext() {
-            return checkNotNull( keyContext );
+        public String getSiteContext() {
+            return checkNotNull( siteContext );
         }
 
         @Nonnull

core/java/tests/src/main/resources/mpw_tests.xml

@@ -7,8 +7,8 @@
         <keyID>98EEF4D1DF46D849574A82A03C3177056B15DFFCA29BB3899DE4628453675302</keyID>
         <siteName>masterpasswordapp.com</siteName>
         <siteCounter>1</siteCounter>
-        <resultType>Long</resultType>
-        <keyPurpose>Authentication</keyPurpose>
+        <siteType>GeneratedLong</siteType>
+        <siteVariant>Password</siteVariant>
         <result><!-- abstract --></result>
     </case>
 
@@ -32,45 +32,45 @@
         <result>LiheCuwhSerz6)</result>
     </case>
     <case id="v3_loginName" parent="v3">
-        <keyPurpose>Identification</keyPurpose>
-        <resultType>Name</resultType>
+        <siteVariant>Login</siteVariant>
+        <siteType>GeneratedName</siteType>
         <result>wohzaqage</result>
     </case>
     <case id="v3_securityAnswer" parent="v3">
-        <keyPurpose>Recovery</keyPurpose>
-        <resultType>Phrase</resultType>
+        <siteVariant>Answer</siteVariant>
+        <siteType>GeneratedPhrase</siteType>
         <result>xin diyjiqoja hubu</result>
     </case>
     <case id="v3_securityAnswer_context" parent="v3_securityAnswer">
-        <keyContext>question</keyContext>
+        <siteContext>question</siteContext>
         <result>xogx tem cegyiva jab</result>
     </case>
     <case id="v3_type_maximum" parent="v3">
-        <resultType>Maximum</resultType>
+        <siteType>GeneratedMaximum</siteType>
         <result>W6@692^B1#&amp;@gVdSdLZ@</result>
     </case>
     <case id="v3_type_medium" parent="v3">
-        <resultType>Medium</resultType>
+        <siteType>GeneratedMedium</siteType>
         <result>Jej2$Quv</result>
     </case>
     <case id="v3_type_basic" parent="v3">
-        <resultType>Basic</resultType>
+        <siteType>GeneratedBasic</siteType>
         <result>WAo2xIg6</result>
     </case>
     <case id="v3_type_short" parent="v3">
-        <resultType>Short</resultType>
+        <siteType>GeneratedShort</siteType>
         <result>Jej2</result>
     </case>
     <case id="v3_type_pin" parent="v3">
-        <resultType>PIN</resultType>
+        <siteType>GeneratedPIN</siteType>
         <result>7662</result>
     </case>
     <case id="v3_type_name" parent="v3">
-        <resultType>Name</resultType>
+        <siteType>GeneratedName</siteType>
         <result>jejraquvo</result>
     </case>
     <case id="v3_type_phrase" parent="v3">
-        <resultType>Phrase</resultType>
+        <siteType>GeneratedPhrase</siteType>
         <result>jejr quv cabsibu tam</result>
     </case>
     <case id="v3_counter_ceiling" parent="v3">
@@ -85,7 +85,7 @@
     </case>
     <case id="v2_mb_fullName" parent="v2">
         <fullName>⛄</fullName>
-        <keyID>4D5851D0B093D65DE0CF13D94877270468C0B65A6E42CA50D393AC9B99C457B5</keyID>
+        <keyID>1717AA1F9BF5BA56CD0965CDA3D78E6D2E6A1EA8C067A8EA621F3DDAD4A87EB8</keyID>
         <result>WaqoGuho2[Xaxw</result>
     </case>
     <case id="v2_mb_masterPassword" parent="v2">
@@ -98,45 +98,45 @@
         <result>LiheCuwhSerz6)</result>
     </case>
     <case id="v2_loginName" parent="v2">
-        <keyPurpose>Identification</keyPurpose>
-        <resultType>Name</resultType>
+        <siteVariant>Login</siteVariant>
+        <siteType>GeneratedName</siteType>
         <result>wohzaqage</result>
     </case>
     <case id="v2_securityAnswer" parent="v2">
-        <keyPurpose>Recovery</keyPurpose>
-        <resultType>Phrase</resultType>
+        <siteVariant>Answer</siteVariant>
+        <siteType>GeneratedPhrase</siteType>
         <result>xin diyjiqoja hubu</result>
     </case>
     <case id="v2_securityAnswer_context" parent="v2_securityAnswer">
-        <keyContext>question</keyContext>
+        <siteContext>question</siteContext>
         <result>xogx tem cegyiva jab</result>
     </case>
     <case id="v2_type_maximum" parent="v2">
-        <resultType>Maximum</resultType>
+        <siteType>GeneratedMaximum</siteType>
         <result>W6@692^B1#&amp;@gVdSdLZ@</result>
     </case>
     <case id="v2_type_medium" parent="v2">
-        <resultType>Medium</resultType>
+        <siteType>GeneratedMedium</siteType>
         <result>Jej2$Quv</result>
     </case>
     <case id="v2_type_basic" parent="v2">
-        <resultType>Basic</resultType>
+        <siteType>GeneratedBasic</siteType>
         <result>WAo2xIg6</result>
     </case>
     <case id="v2_type_short" parent="v2">
-        <resultType>Short</resultType>
+        <siteType>GeneratedShort</siteType>
         <result>Jej2</result>
     </case>
     <case id="v2_type_pin" parent="v2">
-        <resultType>PIN</resultType>
+        <siteType>GeneratedPIN</siteType>
         <result>7662</result>
     </case>
     <case id="v2_type_name" parent="v2">
-        <resultType>Name</resultType>
+        <siteType>GeneratedName</siteType>
         <result>jejraquvo</result>
     </case>
     <case id="v2_type_phrase" parent="v2">
-        <resultType>Phrase</resultType>
+        <siteType>GeneratedPhrase</siteType>
         <result>jejr quv cabsibu tam</result>
     </case>
     <case id="v2_counter_ceiling" parent="v2">
@@ -151,7 +151,7 @@
     </case>
     <case id="v1_mb_fullName" parent="v1">
         <fullName>⛄</fullName>
-        <keyID>4D5851D0B093D65DE0CF13D94877270468C0B65A6E42CA50D393AC9B99C457B5</keyID>
+        <keyID>1717AA1F9BF5BA56CD0965CDA3D78E6D2E6A1EA8C067A8EA621F3DDAD4A87EB8</keyID>
         <result>WaqoGuho2[Xaxw</result>
     </case>
     <case id="v1_mb_masterPassword" parent="v1">
@@ -164,45 +164,45 @@
         <result>WawiYarp2@Kodh</result>
     </case>
     <case id="v1_loginName" parent="v1">
-        <keyPurpose>Identification</keyPurpose>
-        <resultType>Name</resultType>
+        <siteVariant>Login</siteVariant>
+        <siteType>GeneratedName</siteType>
         <result>wohzaqage</result>
     </case>
     <case id="v1_securityAnswer" parent="v1">
-        <keyPurpose>Recovery</keyPurpose>
-        <resultType>Phrase</resultType>
+        <siteVariant>Answer</siteVariant>
+        <siteType>GeneratedPhrase</siteType>
         <result>xin diyjiqoja hubu</result>
     </case>
     <case id="v1_securityAnswer_context" parent="v1_securityAnswer">
-        <keyContext>question</keyContext>
+        <siteContext>question</siteContext>
         <result>xogx tem cegyiva jab</result>
     </case>
     <case id="v1_type_maximum" parent="v1">
-        <resultType>Maximum</resultType>
+        <siteType>GeneratedMaximum</siteType>
         <result>W6@692^B1#&amp;@gVdSdLZ@</result>
     </case>
     <case id="v1_type_medium" parent="v1">
-        <resultType>Medium</resultType>
+        <siteType>GeneratedMedium</siteType>
         <result>Jej2$Quv</result>
     </case>
     <case id="v1_type_basic" parent="v1">
-        <resultType>Basic</resultType>
+        <siteType>GeneratedBasic</siteType>
         <result>WAo2xIg6</result>
     </case>
     <case id="v1_type_short" parent="v1">
-        <resultType>Short</resultType>
+        <siteType>GeneratedShort</siteType>
         <result>Jej2</result>
     </case>
     <case id="v1_type_pin" parent="v1">
-        <resultType>PIN</resultType>
+        <siteType>GeneratedPIN</siteType>
         <result>7662</result>
     </case>
     <case id="v1_type_name" parent="v1">
-        <resultType>Name</resultType>
+        <siteType>GeneratedName</siteType>
         <result>jejraquvo</result>
     </case>
     <case id="v1_type_phrase" parent="v1">
-        <resultType>Phrase</resultType>
+        <siteType>GeneratedPhrase</siteType>
         <result>jejr quv cabsibu tam</result>
     </case>
     <case id="v1_counter_ceiling" parent="v1">
@@ -217,7 +217,7 @@
     </case>
     <case id="v0_mb_fullName" parent="v0">
         <fullName>⛄</fullName>
-        <keyID>4D5851D0B093D65DE0CF13D94877270468C0B65A6E42CA50D393AC9B99C457B5</keyID>
+        <keyID>1717AA1F9BF5BA56CD0965CDA3D78E6D2E6A1EA8C067A8EA621F3DDAD4A87EB8</keyID>
         <result>HajrYudo7@Mamh</result>
     </case>
     <case id="v0_mb_masterPassword" parent="v0">
@@ -230,45 +230,45 @@
         <result>HahiVana2@Nole</result>
     </case>
     <case id="v0_loginName" parent="v0">
-        <keyPurpose>Identification</keyPurpose>
-        <resultType>Name</resultType>
+        <siteVariant>Login</siteVariant>
+        <siteType>GeneratedName</siteType>
         <result>lozwajave</result>
     </case>
     <case id="v0_securityAnswer" parent="v0">
-        <keyPurpose>Recovery</keyPurpose>
-        <resultType>Phrase</resultType>
+        <siteVariant>Answer</siteVariant>
+        <siteType>GeneratedPhrase</siteType>
         <result>miy lirfijoja dubu</result>
     </case>
     <case id="v0_securityAnswer_context" parent="v0_securityAnswer">
-        <keyContext>question</keyContext>
+        <siteContext>question</siteContext>
         <result>movm bex gevrica jaf</result>
     </case>
     <case id="v0_type_maximum" parent="v0">
-        <resultType>Maximum</resultType>
+        <siteType>GeneratedMaximum</siteType>
         <result>w1!3bA3icmRAc)SS@lwl</result>
     </case>
     <case id="v0_type_medium" parent="v0">
-        <resultType>Medium</resultType>
+        <siteType>GeneratedMedium</siteType>
         <result>Fej7]Jug</result>
     </case>
     <case id="v0_type_basic" parent="v0">
-        <resultType>Basic</resultType>
+        <siteType>GeneratedBasic</siteType>
         <result>wvH7irC1</result>
     </case>
     <case id="v0_type_short" parent="v0">
-        <resultType>Short</resultType>
+        <siteType>GeneratedShort</siteType>
         <result>Fej7</result>
     </case>
     <case id="v0_type_pin" parent="v0">
-        <resultType>PIN</resultType>
+        <siteType>GeneratedPIN</siteType>
         <result>2117</result>
     </case>
     <case id="v0_type_name" parent="v0">
-        <resultType>Name</resultType>
+        <siteType>GeneratedName</siteType>
         <result>fejrajugo</result>
     </case>
     <case id="v0_type_phrase" parent="v0">
-        <resultType>Phrase</resultType>
+        <siteType>GeneratedPhrase</siteType>
         <result>fejr jug gabsibu bax</result>
     </case>
     <case id="v0_counter_ceiling" parent="v0">

core/java/tests/src/test/java/com/lyndir/masterpassword/MasterKeyTest.java

@@ -0,0 +1,112 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+package com.lyndir.masterpassword;
+
+import static org.testng.Assert.*;
+
+import com.lyndir.lhunath.opal.system.CodeUtils;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import com.lyndir.lhunath.opal.system.util.NNFunctionNN;
+import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NonNls;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+
+public class MasterKeyTest {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MasterKeyTest.class );
+
+    @NonNls
+    private MPTestSuite testSuite;
+
+    @BeforeMethod
+    public void setUp()
+            throws Exception {
+
+        testSuite = new MPTestSuite();
+    }
+
+    @Test
+    public void testEncode()
+            throws Exception {
+
+        testSuite.forEach( "testEncode", new NNFunctionNN<MPTests.Case, Boolean>() {
+            @Nonnull
+            @Override
+            public Boolean apply(@Nonnull final MPTests.Case testCase) {
+                MasterKey masterKey = MasterKey.create( testCase.getAlgorithm(), testCase.getFullName(), testCase.getMasterPassword() );
+
+                assertEquals(
+                        masterKey.encode( testCase.getSiteName(), testCase.getSiteType(), testCase.getSiteCounter(),
+                                          testCase.getSiteVariant(), testCase.getSiteContext() ),
+                        testCase.getResult(), "[testEncode] Failed test case: " + testCase );
+
+                return true;
+            }
+        } );
+    }
+
+    @Test
+    public void testGetUserName()
+            throws Exception {
+
+        MPTests.Case defaultCase = testSuite.getTests().getDefaultCase();
+
+        assertEquals( MasterKey.create( defaultCase.getFullName(), defaultCase.getMasterPassword() ).getFullName(),
+                      defaultCase.getFullName(), "[testGetUserName] Failed test case: " + defaultCase );
+    }
+
+    @Test
+    public void testGetKeyID()
+            throws Exception {
+
+        testSuite.forEach( "testGetKeyID", new NNFunctionNN<MPTests.Case, Boolean>() {
+            @Nonnull
+            @Override
+            public Boolean apply(@Nonnull final MPTests.Case testCase) {
+                MasterKey masterKey = MasterKey.create( testCase.getFullName(), testCase.getMasterPassword() );
+
+                assertEquals( CodeUtils.encodeHex( masterKey.getKeyID() ),
+                              testCase.getKeyID(), "[testGetKeyID] Failed test case: " + testCase );
+
+                return true;
+            }
+        } );
+    }
+
+    @Test
+    public void testInvalidate()
+            throws Exception {
+
+        try {
+            MPTests.Case defaultCase = testSuite.getTests().getDefaultCase();
+
+            MasterKey masterKey = MasterKey.create( defaultCase.getFullName(), defaultCase.getMasterPassword() );
+            masterKey.invalidate();
+            masterKey.encode( defaultCase.getSiteName(), defaultCase.getSiteType(), defaultCase.getSiteCounter(),
+                              defaultCase.getSiteVariant(), defaultCase.getSiteContext() );
+
+            fail( "[testInvalidate] Master key should have been invalidated, but was still usable." );
+        }
+        catch (final IllegalStateException ignored) {
+        }
+    }
+}

gradle.properties

@@ -1,4 +0,0 @@
-org.gradle.daemon=true
-org.gradle.configureondemand=true
-org.gradle.jvmargs=-Xmx1536M
-android.enableD8.desugaring=true

gradle/.idea/codeStyleSettings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value />
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Lhunath" />
+  </component>
+</project>

gradle/.idea/copyright/GPLv3.xml

@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="keyword" value="Copyright|License|WARRANTY" />
+    <option name="myName" value="GPLv3" />
+    <option name="notice" value="This file is part of &amp;#36;project.name.&#10;Copyright (c) &amp;#36;today.year.&#10;&#10;&amp;#36;project.name is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;&amp;#36;project.name is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU General Public License for more details.&#10;&#10;You can find a copy of the GNU General Public License in the&#10;LICENSE file.  Alternatively, see &lt;http://www.gnu.org/licenses/&gt;." />
+  </copyright>
+</component>

gradle/.idea/copyright/profiles_settings.xml

@@ -0,0 +1,13 @@
+<component name="CopyrightManager">
+  <settings>
+    <module2copyright>
+      <element module="masterpassword" copyright="Master Password" />
+    </module2copyright>
+    <LanguageOptions name="__TEMPLATE__">
+      <option name="block" value="false" />
+      <option name="separateBefore" value="true" />
+      <option name="separateAfter" value="true" />
+      <option name="filler" value="=" />
+    </LanguageOptions>
+  </settings>
+</component>

gradle/.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,9 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="projectProfile" value="Lhunath" />
+    <option name="useProjectProfile" value="false" />
+    <option name="PROJECT_PROFILE" value="Lhunath" />
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

gradle/.idea/misc.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/../../opal/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="javax.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="javax.annotation.Nonnull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/classes" />
+  </component>
+  <component name="ThriftCompiler">
+    <compilers />
+  </component>
+</project>

gradle/.idea/runConfigurations/Android.xml

@@ -0,0 +1,30 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Android" type="AndroidRunConfigurationType" factoryName="Android App">
+    <module name="android" />
+    <option name="DEPLOY" value="true" />
+    <option name="ARTIFACT_NAME" value="" />
+    <option name="PM_INSTALL_OPTIONS" value="" />
+    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+    <option name="MODE" value="default_activity" />
+    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+    <option name="PREFERRED_AVD" value="" />
+    <option name="CLEAR_LOGCAT" value="false" />
+    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
+    <option name="FORCE_STOP_RUNNING_APP" value="true" />
+    <option name="DEBUGGER_TYPE" value="Java" />
+    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
+    <option name="PREFERRED_AVD" value="" />
+    <Java />
+    <Profilers>
+      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="GAPID_ENABLED" value="false" />
+      <option name="GAPID_DISABLE_PCS" value="false" />
+      <option name="SUPPORT_LIB_ENABLED" value="true" />
+      <option name="INSTRUMENTATION_ENABLED" value="true" />
+    </Profilers>
+    <option name="DEEP_LINK" value="" />
+    <option name="ACTIVITY_CLASS" value="" />
+    <method />
+  </configuration>
+</component>

gradle/.idea/runConfigurations/GUI.xml

@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="GUI" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="com.lyndir.masterpassword.gui.GUI" />
+    <option name="VM_PARAMETERS" value="" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="ENABLE_SWING_INSPECTOR" value="false" />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <module name="gui" />
+    <envs />
+    <method />
+  </configuration>
+</component>

gradle/.idea/runConfigurations/Tests.xml

@@ -0,0 +1,29 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Tests" type="TestNG" factoryName="TestNG">
+    <module name="tests" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="SUITE_NAME" value="" />
+    <option name="PACKAGE_NAME" value="com.lyndir.masterpassword" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="GROUP_NAME" value="" />
+    <option name="TEST_OBJECT" value="PACKAGE" />
+    <option name="VM_PARAMETERS" value="-ea" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../core/java/tests" />
+    <option name="OUTPUT_DIRECTORY" value="" />
+    <option name="ANNOTATION_TYPE" />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="singleModule" />
+    </option>
+    <option name="USE_DEFAULT_REPORTERS" value="false" />
+    <option name="PROPERTIES_FILE" value="" />
+    <envs />
+    <properties />
+    <listeners />
+    <method />
+  </configuration>
+</component>

gradle/.idea/scopes/masterpassword.xml

@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="masterpassword" pattern="com.lyndir.masterpassword.*" />
+</component>

gradle/build.gradle

@@ -0,0 +1,34 @@
+allprojects {
+    //apply plugin: 'findbugs'
+
+    group = 'com.lyndir.masterpassword'
+    version = 'GIT-SNAPSHOT'
+
+    tasks.withType(JavaCompile) {
+        sourceCompatibility = '1.7'
+        targetCompatibility = '1.7'
+    }
+    tasks.withType(FindBugs) {
+        reports {
+            xml.enabled false
+            html.enabled true
+        }
+    }
+}
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath group: 'com.android.tools.build', name: 'gradle', version: '2.2.3'
+    }
+}
+
+subprojects {
+    repositories {
+        mavenCentral()
+        maven { url 'http://maven.lyndir.com' }
+    }
+}

gradle/external-annotations/com/google/common/base/annotations.xml

@@ -0,0 +1,5 @@
+<root>
+    <item name='com.google.common.base.Preconditions T checkNotNull(T, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NonNls' />
+    </item>
+</root>

gradle/external-annotations/com/google/common/io/annotations.xml

@@ -0,0 +1,5 @@
+<root>
+    <item name='com.google.common.io.Resources java.net.URL getResource(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NonNls' />
+    </item>
+</root>

gradle/external-annotations/org/testng/annotations.xml

@@ -0,0 +1,5 @@
+<root>
+    <item name='org.testng.Assert void assertEquals(java.lang.String, java.lang.String, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NonNls' />
+    </item>
+</root>

gradle/gradle.properties

@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1536M

gradle/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Sep 23 12:55:35 EDT 2019
+#Sun Mar 26 09:11:08 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

gradle/gradlew

@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or authors.
-#
-# 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
-#
-#      https://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.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,16 +28,16 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn () {
+warn ( ) {
     echo "$*"
 }
 
-die () {
+die ( ) {
     echo
     echo "$*"
     echo
@@ -125,8 +109,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -171,7 +155,7 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
 fi
 
 # Escape application args
-save () {
+save ( ) {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

gradle/gradlew.bat

@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -30,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradle/homebrew-mpw.rb

@@ -0,0 +1,31 @@
+class Mpw < Formula
+  homepage "http://masterpasswordapp.com"
+  url "https://ssl.masterpasswordapp.com/mpw-2.1-cli4-0-gf6b2287.tar.gz"
+  sha1 "036b3d8f4bd6f0676ae16e7e9c3de65f6030874f"
+  version "2.1-cli4"
+
+  depends_on "automake" => :build
+  depends_on "autoconf" => :build
+  depends_on "openssl"
+
+  resource "libscrypt" do
+    url "http://masterpasswordapp.com/libscrypt-b12b554.tar.gz"
+    sha1 "ee871e0f93a786c4e3622561f34565337cfdb815"
+  end
+
+  def install
+    resource("libscrypt").stage buildpath/"lib/scrypt"
+    touch "lib/scrypt/.unpacked"
+
+    ENV["targets"] = "mpw mpw-tests"
+    system "./build"
+    system "./mpw-tests"
+
+    bin.install "mpw"
+  end
+
+  test do
+    assert_equal "Jejr5[RepuSosp",
+        shell_output("mpw -u 'Robert Lee Mitchell' -P 'banana colored duckling' masterpasswordapp.com").strip
+  end
+end

gradle/pom.xml

@@ -0,0 +1,61 @@
+<?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.lhunath</groupId>
+        <artifactId>lyndir</artifactId>
+        <version>1.22</version>
+    </parent>
+
+    <name>Master Password</name>
+    <description>A Java implementation of the Master Password algorithm.</description>
+
+    <groupId>com.lyndir.masterpassword</groupId>
+    <artifactId>masterpassword</artifactId>
+    <version>GIT-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>masterpassword-tests</module>
+        <module>masterpassword-algorithm</module>
+        <module>masterpassword-model</module>
+        <module>masterpassword-cli</module>
+        <module>masterpassword-gui</module>
+    </modules>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <modules>
+                <module>masterpassword-android</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>mod:android</id>
+            <modules>
+                <module>masterpassword-android</module>
+            </modules>
+        </profile>
+    </profiles>
+
+    <!-- REMOTE ARTIFACT REPOSITORIES -->
+    <repositories>
+        <repository>
+            <id>lyndir</id>
+            <name>Lyndir Repository</name>
+            <url>http://maven.lyndir.com</url>
+
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+        </repository>
+    </repositories>
+</project>

gradle/settings.gradle

@@ -0,0 +1,19 @@
+rootProject.name = 'masterpassword'
+
+include 'masterpassword-algorithm'
+project(':masterpassword-algorithm').projectDir = new File( '../core/java/algorithm' )
+
+include 'masterpassword-model'
+project(':masterpassword-model').projectDir = new File( '../core/java/model' )
+
+include 'masterpassword-tests'
+project(':masterpassword-tests').projectDir = new File( '../core/java/tests' )
+
+include 'masterpassword-cli'
+project(':masterpassword-cli').projectDir = new File( '../platform-independent/cli-java' )
+
+include 'masterpassword-gui'
+project(':masterpassword-gui').projectDir = new File( '../platform-independent/gui-java' )
+
+include 'masterpassword-android'
+project(':masterpassword-android').projectDir = new File( '../platform-android' )

homebrew-mpw.rb

@@ -1,40 +0,0 @@
-class Mpw < Formula
-  desc "Stateless/deterministic password and identity manager"
-  homepage "https://masterpassword.app/"
-  url "https://masterpassword.app/mpw-2.6-cli-5-0-g344771db.tar.gz"
-  version "2.6-cli-5"
-  sha256 "954c07b1713ecc2b30a07bead9c11e6204dd774ca67b5bdf7d2d6ad1c4eec170"
-  revision 1
-  head "https://gitlab.com/MasterPassword/MasterPassword.git"
-
-  bottle do
-    cellar :any
-    sha256 "46677cf8649983d5b77103d2ca56d9ad3697808ecc406f626a3462a089f932da" => :high_sierra
-    sha256 "19bf22915b3c534ad3ee6f1dfc20f142d53ae6c0c88757ae2632b7b1daa6667f" => :sierra
-    sha256 "7090c3d31289d2ac5529bd0a6bae2632a36ba7fcd4bb7974248bb36a15f67c7e" => :el_capitan
-  end
-
-  option "without-json-c", "Disable JSON configuration support"
-  option "without-ncurses", "Disable colorized identicon support"
-
-  depends_on "libsodium"
-  depends_on "json-c" => :recommended
-  depends_on "ncurses" => :recommended
-
-  def install
-    cd "platform-independent/cli-c" if build.head?
-
-    ENV["targets"] = "mpw"
-    ENV["mpw_json"] = build.with?("json-c") ? "1" : "0"
-    ENV["mpw_color"] = build.with?("ncurses") ? "1" : "0"
-
-    system "./build"
-    system "./mpw-cli-tests"
-    bin.install "mpw"
-  end
-
-  test do
-    assert_equal "Jejr5[RepuSosp",
-      shell_output("#{bin}/mpw -q -Fnone -u 'Robert Lee Mitchell' -M 'banana colored duckling' -tlong -c1 -a3 'masterpasswordapp.com'").strip
-  end
-end

lib/bin/build_lib

@@ -1,451 +0,0 @@
-#!/usr/bin/env bash
-#
-# Your build script should simply source this script, optionally override any build hooks and then invoke `build`.
-# The build product should be available under `build-<platform>~/out`, under the library path.
-#
-# Hook lifecycle:
-# - build
-#     - initialize
-#         - needs
-#     - clean & exit (only if script was ran with "clean" argument)
-#     - check & exit (only if target has already been successfully built)
-#     - prepare
-#         - create
-#         - config
-#     - target
-#         - prepare
-#         - configure
-#         - build
-#     - finalize
-#         - merge
-#         - clean
-#
-# You can override any of these hooks to provide a custom implementation or call their underscore variant to delegate to the default implementation.
-# For example:
-# target_prepare() { make -s distclean; }
-# target_configure() { _target_configure "$@" --enable-minimal; }
-#
-set -e
-PATH+=:/usr/local/bin
-
-# needs <binary> ...
-#
-# Utility for ensuring all tools needed by the script are installed prior to starting.
-#
-needs() { _needs "$@"; }
-_needs() {
-    local failed=0
-    for spec; do
-        IFS=: read pkg tools <<< "$spec"
-        IFS=, read -a tools <<< "${tools:-$pkg}"
-        for tool in "${tools[@]}"; do
-            hash "$tool" 2>/dev/null && continue 2
-        done
-
-        echo >&2 "Missing: $pkg.  Please install this package."
-        (( failed++ ))
-    done
-
-    return $failed
-}
-
-# initialize <prefix> <platform>
-#
-# The build script invokes this once prior to all other actions.
-#
-initialize() { _initialize "$@"; }
-_initialize() {
-    initialize_needs "$@"
-}
-
-# initialize_needs <prefix> <platform>
-#
-# Check if all tools required to configure and build for the platform are available.
-#
-# By default, this will check for:
-# - Windows: MSBuild
-# - Other: `libtool` (for libtoolize), `automake` (for aclocal), `autoconf` (for autoreconf) and make
-#
-initialize_needs() { _initialize_needs "$@"; }
-_initialize_needs() {
-    if [[ $platform = windows ]]; then
-        needs cmd
-        for dir in "$VSINSTALLDIR" "$(cygpath -F 0x002a)/Microsoft Visual Studio"/*/*/Common7/..; do
-            dir=$( [[ $dir ]] && cd "$dir" && [[ -e "Common7/Tools/VsMSBuildCmd.bat" ]] && cygpath -w "$PWD" ) && \
-                export VSINSTALLDIR=$dir && echo "Using MSBuild: $VSINSTALLDIR" && return
-        done
-
-        echo >&2 "Missing: msbuild.  Please install 'Build Tools for Visual Studio'.  See https://visualstudio.microsoft.com/downloads/?q=build+tools"
-        return 1
-    else
-        needs libtool:libtoolize,glibtoolize automake autoconf make
-    fi
-}
-
-# clean <prefix> <platform>
-#
-# Fully clean up the library code, restoring it to a pristine state.
-#
-# By default, this will:
-# - Windows: `msbuild /t:Clean`, or
-# - Makefile: run `make distclean`, or
-# - GIT: `git clean -fdx`
-#
-# Finally, it will wipe the prefix.
-#
-clean() { _clean "$@"; }
-_clean() {
-    if [[ $platform = windows ]]; then
-        PATH="$(cygpath "$VSINSTALLDIR")/Common7/Tools:$PATH" \
-            cmd /v /c 'VsMSBuildCmd && for %s in (*.sln) do msbuild /t:Clean %s'
-    elif [[ -e Makefile ]] && make -s distclean; then :
-    elif [[ -e .git ]] && git clean -fdx; then :
-    fi
-
-    rm -rf "$prefix"
-}
-
-# prepare <prefix> <platform> [ <arch:host> ... ]
-#
-# Initialize the prefix in anticipation for building the <arch>s on this machine.
-# The build script invokes this once prior to building each of its targets.
-#
-prepare() { _prepare "$@"; }
-_prepare() {
-    prepare_create "$@"
-    prepare_config "$@"
-}
-
-# prepare_create <prefix> <platform> [ <arch:host> ... ]
-#
-# Perform any necessary clean-up of the library code prior to building.
-#
-# By default, this will wipe the build configuration and re-create the prefix.
-# TODO: Should this differ from clean()?
-#
-prepare_create() { _prepare_create "$@"; }
-_prepare_create() {
-    local prefix=$1 platform=$2; shift 2
-
-    if [[ $platform = windows ]]; then :
-    else
-        [[ ! -e Makefile ]] || make -s distclean || git clean -fdx
-    fi
-
-    rm -rf "$prefix"
-    install -d "$prefix/out"
-}
-
-# prepare_config <prefix> <platform> [ <arch:host> ... ]
-#
-# Generate build solution for configuring a build on this machine.
-# The <prefix> has been newly created.
-#
-# TODO: cmake support?
-# By default, this will:
-# - Windows: do nothing
-# - Other: run `autoreconf`.
-#
-prepare_config() { _prepare_config "$@"; }
-_prepare_config() {
-    local prefix=$1 platform=$2; shift 2
-
-    [[ -e "$prefix/out/.prepared" ]] && return
-
-    if [[ $platform = windows ]]; then :
-    else
-        # autoreconf installs a useless INSTALL documentation stub that can overwrite repo docs.
-        [[ -e INSTALL ]] && mv INSTALL{,~}
-        autoreconf --verbose --install --force 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /')
-        [[ -e INSTALL~ ]] && mv INSTALL{~,}
-    fi
-
-    touch "$prefix/out/.prepared"
-}
-
-# target <prefix> <platform> <arch> <host>
-#
-# Build the library to the <arch> binary for the <host> architecture on <platform> into the given <prefix>.
-# The build script invokes this function when it's ready to build the library's code.
-#
-target() { _target "$@"; }
-_target() {
-    target_prepare "$@"
-    target_configure "$@"
-    target_build "$@"
-}
-
-# target_prepare <prefix> <platform> <arch> <host>
-#
-# Any build-related work to be done in the prefix prior to building.
-#
-# By default, this will:
-# - Windows: do nothing
-# - macOS/iOS: Discover SDKROOT & build flags
-# - Android: Prepare an NDK toolchain & build flags
-# - Makefile: run `make clean`
-#
-target_prepare() { _target_prepare "$@"; }
-_target_prepare() {
-    local prefix=$1 platform=$2 arch=$3 host=$4; shift 3
-
-    case "$platform" in
-        'windows')
-        ;;
-
-        'macos')
-            SDKROOT="$(xcrun --show-sdk-path --sdk macosx)"
-            export PATH="$(xcrun --show-sdk-platform-path --sdk macosx)/usr/bin:$PATH"
-            export CPPFLAGS="-arch $host -flto -O2 -g -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} $CPPFLAGS"
-            export LDFLAGS="-arch $host -flto -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} $LDFLAGS"
-        ;;
-
-        'ios')
-            case "$arch" in
-                *'arm'*)
-                    SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)"
-                    export PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH"
-                    export CPPFLAGS="-arch $host -mthumb -fembed-bitcode -flto -O2 -g -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $CPPFLAGS"
-                    export LDFLAGS="-arch $host -mthumb -fembed-bitcode -flto -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
-                ;;
-                *)
-                    SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"
-                    export PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH"
-                    export CPPFLAGS="-arch $host -flto -O2 -g -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $CPPFLAGS"
-                    export LDFLAGS="-arch $host -flto -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
-                ;;
-            esac
-        ;;
-
-        'android')
-            [[ -x $ANDROID_NDK_HOME/build/ndk-build ]] || { echo >&2 "Android NDK not found.  Please set ANDROID_NDK_HOME."; return 1; }
-
-            SDKROOT="$prefix/$arch/ndk"
-            # Platform 21 is lowest that supports x86_64
-            "$ANDROID_NDK_HOME/build/tools/make-standalone-toolchain.sh" --force --install-dir="$SDKROOT" --platform='android-21' --arch="$arch"
-            export PATH="$SDKROOT/bin:$PATH"
-            export CPPFLAGS="-O2 -g $CPPFLAGS"
-            export LDFLAGS="-avoid-version $LDFLAGS"
-            export CC='clang'
-        ;;
-
-        *)
-            case "$arch" in
-                x86)
-                    export CPPFLAGS="-m32 $CPPFLAGS" LDFLAGS="-m32 $LDFLAGS"
-                ;;
-                x86_64)
-                    export CPPFLAGS="-m64 $CPPFLAGS" LDFLAGS="-m64 $LDFLAGS"
-                ;;
-            esac
-        ;;
-    esac
-
-    if [[ $platform = windows ]]; then :
-    else
-        [[ ! -e Makefile ]] || make -s clean
-    fi
-}
-
-# target_configure <prefix> <platform> <arch> <host> [ <args> ... ]
-#
-# Configure the library for building the target. This generates the compiler configuration.
-#
-# By default, this will:
-# - Windows: do nothing
-# - Other: run `./configure --host=<host> --prefix=<prefix>/<arch> <args>`.
-#
-# Some platform-specific configure arguments will be passed in as well.
-# --enable-pic --disable-pie to ensure the resulting library can be linked again.
-#
-target_configure() { _target_configure "$@"; }
-_target_configure() {
-    local prefix=$1 platform=$2 arch=$3 host=$4; shift 4
-
-    local build=
-    [[ -x config.guess ]] && build=$(./config.guess)
-    [[ -x build-aux/config.guess ]] && build=$(build-aux/config.guess)
-
-    case "$platform" in
-        'windows')
-            # doesn't use ./configure
-            return 0
-        ;;
-        'ios'|'macos')
-            host+=-apple
-            set -- --enable-static --disable-shared "$@"
-        ;;
-        'android')
-            host=( "$SDKROOT/$host"*-android* ) host=${host##*/}
-            set -- --disable-static --enable-shared --with-sysroot="$SDKROOT/sysroot" "$@"
-        ;;
-        *)
-            set -- --enable-static --disable-shared "$@"
-        ;;
-    esac
-
-    ./configure ${build:+--build="$build"} ${host:+--host="$host"} --prefix="$prefix/$arch" --enable-pic --disable-pie "$@"
-}
-
-# target_build <prefix> <platform> <arch> <host>
-#
-# Build the library code for the target. This runs the compiler per the previous configuration.
-#
-# By default, this will:
-# - Windows: run `msbuild /t:Rebuild /p:Configuration:Release;Platform=<host>`
-# - Other: run `make check install`.
-#
-target_build() { _target_build "$@"; }
-_target_build() {
-    local prefix=$1 platform=$2 arch=$3 host=$4; shift 4
-
-    if [[ $platform = windows ]]; then
-        if [[ -e CMakeLists.txt ]]; then
-            ( projdir=$PWD; mkdir -p "$prefix/$arch/"; cd "$prefix/$arch/"
-            PATH="$(cygpath "$VSINSTALLDIR")/Common7/Tools:$(cygpath "$VSINSTALLDIR")/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin:$PATH" \
-                cmd /v /c "$(printf 'VsMSBuildCmd && cmake -A %s %s && for %%s in (*.sln) do msbuild /m /t:Rebuild /p:Configuration=Release;Platform=%s;OutDir=. %%s' \
-                "$host" "$(cygpath -w "$projdir")" "$host")" )
-        else
-	    PATH="$(cygpath "$VSINSTALLDIR")/Common7/Tools:$PATH" \
-		cmd /v /c "$(printf 'VsMSBuildCmd && for %%s in (*.sln) do msbuild /m /t:Rebuild /p:Configuration=Release;Platform=%s;OutDir=%s %%s' \
-		"$host" "$(cygpath -w "${prefix##$PWD/}/$arch/")")"
-	fi
-    else
-        local cores=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null ||:)
-        #make -j"${cores:-3}" check install # TODO: libjson-c breaks on parallel build for check and install
-        #make check install # TODO: libjson-c has a failing test atm
-        make install
-    fi
-}
-
-# finalize <prefix> <platform> [ <arch> ... ]
-#
-# Prepare the final build product.
-# The build script invokes this once after a successful build of all targets.
-#
-finalize() { _finalize "$@"; }
-_finalize() {
-    finalize_merge "$@"
-    finalize_clean "$@"
-}
-
-# finalize_merge <prefix> <platform> [ <arch> ... ]
-#
-# Merge all targets into a product the application can use, available at `<prefix>/out`.
-#
-# By default, this will copy the headers to `<prefix>/out/include`, install libraries into `<prefix>/out/lib` and mark the output product as successful.
-#
-finalize_merge() { _finalize_merge "$@"; }
-_finalize_merge() {
-    local prefix=$1 platform=$2; shift 2
-    local archs=( "$@" )
-
-    [[ -e "$prefix/$archs/include" ]] && cp -a -- "$prefix/$archs/include" "$prefix/out/"
-
-    install -d "$prefix/out/lib"
-    case "$platform" in
-        'linux')
-            for arch in "${archs[@]}"; do
-                install -d "$prefix/out/lib/$arch"
-                install -p "$prefix/$arch/lib/"*.a "$prefix/out/lib/$arch/"
-            done
-        ;;
-        'windows')
-            for arch in "${archs[@]}"; do
-                install -d "$prefix/out/lib/$arch"
-                install -p "$prefix/$arch/"*.lib "$prefix/out/lib/$arch/"
-            done
-        ;;
-        'macos'|'ios')
-            for arch in "${archs[@]}"; do
-                install -d "$prefix/out/lib/$arch"
-                install -p "$prefix/$arch/lib/"*.a "$prefix/out/lib/$arch/"
-            done
-            local libs=( "$prefix/out/lib/"*/* )
-            lipo -create "${libs[@]}" -output "$prefix/out/lib/${libs##*/}"
-        ;;
-        'android')
-            for arch in "${archs[@]}"; do
-                local abi=$arch
-                case "$arch" in
-                    'arm')      abi='armeabi-v7a' ;;
-                    'arm64')    abi='arm64-v8a' ;;
-                esac
-                install -d "$prefix/out/lib/$abi"
-                install -p "$prefix/$arch/lib/"*.so "$prefix/out/lib/$abi/"
-            done
-        ;;
-    esac
-
-    touch "$prefix/out/.success"
-}
-
-# finalize_clean <prefix> [ <arch> ... ]
-#
-# Clean up the library after a successful build (eg. housekeeping of temporary files).
-#
-# By default, this will run `make clean`.
-#
-finalize_clean() { _finalize_clean "$@"; }
-_finalize_clean() {
-    if [[ $platform = windows ]]; then :
-    else
-        [[ ! -e Makefile ]] || make -s clean
-    fi
-}
-
-# build <name> [<platform>]
-#
-# Build the library <name> (found at ../<name>) for platform <platform> (or "host" if unspecified).
-#
-build() { _build "$@"; }
-_build() {
-    local name=$1 platform=${2:-host}
-    local path="../$name"
-    [[ $path = /* ]] || path="${BASH_SOURCE%/*}/$path"
-    cd "$path"
-
-    if [[ $platform = host ]]; then
-        case "$(uname -s)" in
-            'Darwin') platform='macos' archs=( "$(uname -m)" ) ;;
-        esac
-    fi
-    if (( ! ${#archs[@]} )); then
-        case "$platform" in
-            'macos') archs=( 'x86_64' ) ;;
-            'ios') archs=( 'x86:i386' 'x86_64' 'armv7' 'armv7s' 'arm64' ) ;;
-            'android') archs=( 'arm' 'arm64:aarch64' 'x86:i686' 'x86_64' ) ;;
-            'windows') archs=( 'x86:Win32' 'x86_64:x64' ) ;;
-            *) archs=( 'x86:i686' 'x86_64' ) ;;
-        esac
-    fi
-
-    local prefix="$PWD/build-$platform~"
-    echo
-    echo " # $name ($platform: ${archs[*]}) into $prefix ..."
-    initialize "$prefix" "$platform"
-
-    # "clean" argument wipes the lib clean and exits. If .success exists in prefix output, skip build.
-    if [[ ${BASH_ARGV[@]:(-1)} = clean ]]; then
-        clean "$prefix" "$platform"
-        exit
-    elif [[ -e "$prefix"/out/.success ]]; then
-        echo >&2 "Skipping build for $platform: output product already built successfully."
-        exit
-    fi
-
-    # Prepare the output location and build configuration.
-    prepare "$prefix" "$platform" "${archs[@]}"
-
-    # Repeat the build for each individual architecture.
-    for arch in "${archs[@]}"; do (
-        local host=${arch#*:} arch=${arch%%:*}
-
-        echo
-        echo " # $name [$platform: $arch ($host)] ..."
-
-        target "$prefix" "$platform" "$arch" "$host"
-    ); done
-
-    finalize "$prefix" "$platform" "${archs[@]%%:*}"
-}

lib/bin/build_libjson-c-android

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-source "${BASH_SOURCE%/*}/build_lib"
-
-autoreconf() {
-    command autoreconf -Iautoconf-archive/m4 "$@"
-}
-
-build libjson-c android

lib/bin/build_libjson-c-ios

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-source "${BASH_SOURCE%/*}/build_lib"
-
-autoreconf() {
-    command autoreconf -Iautoconf-archive/m4 "$@"
-}
-
-build libjson-c ios

lib/bin/build_libjson-c-linux

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-source "${BASH_SOURCE%/*}/build_lib"
-
-autoreconf() {
-    command autoreconf -Iautoconf-archive/m4 "$@"
-}
-
-build libjson-c linux

lib/bin/build_libjson-c-macos

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-source "${BASH_SOURCE%/*}/build_lib"
-
-autoreconf() {
-    command autoreconf -Iautoconf-archive/m4 "$@"
-}
-
-build libjson-c macos

lib/bin/build_libjson-c-windows

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-source "${BASH_SOURCE%/*}/build_lib"
-
-autoreconf() {
-    command autoreconf -Iautoconf-archive/m4 "$@"
-}
-
-build libjson-c windows

lib/bin/build_libsodium-android

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-source "${BASH_SOURCE%/*}/build_lib"
-
-build libsodium android

lib/bin/build_libsodium-ios

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-source "${BASH_SOURCE%/*}/build_lib"
-
-build libsodium ios

lib/bin/build_libsodium-linux

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-source "${BASH_SOURCE%/*}/build_lib"
-
-build libsodium linux

lib/bin/build_libsodium-macos

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-source "${BASH_SOURCE%/*}/build_lib"
-
-build libsodium macos

lib/bin/build_libsodium-windows

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-source "${BASH_SOURCE%/*}/build_lib"
-
-finalize_merge() {
-    local prefix=$1 platform=$2; shift 2
-    local archs=( "$@" )
-
-    cp -a "src/libsodium/include" "$prefix/out"
-    
-    _finalize_merge "$prefix" "$platform" "${archs[@]}"
-}
-
-build libsodium windows

lib/libjson-c

@@ -1 +0,0 @@
-Subproject commit 3df1f98b4ab52f271dba5e13ec59cf4d1d093e1a

lib/libsodium

@@ -1 +0,0 @@
-Subproject commit 850edc1175c78ed72124cfbef073c7ecc655c476

platform-android/CMakeLists.txt

@@ -1,28 +0,0 @@
-project( mpw-core C )
-cmake_minimum_required( VERSION 3.0.0 )
-
-add_library( mpw SHARED
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/base64.c"
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/aes.c"
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/mpw-algorithm.c"
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/mpw-algorithm_v0.c"
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/mpw-algorithm_v1.c"
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/mpw-algorithm_v2.c"
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/mpw-algorithm_v3.c"
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/mpw-types.c"
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/mpw-util.c"
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/mpw-marshal-util.c"
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/mpw-marshal.c"
-    "${PROJECT_SOURCE_DIR}/../platform-independent/c/core/src/mpw-jni.c" )
-
-add_library( sodium SHARED IMPORTED )
-set_target_properties( sodium PROPERTIES IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../lib/libsodium/build-android~/out/lib/${ANDROID_ABI}/libsodium.so" )
-target_include_directories( mpw PRIVATE "${PROJECT_SOURCE_DIR}/../lib/libsodium/build-android~/out/include" )
-target_compile_definitions( mpw PRIVATE -DMPW_SODIUM=1 )
-target_link_libraries( mpw PRIVATE sodium )
-
-add_library( json-c SHARED IMPORTED )
-set_target_properties( json-c PROPERTIES IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../lib/libjson-c/build-android~/out/lib/${ANDROID_ABI}/libjson-c.so" )
-target_include_directories( mpw PRIVATE "${PROJECT_SOURCE_DIR}/../lib/libjson-c/build-android~/out/include" )
-target_compile_definitions( mpw PRIVATE -DMPW_JSON=1 )
-target_link_libraries( mpw PRIVATE json-c )

platform-android/README

@@ -0,0 +1,13 @@
+To build this module, please ensure you've done the following setup:
+
+1. Installed the Android SDK and fully downloaded the Android SDK platform 21 in it.
+2. Set the environment variable ANDROID_HOME in your shell or in ~/.mavenrc to point to the root of your Android SDK install.
+3. Installed the Android SDK into your Maven's local repository.
+    3a. Clone the maven-android-sdk-deployer available from here: https://github.com/mosabua/maven-android-sdk-deployer.git
+    3b. In the root of this project, run: mvn install -P 5.0
+
+To build this module:
+
+1. Build the parent, by going into 'MasterPassword/Java' and running: mvn clean install
+2. Build this module, by going into 'MasterPassword/Java/masterpassword-android' and running: mvn clean install
+3. You can then find the APK in: 'MasterPassword/Java/masterpassword-android/target'

platform-android/build.gradle

@@ -1,78 +1,46 @@
-plugins {
-    id 'com.android.application'
-}
+apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 25
+    buildToolsVersion '25.0.0'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 
     defaultConfig {
         applicationId 'com.lyndir.masterpassword'
-        minSdkVersion 24
-        targetSdkVersion 28
-        versionCode 20701
-        versionName '2.7.1'
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    externalNativeBuild {
-        cmake {
-            path 'CMakeLists.txt'
-        }
-    }
-    sourceSets {
-        main {
-            jniLibs.srcDirs "$rootDir/lib/libsodium/build-android~/out/lib",
-                            "$rootDir/lib/libjson-c/build-android~/out/lib"
-        }
+        minSdkVersion 19
+        targetSdkVersion 25
+        versionCode 20401
+        versionName '2.4.1'
     }
 
-    // release with: STORE_PW=$(mpw masterpassword.keystore) KEY_PW_ANDROID=$(mpw masterpassword-android) gradle masterpassword-android:assembleRelease
+    // release with: STORE_PW=$(mpw masterpassword.keystore) KEY_PW=$(mpw masterpassword-android) gradle assembleRelease
     signingConfigs {
         release {
             storeFile file( 'masterpassword.keystore' )
             storePassword System.getenv( 'STORE_PW' )
 
             keyAlias 'masterpassword-android'
-            keyPassword System.getenv( 'KEY_PW_ANDROID' )
+            keyPassword System.getenv( 'KEY_PW' )
         }
     }
     buildTypes {
         release {
-            if (System.getenv( 'KEY_PW_ANDROID' ) != null)
+            if (System.getenv( 'STORE_PW' ) != null)
                 signingConfig signingConfigs.release
         }
     }
 }
 
 dependencies {
-    api project( ':masterpassword-algorithm' )
-    implementation group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.7-p2'
+    compile             project( ':masterpassword-algorithm' )
+    compile             project( ':masterpassword-tests' )
 
-    implementation group: 'org.slf4j', name: 'slf4j-android', version: '1.7.13-underscore'
-    implementation group: 'com.jakewharton', name: 'butterknife', version: '10.2.0'
-    annotationProcessor group: 'com.jakewharton', name: 'butterknife-compiler', version: '10.2.0'
-}
-
-preBuild {
-    dependsOn task( type: Exec, 'build_libsodium-android', {
-        commandLine 'bash', "$rootDir/lib/bin/build_libsodium-android"
-        environment 'ANDROID_NDK_HOME', android.ndkDirectory
-    } )
-    dependsOn task( type: Exec, 'build_libjson-c-android', {
-        commandLine 'bash', "$rootDir/lib/bin/build_libjson-c-android"
-        environment 'ANDROID_NDK_HOME', android.ndkDirectory
-    } )
-}
-
-clean {
-    dependsOn task( type: Exec, 'clean_libsodium-android', {
-        commandLine 'bash', "$rootDir/lib/bin/build_libsodium-android", 'clean'
-        environment 'ANDROID_NDK_HOME', android.ndkDirectory
-    } )
-    dependsOn task( type: Exec, 'clean_libjson-c-android', {
-        commandLine 'bash', "$rootDir/lib/bin/build_libjson-c-android", 'clean'
-        environment 'ANDROID_NDK_HOME', android.ndkDirectory
-    } )
+    compile             group: 'org.slf4j', name: 'slf4j-android', version:'1.7.13-underscore'
+    compile             group: 'com.jakewharton', name: 'butterknife', version:'8.5.1'
+    annotationProcessor group: 'com.jakewharton', name: 'butterknife-compiler', version:'8.5.1'
+    compile             files( 'libs/scrypt-1.4.0-native.jar' )
 }

platform-android/pom.xml

@@ -0,0 +1,145 @@
+<?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 Android</name>
+    <description>An Android application to the Master Password algorithm</description>
+
+    <artifactId>masterpassword-android</artifactId>
+    <packaging>apk</packaging>
+
+    <!-- BUILD CONFIGURATION -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <artifactId>android-maven-plugin</artifactId>
+
+                <configuration>
+                    <zipalign>
+                        <verbose>true</verbose>
+                        <skip>false</skip>
+                    </zipalign>
+                    <sdk>
+                        <platform>21</platform>
+                    </sdk>
+                </configuration>
+            </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/*.apk</include>
+                                    </includes>
+                                    <keystore>release.jks</keystore>
+                                    <storepass>${env.PASSWORD}</storepass>
+                                    <keypass>${env.PASSWORD}</keypass>
+                                    <alias>masterpassword-android</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-algorithm</artifactId>
+            <version>GIT-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.lyndir.masterpassword</groupId>
+            <artifactId>masterpassword-tests</artifactId>
+            <version>GIT-SNAPSHOT</version>
+        </dependency>
+
+        <!-- EXTERNAL DEPENDENCIES -->
+        <dependency>
+            <groupId>com.jakewharton</groupId>
+            <artifactId>butterknife</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-android</artifactId>
+            <version>1.7.13-underscore</version>
+        </dependency>
+
+        <dependency>
+            <groupId>android</groupId>
+            <artifactId>android</artifactId>
+            <version>5.0.1_r2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.lambdaworks</groupId>
+            <artifactId>scrypt</artifactId>
+            <version>1.4.0-android</version>
+            <type>jar</type>
+            <classifier>native</classifier>
+        </dependency>
+
+    </dependencies>
+
+</project>