.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,14 +1,12 @@
 # OS-Specific junk.
 .DS_Store
 Thumbs.db
-*~
 
 # IntelliJ
 .idea
 *.iml
 *.ipr
 *.iws
-out
 
 # Xcode IDE
 xcuserdata/
@@ -16,14 +14,18 @@ DerivedData/
 
 # Generated
 /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

.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,33 @@
 [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 "platform-darwin/External/libjson-c"]
+	path = platform-darwin/External/libjson-c
+	url = https://github.com/lhunath/json-c.git
 [submodule "public/site"]
 	path = public/site
-	url = https://gitlab.com/MasterPassword/MasterPassword.git
+	url = https://github.com/Lyndir/MasterPassword.git
 	branch = gh-pages
 	shallow = true
+	update = none

.travis.yml

@@ -0,0 +1,20 @@
+language: objective-c
+os: osx
+osx_image: xcode9.2
+env: TERM=dumb SHLVL=0
+git:
+  submodules: true
+script:
+  - "( brew install libsodium json-c )"
+  - "( cd ./platform-independent/cli-c && ./clean && targets='mpw mpw-bench mpw-tests' ./build && ./mpw-tests && ./mpw-cli-tests )"
+  - "( cd ./gradle && ./gradlew --info clean test )"
+  - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator )"
+  - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' )"
+notifications:
+  webhooks:
+    urls:
+      - "https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MGxodW5hdGglM0FseW5kaXIuY29tLyUyMWR2S1JpaW1uc0Z3dWdseEpHSyUzQWx5bmRpci5jb20"
+    on_success: change  # always|never|change
+    on_failure: always
+    on_start: never
+

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,207 @@
-# [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.
+Master Password is also available from the following package managers: [macOS: Homebrew](https://brew.sh/) (`brew install mpw`).
+Get in touch if you are interested in adding Master Password to any other package managers.
 
-The project is re-launching as [Spectre](https://gitlab.com/spectre.app), still fully open-source Free Software here on GitLab.
+There are many reasons for using Master Password instead of an ordinary password manager, read below for the details, but if you want my personal favourites, they would be:
 
-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.
+ - I don't need to worry about keeping backups of my countless authentication credentials.
+ - I don't need to worry that when I travel, I might not have access to my passwords vault.
+ - I don't need to trust an external party, proprietary code or a service to be online and stay online.
+ - If I feel at risk of my device being stolen or confiscated, I can set a fake master password, delete my user or wipe it worry-free.
 
-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.
+We also have a [Frequently Asked Questions](#faq).
+
+
+
+## What is a password?
+
+Ah, 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:
+
+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.
+
+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.
+
+
+
+## What's the problem?
+
+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".
+
+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.
+
+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 think up a new strong password every time you make a new account - Master Password gives you the key for it.
+ - You don't need to try remembering 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 worry about getting into that account you made at work after you come home because you don't have your office passwords with you - Master Password is availale everywhere, even offline.
+ - You don't need to try to keep password lists in sync or stored somewhere easily accessible - Master Password keys can be created anywhere.
+ - 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 - your Master Password keys are always available, even when starting empty.
+ - 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 stores no secrets.
+
+
+
+## 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`.
 
-All development effort has moved to the Spectre project.  Master Password is no longer actively maintained.
 
 
 ## FAQ
 
-1. Has there been a change in ownership?
+ 1. If I lose my master password and need to set a new one, will I need to change all of my site passwords?
 
-No. This project is still owned and maintained exclusively by [Maarten Billemont](https://gitlab.com/lhunath).
+Yes.  If your master password is compromised, it is only sensible for you to change all of your site passwords.  Just like if you lose the keys in your pocket, you'll have to change all the locks they open.  Master Password effectively enforces this security practice.
 
-2. How can I trust Spectre?
+ 2. But what if I just forget my master password or I just want to change it to something else?
 
-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.
+Sorry, still yes.  Your master password is the secret component to your Master Password identity.  If it changes, your identity changes.  I wholly encourage you to think very carefully about what makes for a really memorable and good master password before just diving in with something lazy.  A short phrase works great, eg. `banana coloured duckling`.
 
-The applications are being rewritten for modern platforms.  Spectre has the exact same trust parameters as Master Password.
+ 3. Doesn't this mean an attacker can reverse my master password from any of my site passwords?
 
-3. Why is the project changing?
+Technically, yes.  Practically, no.
 
-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.
+You could argue that site passwords are "breadcrumbs" of your master password, but the same argument would suggest encrypted messages are breadcrumbs to the encryption key.  Encryption works because it is computationally unfeasible to "guess" the encryption key that made the encrypted message, just like Master Password works because it is computationally unfeasible to "guess" your master password that made the site password.
 
-All that said - Spectre is the mark of a complete refresh of the Master Password solution.  Hope you'll love it!
+ 4. The second step is just a HMAC-SHA-256, doesn't that make the SCRYPT completely pointless?
 
-4. How do I migrate?
+No.  They are used for different reasons and one is not weaker than the other.
 
-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.
+HMAC-SHA-256 is much faster to compute than SCRYPT, which leads some people to think "all an attacker needs to do is brute-force the SHA and ignore the SCRYPT".  The reality is that the HMAC-SHA-256 guards a 64-byte authentication key (the `master-key`) which makes the search space for brute-forcing the HMAC wildly too large to compute.
+The `master-password` on the other hand, is only a simple phrase, which means its search space is much smaller.  This is why it is guarded by a much tougher SCRYPT operation.
+
+ 5. I have another question.
+
+Please don't hesitate to [get in touch](#support), we're more than happy to answer all your Master Password questions.  Any problems or suggestions can be reported [as GitHub issues](https://github.com/Lyndir/MasterPassword/issues).
+
+
+
+
+# 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.
+
+Note that in order to build the Android application, you will need to have the Android SDK installed and either have the environment variable `ANDROID_HOME` set to its location or a `gradle/local.properties` file with its location, eg. (for Homebrew users who installed the SDK using `brew install android-sdk`):
+
+    sdk.dir=/usr/local/opt/android-sdk
+
+
+### Native CLI
+
+Go into the `platform-independent/cli-c` directory and run `./build`.  The native command-line client will then be built.
+
+For detailed instructions, see [the native CLI instructions](platform-independent/cli-c/README.md).
+
+
+## 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/aes.c

@@ -37,11 +37,9 @@ NOTE:   String length must be evenly divisible by 16byte (str_len % 16 == 0)
 /*****************************************************************************/
 /* Includes:                                                                 */
 /*****************************************************************************/
-#include "aes.h"
-
-MP_LIBS_BEGIN
 #include <string.h>
-MP_LIBS_END
+#include "aes.h"
+#include "mpw-util.h"
 
 /*****************************************************************************/
 /* Defines:                                                                  */

core/c/aes.h

@@ -9,11 +9,7 @@ This is an implementation of the AES algorithm, specifically ECB and CBC mode.
 #ifndef _AES_H_
 #define _AES_H_
 
-#include "mpw-util.h"
-
-MP_LIBS_BEGIN
 #include <stdint.h>
-MP_LIBS_END
 
 
 // #define the macros below to 1/0 to enable/disable the mode of operation.

core/c/base64.c

@@ -80,19 +80,19 @@ static const uint8_t b64ToBits[256] =
 
 size_t mpw_base64_decode_max(const char *b64Text) {
 
-    register const char *b64Cursor = b64Text;
-    for (; b64ToBits[(uint8_t)*b64Cursor] <= 63; ++b64Cursor);
-    size_t b64Size = b64Cursor - b64Text;
+    register const uint8_t *b64Cursor = (uint8_t *)b64Text;
+    while (b64ToBits[*(b64Cursor++)] <= 63);
+    int b64Size = (int)(b64Cursor - (uint8_t *)b64Text) - 1;
 
     // Every 4 b64 chars yield 3 plain bytes => len = 3 * ceil(b64Size / 4)
-    return 3 /*bytes*/ * ((b64Size + 4 /*chars*/ - 1) / 4 /*chars*/);
+    return (size_t)(3 /*bytes*/ * ((b64Size + 4 /*chars*/ - 1) / 4 /*chars*/));
 }
 
-size_t mpw_base64_decode(uint8_t *plainBuf, const char *b64Text) {
+int mpw_base64_decode(uint8_t *plainBuf, const char *b64Text) {
 
     register const uint8_t *b64Cursor = (uint8_t *)b64Text;
-    for (; b64ToBits[(uint8_t)*b64Cursor] <= 63; ++b64Cursor);
-    size_t b64Remaining = b64Cursor - (uint8_t *)b64Text;
+    while (b64ToBits[*(b64Cursor++)] <= 63);
+    int b64Remaining = (int)(b64Cursor - (uint8_t *)b64Text) - 1;
 
     b64Cursor = (uint8_t *)b64Text;
     register uint8_t *plainCursor = plainBuf;
@@ -112,7 +112,7 @@ size_t mpw_base64_decode(uint8_t *plainBuf, const char *b64Text) {
     if (b64Remaining > 3)
         *(plainCursor++) = (uint8_t)(b64ToBits[b64Cursor[2]] << 6 | b64ToBits[b64Cursor[3]]);
 
-    return plainCursor - plainBuf;
+    return (int)(plainCursor - plainBuf);
 }
 
 static const char basis_64[] =
@@ -124,7 +124,7 @@ size_t mpw_base64_encode_max(size_t plainSize) {
     return 4 /*chars*/ * (plainSize + 3 /*bytes*/ - 1) / 3 /*bytes*/;
 }
 
-size_t mpw_base64_encode(char *b64Text, const uint8_t *plainBuf, size_t plainSize) {
+int mpw_base64_encode(char *b64Text, const uint8_t *plainBuf, size_t plainSize) {
 
     size_t plainCursor = 0;
     char *b64Cursor = b64Text;
@@ -151,5 +151,5 @@ size_t mpw_base64_encode(char *b64Text, const uint8_t *plainBuf, size_t plainSiz
     }
 
     *b64Cursor = '\0';
-    return b64Cursor - b64Text;
+    return (int)(b64Cursor - b64Text);
 }

core/c/base64.h

@@ -54,12 +54,8 @@
 * project, please see <http://www.apache.org/>.
 */
 
-#include "mpw-util.h"
-
-MP_LIBS_BEGIN
 #include <stddef.h>
 #include <stdint.h>
-MP_LIBS_END
 
 /**
  * @return The amount of bytes needed to decode the given b64Text.
@@ -69,7 +65,7 @@ size_t mpw_base64_decode_max(const char *b64Text);
   * @param plainBuf a byte buffer, size should be at least mpw_base64_decode_max(b64Text)
   * @return The amount of bytes that were written to plainBuf.
   */
-size_t mpw_base64_decode(uint8_t *plainBuf, const char *b64Text);
+int mpw_base64_decode(uint8_t *plainBuf, const char *b64Text);
 
 /**
  * @return The amount of characters needed to encode a plainBuf of the given size as base-64 (excluding the terminating NUL).
@@ -79,4 +75,4 @@ size_t mpw_base64_encode_max(size_t plainSize);
   * @param b64Text a character buffer, size should be at least mpw_base64_encode_max(plainSize) + 1
   * @return The amount of characters that were written to b64Text, excluding the terminating NUL.
   */
-size_t mpw_base64_encode(char *b64Text, const uint8_t *plainBuf, size_t plainSize);
+int mpw_base64_encode(char *b64Text, const uint8_t *plainBuf, size_t plainSize);

core/c/mpw-algorithm.c

@@ -0,0 +1,226 @@
+//==============================================================================
+// 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"
+
+MPMasterKey mpw_masterKey(const char *fullName, const char *masterPassword, const MPAlgorithmVersion algorithmVersion) {
+
+    if (fullName && !strlen( fullName ))
+        fullName = NULL;
+    if (masterPassword && !strlen( masterPassword ))
+        masterPassword = NULL;
+
+    trc( "-- mpw_masterKey (algorithm: %u)", algorithmVersion );
+    trc( "fullName: %s", fullName );
+    trc( "masterPassword.id: %s", masterPassword? mpw_id_buf( masterPassword, strlen( masterPassword ) ): NULL );
+    if (!fullName || !masterPassword)
+        return NULL;
+
+    switch (algorithmVersion) {
+        case MPAlgorithmVersion0:
+            return mpw_masterKey_v0( fullName, masterPassword );
+        case MPAlgorithmVersion1:
+            return mpw_masterKey_v1( fullName, masterPassword );
+        case MPAlgorithmVersion2:
+            return mpw_masterKey_v2( fullName, masterPassword );
+        case MPAlgorithmVersion3:
+            return mpw_masterKey_v3( fullName, masterPassword );
+        default:
+            err( "Unsupported version: %d", algorithmVersion );
+            return NULL;
+    }
+}
+
+MPSiteKey mpw_siteKey(
+        MPMasterKey masterKey, const char *siteName, const MPCounterValue siteCounter,
+        const MPKeyPurpose keyPurpose, const char *keyContext, const MPAlgorithmVersion algorithmVersion) {
+
+    if (keyContext && !strlen( keyContext ))
+        keyContext = NULL;
+
+    trc( "-- mpw_siteKey (algorithm: %u)", algorithmVersion );
+    trc( "siteName: %s", siteName );
+    trc( "siteCounter: %d", siteCounter );
+    trc( "keyPurpose: %d (%s)", keyPurpose, mpw_nameForPurpose( keyPurpose ) );
+    trc( "keyContext: %s", keyContext );
+    if (!masterKey || !siteName)
+        return NULL;
+
+    switch (algorithmVersion) {
+        case MPAlgorithmVersion0:
+            return mpw_siteKey_v0( masterKey, siteName, siteCounter, keyPurpose, keyContext );
+        case MPAlgorithmVersion1:
+            return mpw_siteKey_v1( masterKey, siteName, siteCounter, keyPurpose, keyContext );
+        case MPAlgorithmVersion2:
+            return mpw_siteKey_v2( masterKey, siteName, siteCounter, keyPurpose, keyContext );
+        case MPAlgorithmVersion3:
+            return mpw_siteKey_v3( masterKey, siteName, siteCounter, keyPurpose, keyContext );
+        default:
+            err( "Unsupported version: %d", algorithmVersion );
+            return NULL;
+    }
+}
+
+const char *mpw_siteResult(
+        MPMasterKey masterKey, const char *siteName, const MPCounterValue siteCounter,
+        const MPKeyPurpose keyPurpose, const char *keyContext,
+        const MPResultType resultType, const char *resultParam,
+        const MPAlgorithmVersion algorithmVersion) {
+
+    if (keyContext && !strlen( keyContext ))
+        keyContext = NULL;
+    if (resultParam && !strlen( resultParam ))
+        resultParam = NULL;
+
+    MPSiteKey siteKey = mpw_siteKey( masterKey, siteName, siteCounter, keyPurpose, keyContext, algorithmVersion );
+    if (!siteKey)
+        return NULL;
+
+    trc( "-- mpw_siteResult (algorithm: %u)", algorithmVersion );
+    trc( "resultType: %d (%s)", resultType, mpw_nameForType( resultType ) );
+    trc( "resultParam: %s", resultParam );
+
+    char *sitePassword = NULL;
+    if (resultType & MPResultTypeClassTemplate) {
+        switch (algorithmVersion) {
+            case MPAlgorithmVersion0:
+                return mpw_sitePasswordFromTemplate_v0( masterKey, siteKey, resultType, resultParam );
+            case MPAlgorithmVersion1:
+                return mpw_sitePasswordFromTemplate_v1( masterKey, siteKey, resultType, resultParam );
+            case MPAlgorithmVersion2:
+                return mpw_sitePasswordFromTemplate_v2( masterKey, siteKey, resultType, resultParam );
+            case MPAlgorithmVersion3:
+                return mpw_sitePasswordFromTemplate_v3( masterKey, siteKey, resultType, resultParam );
+            default:
+                err( "Unsupported version: %d", algorithmVersion );
+                return NULL;
+        }
+    }
+    else if (resultType & MPResultTypeClassStateful) {
+        switch (algorithmVersion) {
+            case MPAlgorithmVersion0:
+                return mpw_sitePasswordFromCrypt_v0( masterKey, siteKey, resultType, resultParam );
+            case MPAlgorithmVersion1:
+                return mpw_sitePasswordFromCrypt_v1( masterKey, siteKey, resultType, resultParam );
+            case MPAlgorithmVersion2:
+                return mpw_sitePasswordFromCrypt_v2( masterKey, siteKey, resultType, resultParam );
+            case MPAlgorithmVersion3:
+                return mpw_sitePasswordFromCrypt_v3( masterKey, siteKey, resultType, resultParam );
+            default:
+                err( "Unsupported version: %d", algorithmVersion );
+                return NULL;
+        }
+    }
+    else if (resultType & MPResultTypeClassDerive) {
+        switch (algorithmVersion) {
+            case MPAlgorithmVersion0:
+                return mpw_sitePasswordFromDerive_v0( masterKey, siteKey, resultType, resultParam );
+            case MPAlgorithmVersion1:
+                return mpw_sitePasswordFromDerive_v1( masterKey, siteKey, resultType, resultParam );
+            case MPAlgorithmVersion2:
+                return mpw_sitePasswordFromDerive_v2( masterKey, siteKey, resultType, resultParam );
+            case MPAlgorithmVersion3:
+                return mpw_sitePasswordFromDerive_v3( masterKey, siteKey, resultType, resultParam );
+            default:
+                err( "Unsupported version: %d", algorithmVersion );
+                return NULL;
+        }
+    }
+    else {
+        err( "Unsupported password type: %d", resultType );
+    }
+
+    return sitePassword;
+}
+
+const char *mpw_siteState(
+        MPMasterKey masterKey, const char *siteName, const MPCounterValue siteCounter,
+        const MPKeyPurpose keyPurpose, const char *keyContext,
+        const MPResultType resultType, const char *resultParam,
+        const MPAlgorithmVersion algorithmVersion) {
+
+    if (keyContext && !strlen( keyContext ))
+        keyContext = NULL;
+    if (resultParam && !strlen( resultParam ))
+        resultParam = NULL;
+
+    MPSiteKey siteKey = mpw_siteKey( masterKey, siteName, siteCounter, keyPurpose, keyContext, algorithmVersion );
+    if (!siteKey)
+        return NULL;
+
+    trc( "-- mpw_siteState (algorithm: %u)", algorithmVersion );
+    trc( "resultType: %d (%s)", resultType, mpw_nameForType( resultType ) );
+    trc( "resultParam: %zu bytes = %s", sizeof( resultParam ), resultParam );
+    if (!masterKey || !resultParam)
+        return NULL;
+
+    switch (algorithmVersion) {
+        case MPAlgorithmVersion0:
+            return mpw_siteState_v0( masterKey, siteKey, resultType, resultParam );
+        case MPAlgorithmVersion1:
+            return mpw_siteState_v1( masterKey, siteKey, resultType, resultParam );
+        case MPAlgorithmVersion2:
+            return mpw_siteState_v2( masterKey, siteKey, resultType, resultParam );
+        case MPAlgorithmVersion3:
+            return mpw_siteState_v3( masterKey, siteKey, resultType, resultParam );
+        default:
+            err( "Unsupported version: %d", algorithmVersion );
+            return NULL;
+    }
+}
+
+MPIdenticon mpw_identicon(const char *fullName, const char *masterPassword) {
+
+    const char *leftArm[] = { "╔", "╚", "╰", "═" };
+    const char *rightArm[] = { "╗", "╝", "╯", "═" };
+    const char *body[] = { "█", "░", "▒", "▓", "☺", "☻" };
+    const char *accessory[] = {
+            "◈", "◎", "◐", "◑", "◒", "◓", "☀", "☁", "☂", "☃", "", "★", "☆", "☎", "☏", "⎈", "⌂", "☘", "☢", "☣",
+            "☕", "⌚", "⌛", "⏰", "⚡", "⛄", "⛅", "☔", "♔", "♕", "♖", "♗", "♘", "♙", "♚", "♛", "♜", "♝", "♞", "♟",
+            "♨", "♩", "♪", "♫", "⚐", "⚑", "⚔", "⚖", "⚙", "⚠", "⌘", "⏎", "✄", "✆", "✈", "✉", "✌"
+    };
+
+    const uint8_t *identiconSeed = NULL;
+    if (fullName && strlen( fullName ) && masterPassword && strlen( masterPassword ))
+        identiconSeed = mpw_hash_hmac_sha256(
+                (const uint8_t *)masterPassword, strlen( masterPassword ),
+                (const uint8_t *)fullName, strlen( fullName ) );
+    if (!identiconSeed)
+        return (MPIdenticon){
+                .leftArm = "",
+                .body = "",
+                .rightArm = "",
+                .accessory = "",
+                .color=0,
+        };
+
+    MPIdenticon identicon = {
+            .leftArm = leftArm[identiconSeed[0] % (sizeof( leftArm ) / sizeof( leftArm[0] ))],
+            .body = body[identiconSeed[1] % (sizeof( body ) / sizeof( body[0] ))],
+            .rightArm = rightArm[identiconSeed[2] % (sizeof( rightArm ) / sizeof( rightArm[0] ))],
+            .accessory = accessory[identiconSeed[3] % (sizeof( accessory ) / sizeof( accessory[0] ))],
+            .color = (uint8_t)(identiconSeed[4] % (MPIdenticonColorLast - MPIdenticonColorFirst + 1) + MPIdenticonColorFirst),
+    };
+    mpw_free( &identiconSeed, 32 );
+
+    return identicon;
+}

core/c/mpw-algorithm.h

@@ -16,63 +16,57 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
+// NOTE: mpw is currently NOT thread-safe.
+#include "mpw-types.h"
+
 #ifndef _MPW_ALGORITHM_H
 #define _MPW_ALGORITHM_H
 
-#include "mpw-types.h"
-
 typedef mpw_enum( unsigned int, MPAlgorithmVersion ) {
     /** V0 did math with chars whose signedness was platform-dependent. */
-            MPAlgorithmVersionV0,
+            MPAlgorithmVersion0,
     /** V1 miscounted the byte-length of multi-byte site names. */
-            MPAlgorithmVersionV1,
+            MPAlgorithmVersion1,
     /** V2 miscounted the byte-length of multi-byte user names. */
-            MPAlgorithmVersionV2,
+            MPAlgorithmVersion2,
     /** V3 is the current version. */
-            MPAlgorithmVersionV3,
+            MPAlgorithmVersion3,
 
-    MPAlgorithmVersionCurrent = MPAlgorithmVersionV3,
-    MPAlgorithmVersionFirst = MPAlgorithmVersionV0,
-    MPAlgorithmVersionLast = MPAlgorithmVersionV3,
+    MPAlgorithmVersionCurrent = MPAlgorithmVersion3,
+    MPAlgorithmVersionFirst = MPAlgorithmVersion0,
+    MPAlgorithmVersionLast = MPAlgorithmVersion3,
 };
 
 /** Derive the master key for a user based on their name and master password.
- * @return A buffer (allocated, MPMasterKeySize) or NULL if the fullName or masterPassword is missing, the algorithm is unknown, or an algorithm error occurred. */
-const MPMasterKey mpw_master_key(
+ * @return A new MPMasterKeySize-byte allocated buffer or NULL if an error occurred. */
+MPMasterKey mpw_masterKey(
         const char *fullName, const char *masterPassword, const MPAlgorithmVersion algorithmVersion);
 
 /** Derive the site key for a user's site from the given master key and site parameters.
- * @return A buffer (allocated, MPSiteKeySize) or NULL if the masterKey or siteName is missing, the algorithm is unknown, or an algorithm error occurred. */
-const MPSiteKey mpw_site_key(
-        const MPMasterKey masterKey, const char *siteName, const MPCounterValue siteCounter,
+ * @return A new MPSiteKeySize-byte allocated buffer or NULL if an error occurred. */
+MPSiteKey mpw_siteKey(
+        MPMasterKey masterKey, const char *siteName, const MPCounterValue siteCounter,
         const MPKeyPurpose keyPurpose, const char *keyContext, const MPAlgorithmVersion algorithmVersion);
 
 /** Generate a site result token from the given parameters.
- * @param resultParam A parameter for the resultType.  For stateful result types, the output of mpw_site_state.
- * @return A string (allocated) or NULL if the masterKey or siteName is missing, the algorithm is unknown, or an algorithm error occurred. */
-const char *mpw_site_result(
-        const MPMasterKey masterKey, const char *siteName, const MPCounterValue siteCounter,
+ * @param resultParam A parameter for the resultType.  For stateful result types, the output of mpw_siteState.
+ * @return A newly allocated string or NULL if an error occurred. */
+const char *mpw_siteResult(
+        MPMasterKey masterKey, const char *siteName, const MPCounterValue siteCounter,
         const MPKeyPurpose keyPurpose, const char *keyContext,
         const MPResultType resultType, const char *resultParam,
         const MPAlgorithmVersion algorithmVersion);
 
 /** Encrypt a stateful site token for persistence.
- * @param resultParam A parameter for the resultType.  For stateful result types, the desired mpw_site_result.
- * @return A string (allocated) or NULL if the masterKey, siteName or resultParam is missing, the algorithm is unknown, or an algorithm error occurred. */
-const char *mpw_site_state(
-        const MPMasterKey masterKey, const char *siteName, const MPCounterValue siteCounter,
+ * @param resultParam A parameter for the resultType.  For stateful result types, the desired mpw_siteResult.
+ * @return A newly allocated string or NULL if an error occurred. */
+const char *mpw_siteState(
+        MPMasterKey masterKey, const char *siteName, const MPCounterValue siteCounter,
         const MPKeyPurpose keyPurpose, const char *keyContext,
         const MPResultType resultType, const char *resultParam,
         const MPAlgorithmVersion algorithmVersion);
 
-/** @return An identicon (static) that represents the user's identity. */
-const MPIdenticon mpw_identicon(
-        const char *fullName, const char *masterPassword);
-/** @return An encoded representation (shared) of the given identicon or NULL if the identicon is unset. */
-const char *mpw_identicon_encode(
-        const MPIdenticon identicon);
-/** @return An identicon (static) decoded from the given encoded identicon representation or an identicon with empty fields if the identicon could not be parsed. */
-const MPIdenticon mpw_identicon_encoded(
-        const char *encoding);
+/** @return A fingerprint for a user. */
+MPIdenticon mpw_identicon(const char *fullName, const char *masterPassword);
 
 #endif // _MPW_ALGORITHM_H

core/c/mpw-algorithm_v0.c

@@ -16,15 +16,12 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-#include "mpw-algorithm_v0.h"
-#include "mpw-util.h"
-#include "base64.h"
-
-MP_LIBS_BEGIN
 #include <string.h>
 #include <errno.h>
 #include <time.h>
-MP_LIBS_END
+
+#include "mpw-util.h"
+#include "base64.h"
 
 #define MP_N                32768LU
 #define MP_r                8U
@@ -32,18 +29,18 @@ MP_LIBS_END
 #define MP_otp_window       5 * 60 /* s */
 
 // Algorithm version helpers.
-const char *mpw_type_template_v0(MPResultType type, uint16_t templateIndex) {
+static const char *mpw_templateForType_v0(MPResultType type, uint16_t templateIndex) {
 
     size_t count = 0;
-    const char **templates = mpw_type_templates( type, &count );
+    const char **templates = mpw_templatesForType( type, &count );
     char const *template = templates && count? templates[templateIndex % count]: NULL;
     free( templates );
     return template;
 }
 
-const char mpw_class_character_v0(char characterClass, uint16_t classIndex) {
+static const char mpw_characterFromClass_v0(char characterClass, uint16_t classIndex) {
 
-    const char *classCharacters = mpw_class_characters( characterClass );
+    const char *classCharacters = mpw_charactersInClass( characterClass );
     if (!classCharacters)
         return '\0';
 
@@ -51,19 +48,19 @@ const char mpw_class_character_v0(char characterClass, uint16_t classIndex) {
 }
 
 // Algorithm version overrides.
-MPMasterKey mpw_master_key_v0(
+static MPMasterKey mpw_masterKey_v0(
         const char *fullName, const char *masterPassword) {
 
-    const char *keyScope = mpw_purpose_scope( MPKeyPurposeAuthentication );
+    const char *keyScope = mpw_scopeForPurpose( MPKeyPurposeAuthentication );
     trc( "keyScope: %s", keyScope );
 
     // Calculate the master key salt.
     trc( "masterKeySalt: keyScope=%s | #fullName=%s | fullName=%s",
-            keyScope, mpw_hex_l( (uint32_t)mpw_utf8_strchars( fullName ) ), fullName );
+            keyScope, mpw_hex_l( (uint32_t)mpw_utf8_strlen( fullName ) ), fullName );
     size_t masterKeySaltSize = 0;
     uint8_t *masterKeySalt = NULL;
     mpw_push_string( &masterKeySalt, &masterKeySaltSize, keyScope );
-    mpw_push_int( &masterKeySalt, &masterKeySaltSize, (uint32_t)mpw_utf8_strchars( fullName ) );
+    mpw_push_int( &masterKeySalt, &masterKeySaltSize, (uint32_t)mpw_utf8_strlen( fullName ) );
     mpw_push_string( &masterKeySalt, &masterKeySaltSize, fullName );
     if (!masterKeySalt) {
         err( "Could not allocate master key salt: %s", strerror( errno ) );
@@ -73,8 +70,7 @@ MPMasterKey mpw_master_key_v0(
 
     // Calculate the master key.
     trc( "masterKey: scrypt( masterPassword, masterKeySalt, N=%lu, r=%u, p=%u )", MP_N, MP_r, MP_p );
-    MPMasterKey masterKey = mpw_kdf_scrypt( MPMasterKeySize,
-            (uint8_t *)masterPassword, strlen( masterPassword ), masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
+    MPMasterKey masterKey = mpw_kdf_scrypt( MPMasterKeySize, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
     mpw_free( &masterKeySalt, masterKeySaltSize );
     if (!masterKey) {
         err( "Could not derive master key: %s", strerror( errno ) );
@@ -85,11 +81,11 @@ MPMasterKey mpw_master_key_v0(
     return masterKey;
 }
 
-MPSiteKey mpw_site_key_v0(
+static MPSiteKey mpw_siteKey_v0(
         MPMasterKey masterKey, const char *siteName, MPCounterValue siteCounter,
         MPKeyPurpose keyPurpose, const char *keyContext) {
 
-    const char *keyScope = mpw_purpose_scope( keyPurpose );
+    const char *keyScope = mpw_scopeForPurpose( keyPurpose );
     trc( "keyScope: %s", keyScope );
 
     // OTP counter value.
@@ -98,16 +94,16 @@ MPSiteKey mpw_site_key_v0(
 
     // Calculate the site seed.
     trc( "siteSalt: keyScope=%s | #siteName=%s | siteName=%s | siteCounter=%s | #keyContext=%s | keyContext=%s",
-            keyScope, mpw_hex_l( (uint32_t)mpw_utf8_strchars( siteName ) ), siteName, mpw_hex_l( siteCounter ),
-            keyContext? mpw_hex_l( (uint32_t)mpw_utf8_strchars( keyContext ) ): NULL, keyContext );
+            keyScope, mpw_hex_l( (uint32_t)mpw_utf8_strlen( siteName ) ), siteName, mpw_hex_l( siteCounter ),
+            keyContext? mpw_hex_l( (uint32_t)mpw_utf8_strlen( keyContext ) ): NULL, keyContext );
     size_t siteSaltSize = 0;
     uint8_t *siteSalt = NULL;
     mpw_push_string( &siteSalt, &siteSaltSize, keyScope );
-    mpw_push_int( &siteSalt, &siteSaltSize, (uint32_t)mpw_utf8_strchars( siteName ) );
+    mpw_push_int( &siteSalt, &siteSaltSize, (uint32_t)mpw_utf8_strlen( siteName ) );
     mpw_push_string( &siteSalt, &siteSaltSize, siteName );
     mpw_push_int( &siteSalt, &siteSaltSize, siteCounter );
     if (keyContext) {
-        mpw_push_int( &siteSalt, &siteSaltSize, (uint32_t)mpw_utf8_strchars( keyContext ) );
+        mpw_push_int( &siteSalt, &siteSaltSize, (uint32_t)mpw_utf8_strlen( keyContext ) );
         mpw_push_string( &siteSalt, &siteSaltSize, keyContext );
     }
     if (!siteSalt) {
@@ -129,15 +125,15 @@ MPSiteKey mpw_site_key_v0(
     return siteKey;
 }
 
-const char *mpw_site_template_password_v0(
-        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam) {
+static const char *mpw_sitePasswordFromTemplate_v0(
+        MPMasterKey __unused masterKey, MPSiteKey siteKey, MPResultType resultType, const char __unused *resultParam) {
 
     const char *_siteKey = (const char *)siteKey;
 
     // Determine the template.
     uint16_t seedByte;
     mpw_uint16( (uint16_t)_siteKey[0], (uint8_t *)&seedByte );
-    const char *template = mpw_type_template_v0( resultType, seedByte );
+    const char *template = mpw_templateForType_v0( resultType, seedByte );
     trc( "template: %u => %s", seedByte, template );
     if (!template)
         return NULL;
@@ -150,7 +146,7 @@ const char *mpw_site_template_password_v0(
     char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
     for (size_t c = 0; c < strlen( template ); ++c) {
         mpw_uint16( (uint16_t)_siteKey[c + 1], (uint8_t *)&seedByte );
-        sitePassword[c] = mpw_class_character_v0( template[c], seedByte );
+        sitePassword[c] = mpw_characterFromClass_v0( template[c], seedByte );
         trc( "  - class: %c, index: %5u (0x%02hX) => character: %c",
                 template[c], seedByte, seedByte, sitePassword[c] );
     }
@@ -159,22 +155,17 @@ const char *mpw_site_template_password_v0(
     return sitePassword;
 }
 
-const char *mpw_site_crypted_password_v0(
-        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *cipherText) {
+static const char *mpw_sitePasswordFromCrypt_v0(
+        MPMasterKey masterKey, MPSiteKey __unused siteKey, MPResultType __unused resultType, const char *cipherText) {
 
     if (!cipherText) {
         err( "Missing encrypted state." );
         return NULL;
     }
-    if (strlen( cipherText ) % 4 != 0) {
-        wrn( "Malformed encrypted state, not base64." );
-        // This can happen if state was stored in a non-encrypted form, eg. login in old mpsites.
-        return mpw_strdup( cipherText );
-    }
 
     // Base64-decode
     uint8_t *cipherBuf = calloc( 1, mpw_base64_decode_max( cipherText ) );
-    size_t bufSize = mpw_base64_decode( cipherBuf, cipherText ), cipherBufSize = bufSize;
+    size_t bufSize = (size_t)mpw_base64_decode( cipherBuf, cipherText ), cipherBufSize = bufSize;
     if ((int)bufSize < 0) {
         err( "Base64 decoding error." );
         mpw_free( &cipherBuf, mpw_base64_decode_max( cipherText ) );
@@ -189,16 +180,13 @@ const char *mpw_site_crypted_password_v0(
     mpw_free( &plainBytes, bufSize );
     if (!plainText)
         err( "AES decryption error: %s", strerror( errno ) );
-    else if (!mpw_utf8_strchars( plainText ))
-        wrn( "decrypted -> plainText: %zu bytes = illegal UTF-8 = %s", strlen( plainText ), mpw_hex( plainText, bufSize ) );
-    else
-        trc( "decrypted -> plainText: %zu bytes = %s = %s", strlen( plainText ), plainText, mpw_hex( plainText, bufSize ) );
+    trc( "decrypted -> plainText: %zu bytes = %s = %s", strlen( plainText ), plainText, mpw_hex( plainText, strlen( plainText ) ) );
 
     return plainText;
 }
 
-const char *mpw_site_derived_password_v0(
-        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam) {
+static const char *mpw_sitePasswordFromDerive_v0(
+        MPMasterKey __unused masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam) {
 
     switch (resultType) {
         case MPResultTypeDeriveKey: {
@@ -206,14 +194,14 @@ const char *mpw_site_derived_password_v0(
                 err( "Missing key size parameter." );
                 return NULL;
             }
-            long parameter = strtol( resultParam, NULL, 10 );
-            if (!parameter)
-                parameter = 512;
-            if (parameter < 128 || parameter > 512 || parameter % 8 != 0) {
+            int resultParamInt = atoi( resultParam );
+            if (!resultParamInt)
+                resultParamInt = 512;
+            if (resultParamInt < 128 || resultParamInt > 512 || resultParamInt % 8 != 0) {
                 err( "Parameter is not a valid key size (should be 128 - 512): %s", resultParam );
                 return NULL;
             }
-            uint16_t keySize = (uint16_t)(parameter / 8);
+            uint16_t keySize = (uint16_t)(resultParamInt / 8);
             trc( "keySize: %u", keySize );
 
             // Derive key
@@ -242,8 +230,8 @@ const char *mpw_site_derived_password_v0(
     }
 }
 
-const char *mpw_site_state_v0(
-        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *plainText) {
+static const char *mpw_siteState_v0(
+        MPMasterKey masterKey, MPSiteKey __unused siteKey, MPResultType __unused resultType, const char *plainText) {
 
     // Encrypt
     size_t bufSize = strlen( plainText );

core/c/mpw-algorithm_v1.c

@@ -16,38 +16,48 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-#include "mpw-algorithm_v1.h"
-#include "mpw-util.h"
-
-MP_LIBS_BEGIN
 #include <string.h>
-MP_LIBS_END
+
+#include "mpw-util.h"
 
 #define MP_N                32768LU
 #define MP_r                8U
 #define MP_p                2U
 #define MP_otp_window       5 * 60 /* s */
 
+// Inherited functions.
+MPMasterKey mpw_masterKey_v0(
+        const char *fullName, const char *masterPassword);
+MPSiteKey mpw_siteKey_v0(
+        MPMasterKey masterKey, const char *siteName, MPCounterValue siteCounter,
+        MPKeyPurpose keyPurpose, const char *keyContext);
+const char *mpw_sitePasswordFromCrypt_v0(
+        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *cipherText);
+const char *mpw_sitePasswordFromDerive_v0(
+        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam);
+const char *mpw_siteState_v0(
+        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *state);
+
 // Algorithm version overrides.
-MPMasterKey mpw_master_key_v1(
+static MPMasterKey mpw_masterKey_v1(
         const char *fullName, const char *masterPassword) {
 
-    return mpw_master_key_v0( fullName, masterPassword );
+    return mpw_masterKey_v0( fullName, masterPassword );
 }
 
-MPSiteKey mpw_site_key_v1(
+static MPSiteKey mpw_siteKey_v1(
         MPMasterKey masterKey, const char *siteName, MPCounterValue siteCounter,
         MPKeyPurpose keyPurpose, const char *keyContext) {
 
-    return mpw_site_key_v0( masterKey, siteName, siteCounter, keyPurpose, keyContext );
+    return mpw_siteKey_v0( masterKey, siteName, siteCounter, keyPurpose, keyContext );
 }
 
-const char *mpw_site_template_password_v1(
-        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam) {
+static const char *mpw_sitePasswordFromTemplate_v1(
+        MPMasterKey __unused masterKey, MPSiteKey siteKey, MPResultType resultType, const char __unused *resultParam) {
 
     // Determine the template.
     uint8_t seedByte = siteKey[0];
-    const char *template = mpw_type_template( resultType, seedByte );
+    const char *template = mpw_templateForType( resultType, seedByte );
     trc( "template: %u => %s", seedByte, template );
     if (!template)
         return NULL;
@@ -60,7 +70,7 @@ const char *mpw_site_template_password_v1(
     char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
     for (size_t c = 0; c < strlen( template ); ++c) {
         seedByte = siteKey[c + 1];
-        sitePassword[c] = mpw_class_character( template[c], seedByte );
+        sitePassword[c] = mpw_characterFromClass( template[c], seedByte );
         trc( "  - class: %c, index: %3u (0x%02hhX) => character: %c",
                 template[c], seedByte, seedByte, sitePassword[c] );
     }
@@ -69,20 +79,20 @@ const char *mpw_site_template_password_v1(
     return sitePassword;
 }
 
-const char *mpw_site_crypted_password_v1(
+static const char *mpw_sitePasswordFromCrypt_v1(
         MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *cipherText) {
 
-    return mpw_site_crypted_password_v0( masterKey, siteKey, resultType, cipherText );
+    return mpw_sitePasswordFromCrypt_v0( masterKey, siteKey, resultType, cipherText );
 }
 
-const char *mpw_site_derived_password_v1(
+static const char *mpw_sitePasswordFromDerive_v1(
         MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam) {
 
-    return mpw_site_derived_password_v0( masterKey, siteKey, resultType, resultParam );
+    return mpw_sitePasswordFromDerive_v0( masterKey, siteKey, resultType, resultParam );
 }
 
-const char *mpw_site_state_v1(
+static const char *mpw_siteState_v1(
         MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *state) {
 
-    return mpw_site_state_v0( masterKey, siteKey, resultType, state );
+    return mpw_siteState_v0( masterKey, siteKey, resultType, state );
 }

core/c/mpw-algorithm_v2.c

@@ -16,32 +16,41 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-#include "mpw-algorithm_v2.h"
-#include "mpw-util.h"
-
-MP_LIBS_BEGIN
 #include <string.h>
 #include <errno.h>
 #include <time.h>
-MP_LIBS_END
+
+#include "mpw-util.h"
 
 #define MP_N                32768LU
 #define MP_r                8U
 #define MP_p                2U
 #define MP_otp_window       5 * 60 /* s */
 
+// Inherited functions.
+MPMasterKey mpw_masterKey_v1(
+        const char *fullName, const char *masterPassword);
+const char *mpw_sitePasswordFromTemplate_v1(
+        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam);
+const char *mpw_sitePasswordFromCrypt_v1(
+        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *cipherText);
+const char *mpw_sitePasswordFromDerive_v1(
+        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam);
+const char *mpw_siteState_v1(
+        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *state);
+
 // Algorithm version overrides.
-MPMasterKey mpw_master_key_v2(
+static MPMasterKey mpw_masterKey_v2(
         const char *fullName, const char *masterPassword) {
 
-    return mpw_master_key_v1( fullName, masterPassword );
+    return mpw_masterKey_v1( fullName, masterPassword );
 }
 
-MPSiteKey mpw_site_key_v2(
+static MPSiteKey mpw_siteKey_v2(
         MPMasterKey masterKey, const char *siteName, MPCounterValue siteCounter,
         MPKeyPurpose keyPurpose, const char *keyContext) {
 
-    const char *keyScope = mpw_purpose_scope( keyPurpose );
+    const char *keyScope = mpw_scopeForPurpose( keyPurpose );
     trc( "keyScope: %s", keyScope );
 
     // OTP counter value.
@@ -81,26 +90,26 @@ MPSiteKey mpw_site_key_v2(
     return siteKey;
 }
 
-const char *mpw_site_template_password_v2(
+static const char *mpw_sitePasswordFromTemplate_v2(
         MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam) {
 
-    return mpw_site_template_password_v1( masterKey, siteKey, resultType, resultParam );
+    return mpw_sitePasswordFromTemplate_v1( masterKey, siteKey, resultType, resultParam );
 }
 
-const char *mpw_site_crypted_password_v2(
+static const char *mpw_sitePasswordFromCrypt_v2(
         MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *cipherText) {
 
-    return mpw_site_crypted_password_v1( masterKey, siteKey, resultType, cipherText );
+    return mpw_sitePasswordFromCrypt_v1( masterKey, siteKey, resultType, cipherText );
 }
 
-const char *mpw_site_derived_password_v2(
+static const char *mpw_sitePasswordFromDerive_v2(
         MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam) {
 
-    return mpw_site_derived_password_v1( masterKey, siteKey, resultType, resultParam );
+    return mpw_sitePasswordFromDerive_v1( masterKey, siteKey, resultType, resultParam );
 }
 
-const char *mpw_site_state_v2(
+static const char *mpw_siteState_v2(
         MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *state) {
 
-    return mpw_site_state_v1( masterKey, siteKey, resultType, state );
+    return mpw_siteState_v1( masterKey, siteKey, resultType, state );
 }

core/c/mpw-algorithm_v3.c

@@ -16,24 +16,34 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-#include "mpw-algorithm_v3.h"
-#include "mpw-util.h"
-
-MP_LIBS_BEGIN
 #include <string.h>
 #include <errno.h>
-MP_LIBS_END
+
+#include "mpw-util.h"
 
 #define MP_N                32768LU
 #define MP_r                8U
 #define MP_p                2U
 #define MP_otp_window       5 * 60 /* s */
 
+// Inherited functions.
+MPSiteKey mpw_siteKey_v2(
+        MPMasterKey masterKey, const char *siteName, MPCounterValue siteCounter,
+        MPKeyPurpose keyPurpose, const char *keyContext);
+const char *mpw_sitePasswordFromTemplate_v2(
+        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam);
+const char *mpw_sitePasswordFromCrypt_v2(
+        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *cipherText);
+const char *mpw_sitePasswordFromDerive_v2(
+        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam);
+const char *mpw_siteState_v2(
+        MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *state);
+
 // Algorithm version overrides.
-MPMasterKey mpw_master_key_v3(
+static MPMasterKey mpw_masterKey_v3(
         const char *fullName, const char *masterPassword) {
 
-    const char *keyScope = mpw_purpose_scope( MPKeyPurposeAuthentication );
+    const char *keyScope = mpw_scopeForPurpose( MPKeyPurposeAuthentication );
     trc( "keyScope: %s", keyScope );
 
     // Calculate the master key salt.
@@ -52,8 +62,7 @@ MPMasterKey mpw_master_key_v3(
 
     // Calculate the master key.
     trc( "masterKey: scrypt( masterPassword, masterKeySalt, N=%lu, r=%u, p=%u )", MP_N, MP_r, MP_p );
-    MPMasterKey masterKey = mpw_kdf_scrypt( MPMasterKeySize,
-            (uint8_t *)masterPassword, strlen( masterPassword ), masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
+    MPMasterKey masterKey = mpw_kdf_scrypt( MPMasterKeySize, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
     mpw_free( &masterKeySalt, masterKeySaltSize );
     if (!masterKey) {
         err( "Could not derive master key: %s", strerror( errno ) );
@@ -64,33 +73,33 @@ MPMasterKey mpw_master_key_v3(
     return masterKey;
 }
 
-MPSiteKey mpw_site_key_v3(
+static MPSiteKey mpw_siteKey_v3(
         MPMasterKey masterKey, const char *siteName, MPCounterValue siteCounter,
         MPKeyPurpose keyPurpose, const char *keyContext) {
 
-    return mpw_site_key_v2( masterKey, siteName, siteCounter, keyPurpose, keyContext );
+    return mpw_siteKey_v2( masterKey, siteName, siteCounter, keyPurpose, keyContext );
 }
 
-const char *mpw_site_template_password_v3(
+static const char *mpw_sitePasswordFromTemplate_v3(
         MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam) {
 
-    return mpw_site_template_password_v2( masterKey, siteKey, resultType, resultParam );
+    return mpw_sitePasswordFromTemplate_v2( masterKey, siteKey, resultType, resultParam );
 }
 
-const char *mpw_site_crypted_password_v3(
+static const char *mpw_sitePasswordFromCrypt_v3(
         MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *cipherText) {
 
-    return mpw_site_crypted_password_v2( masterKey, siteKey, resultType, cipherText );
+    return mpw_sitePasswordFromCrypt_v2( masterKey, siteKey, resultType, cipherText );
 }
 
-const char *mpw_site_derived_password_v3(
+static const char *mpw_sitePasswordFromDerive_v3(
         MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *resultParam) {
 
-    return mpw_site_derived_password_v2( masterKey, siteKey, resultType, resultParam );
+    return mpw_sitePasswordFromDerive_v2( masterKey, siteKey, resultType, resultParam );
 }
 
-const char *mpw_site_state_v3(
+static const char *mpw_siteState_v3(
         MPMasterKey masterKey, MPSiteKey siteKey, MPResultType resultType, const char *state) {
 
-    return mpw_site_state_v2( masterKey, siteKey, resultType, state );
+    return mpw_siteState_v2( masterKey, siteKey, resultType, state );
 }

core/c/mpw-marshal-util.c

@@ -0,0 +1,115 @@
+//==============================================================================
+// 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 "mpw-marshal-util.h"
+#include "mpw-util.h"
+
+char *mpw_get_token(const char **in, const char *eol, char *delim) {
+
+    // Skip leading spaces.
+    for (; **in == ' '; ++*in);
+
+    // Find characters up to the first delim.
+    size_t len = strcspn( *in, delim );
+    char *token = len && len <= (size_t)(eol - *in)? mpw_strndup( *in, len ): NULL;
+
+    // Advance past the delimitor.
+    *in = min( eol, *in + len + 1 );
+    return token;
+}
+
+time_t mpw_mktime(
+        const char *time) {
+
+    struct tm tm = { .tm_isdst = -1 };
+    if (time && sscanf( time, "%4d-%2d-%2dT%2d:%2d:%2dZ",
+            &tm.tm_year, &tm.tm_mon, &tm.tm_mday,
+            &tm.tm_hour, &tm.tm_min, &tm.tm_sec ) == 6) {
+        tm.tm_year -= 1900; // tm_year 0 = rfc3339 year  1900
+        tm.tm_mon -= 1;     // tm_mon  0 = rfc3339 month 1
+        return mktime( &tm );
+    }
+
+    return false;
+}
+
+#if MPW_JSON
+json_object *mpw_get_json_section(
+        json_object *obj, const char *section) {
+
+    json_object *json_value = obj;
+    char *sectionTokenizer = mpw_strdup( section ), *sectionToken = sectionTokenizer;
+    for (sectionToken = strtok( sectionToken, "." ); sectionToken; sectionToken = strtok( NULL, "." ))
+        if (!json_object_object_get_ex( json_value, sectionToken, &json_value ) || !json_value) {
+            trc( "While resolving: %s: Missing value for: %s", section, sectionToken );
+            json_value = NULL;
+            break;
+        }
+    free( sectionTokenizer );
+
+    return json_value;
+}
+
+const char *mpw_get_json_string(
+        json_object *obj, const char *section, const char *defaultValue) {
+
+    json_object *json_value = mpw_get_json_section( obj, section );
+    if (!json_value)
+        return defaultValue;
+
+    return json_object_get_string( json_value );
+}
+
+int64_t mpw_get_json_int(
+        json_object *obj, const char *section, int64_t defaultValue) {
+
+    json_object *json_value = mpw_get_json_section( obj, section );
+    if (!json_value)
+        return defaultValue;
+
+    return json_object_get_int64( json_value );
+}
+
+bool mpw_get_json_boolean(
+        json_object *obj, const char *section, bool defaultValue) {
+
+    json_object *json_value = mpw_get_json_section( obj, section );
+    if (!json_value)
+        return defaultValue;
+
+    return json_object_get_boolean( json_value ) == TRUE;
+}
+#endif
+
+bool mpw_update_masterKey(MPMasterKey *masterKey, MPAlgorithmVersion *masterKeyAlgorithm, MPAlgorithmVersion targetKeyAlgorithm,
+        const char *fullName, const char *masterPassword) {
+
+    if (*masterKeyAlgorithm != targetKeyAlgorithm) {
+        mpw_free( masterKey, MPMasterKeySize );
+        *masterKeyAlgorithm = targetKeyAlgorithm;
+        *masterKey = mpw_masterKey( fullName, masterPassword, *masterKeyAlgorithm );
+        if (!*masterKey) {
+            err( "Couldn't derive master key for user %s, algorithm %d.", fullName, *masterKeyAlgorithm );
+            return false;
+        }
+    }
+
+    return true;
+}

core/c/mpw-marshal-util.h

@@ -0,0 +1,73 @@
+//==============================================================================
+// 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_MARSHAL_UTIL_H
+#define _MPW_MARSHAL_UTIL_H
+
+#include <time.h>
+#if MPW_JSON
+#include "json-c/json.h"
+#endif
+
+#include "mpw-algorithm.h"
+
+/// Type parsing.
+
+/** Get a token from a string by searching until the first character in delim, no farther than eol.
+  * The input string reference is advanced beyond the token delimitor if one is found.
+  * @return A new string containing the token or NULL if the delim wasn't found before eol. */
+char *mpw_get_token(
+        const char **in, const char *eol, char *delim);
+/** Convert an RFC 3339 time string into epoch time. */
+time_t mpw_mktime(
+        const char *time);
+
+/// JSON parsing.
+
+#if MPW_JSON
+/** Search for a JSON child object in a JSON object tree.
+  * @param section A dot-delimited list of JSON object keys to walk toward the child object.
+  * @return A new JSON object or NULL if one of the section's object keys was not found in the source object's tree. */
+json_object *mpw_get_json_section(
+        json_object *obj, const char *section);
+/** Search for a string in a JSON object tree.
+  * @param section A dot-delimited list of JSON object keys to walk toward the child object.
+  * @return A new string or defaultValue if one of the section's object keys was not found in the source object's tree. */
+const char *mpw_get_json_string(
+        json_object *obj, const char *section, const char *defaultValue);
+/** Search for an integer in a JSON object tree.
+  * @param section A dot-delimited list of JSON object keys to walk toward the child object.
+  * @return The integer value or defaultValue if one of the section's object keys was not found in the source object's tree. */
+int64_t mpw_get_json_int(
+        json_object *obj, const char *section, int64_t defaultValue);
+/** Search for a boolean in a JSON object tree.
+  * @param section A dot-delimited list of JSON object keys to walk toward the child object.
+  * @return The boolean value or defaultValue if one of the section's object keys was not found in the source object's tree. */
+bool mpw_get_json_boolean(
+        json_object *obj, const char *section, bool defaultValue);
+#endif
+
+/// mpw.
+
+/** Calculate a master key if the target master key algorithm is different from the given master key algorithm.
+  * @return false if an error occurred during the derivation of the master key. */
+bool mpw_update_masterKey(
+        MPMasterKey *masterKey, MPAlgorithmVersion *masterKeyAlgorithm, MPAlgorithmVersion targetKeyAlgorithm,
+        const char *fullName, const char *masterPassword);
+
+#endif // _MPW_MARSHAL_UTIL_H

core/c/mpw-marshal.c

@@ -0,0 +1,924 @@
+//==============================================================================
+// 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 <string.h>
+#include <ctype.h>
+
+#include "mpw-marshal.h"
+#include "mpw-util.h"
+#include "mpw-marshal-util.h"
+
+MPMarshalledUser *mpw_marshal_user(
+        const char *fullName, const char *masterPassword, const MPAlgorithmVersion algorithmVersion) {
+
+    MPMarshalledUser *user;
+    if (!fullName || !masterPassword || !(user = malloc( sizeof( MPMarshalledUser ) )))
+        return NULL;
+
+    *user = (MPMarshalledUser){
+            .fullName = mpw_strdup( fullName ),
+            .masterPassword = mpw_strdup( masterPassword ),
+            .algorithm = algorithmVersion,
+            .redacted = true,
+
+            .avatar = 0,
+            .defaultType = MPResultTypeDefault,
+            .lastUsed = 0,
+
+            .sites_count = 0,
+            .sites = NULL,
+    };
+    return user;
+}
+
+MPMarshalledSite *mpw_marshal_site(
+        MPMarshalledUser *user, const char *siteName, const MPResultType resultType,
+        const MPCounterValue siteCounter, const MPAlgorithmVersion algorithmVersion) {
+
+    if (!siteName || !mpw_realloc( &user->sites, NULL, sizeof( MPMarshalledSite ) * ++user->sites_count ))
+        return NULL;
+
+    MPMarshalledSite *site = &user->sites[user->sites_count - 1];
+    *site = (MPMarshalledSite){
+            .name = mpw_strdup( siteName ),
+            .content = NULL,
+            .type = resultType,
+            .counter = siteCounter,
+            .algorithm = algorithmVersion,
+
+            .loginContent = NULL,
+            .loginType = MPResultTypeTemplateName,
+
+            .url = NULL,
+            .uses = 0,
+            .lastUsed = 0,
+
+            .questions_count = 0,
+            .questions = NULL,
+    };
+    return site;
+}
+
+MPMarshalledQuestion *mpw_marshal_question(
+        MPMarshalledSite *site, const char *keyword) {
+
+    if (!mpw_realloc( &site->questions, NULL, sizeof( MPMarshalledQuestion ) * ++site->questions_count ))
+        return NULL;
+    if (!keyword)
+        keyword = "";
+
+    MPMarshalledQuestion *question = &site->questions[site->questions_count - 1];
+    *question = (MPMarshalledQuestion){
+            .keyword = mpw_strdup( keyword ),
+            .content = NULL,
+            .type = MPResultTypeTemplatePhrase,
+    };
+    return question;
+}
+
+bool mpw_marshal_info_free(
+        MPMarshalInfo **info) {
+
+    if (!info || !*info)
+        return true;
+
+    bool success = true;
+    success &= mpw_free_strings( &(*info)->fullName, &(*info)->keyID, NULL );
+    success &= mpw_free( info, sizeof( MPMarshalInfo ) );
+
+    return success;
+}
+
+bool mpw_marshal_free(
+        MPMarshalledUser **user) {
+
+    if (!user || !*user)
+        return true;
+
+    bool success = true;
+    success &= mpw_free_strings( &(*user)->fullName, &(*user)->masterPassword, NULL );
+
+    for (size_t s = 0; s < (*user)->sites_count; ++s) {
+        MPMarshalledSite *site = &(*user)->sites[s];
+        success &= mpw_free_strings( &site->name, &site->content, &site->loginContent, &site->url, NULL );
+
+        for (size_t q = 0; q < site->questions_count; ++q) {
+            MPMarshalledQuestion *question = &site->questions[q];
+            success &= mpw_free_strings( &question->keyword, &question->content, NULL );
+        }
+        success &= mpw_free( &site->questions, sizeof( MPMarshalledQuestion ) * site->questions_count );
+    }
+
+    success &= mpw_free( &(*user)->sites, sizeof( MPMarshalledSite ) * (*user)->sites_count );
+    success &= mpw_free( user, sizeof( MPMarshalledUser ) );
+
+    return success;
+}
+
+static bool mpw_marshal_write_flat(
+        char **out, const MPMarshalledUser *user, MPMarshalError *error) {
+
+    *error = (MPMarshalError){ MPMarshalErrorInternal, "Unexpected internal error." };
+    if (!user->fullName || !strlen( user->fullName )) {
+        *error = (MPMarshalError){ MPMarshalErrorMissing, "Missing full name." };
+        return false;
+    }
+    if (!user->masterPassword || !strlen( user->masterPassword )) {
+        *error = (MPMarshalError){ MPMarshalErrorMasterPassword, "Missing master password." };
+        return false;
+    }
+    MPMasterKey masterKey = NULL;
+    MPAlgorithmVersion masterKeyAlgorithm = user->algorithm - 1;
+    if (!mpw_update_masterKey( &masterKey, &masterKeyAlgorithm, user->algorithm, user->fullName, user->masterPassword )) {
+        *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't derive master key." };
+        return false;
+    }
+
+    mpw_string_pushf( out, "# Master Password site export\n" );
+    if (user->redacted)
+        mpw_string_pushf( out, "#     Export of site names and stored passwords (unless device-private) encrypted with the master key.\n" );
+    else
+        mpw_string_pushf( out, "#     Export of site names and passwords in clear-text.\n" );
+    mpw_string_pushf( out, "# \n" );
+    mpw_string_pushf( out, "##\n" );
+    mpw_string_pushf( out, "# Format: %d\n", 1 );
+
+    char dateString[21];
+    time_t now = time( NULL );
+    if (strftime( dateString, sizeof( dateString ), "%FT%TZ", gmtime( &now ) ))
+        mpw_string_pushf( out, "# Date: %s\n", dateString );
+    mpw_string_pushf( out, "# User Name: %s\n", user->fullName );
+    mpw_string_pushf( out, "# Full Name: %s\n", user->fullName );
+    mpw_string_pushf( out, "# Avatar: %u\n", user->avatar );
+    mpw_string_pushf( out, "# Key ID: %s\n", mpw_id_buf( masterKey, MPMasterKeySize ) );
+    mpw_string_pushf( out, "# Algorithm: %d\n", user->algorithm );
+    mpw_string_pushf( out, "# Default Type: %d\n", user->defaultType );
+    mpw_string_pushf( out, "# Passwords: %s\n", user->redacted? "PROTECTED": "VISIBLE" );
+    mpw_string_pushf( out, "##\n" );
+    mpw_string_pushf( out, "#\n" );
+    mpw_string_pushf( out, "#               Last     Times  Password                      Login\t                     Site\tSite\n" );
+    mpw_string_pushf( out, "#               used      used      type                       name\t                     name\tpassword\n" );
+
+    // Sites.
+    for (size_t s = 0; s < user->sites_count; ++s) {
+        MPMarshalledSite *site = &user->sites[s];
+        if (!site->name || !strlen( site->name ))
+            continue;
+
+        const char *content = NULL, *loginContent = NULL;
+        if (!user->redacted) {
+            // Clear Text
+            if (!mpw_update_masterKey( &masterKey, &masterKeyAlgorithm, site->algorithm, user->fullName, user->masterPassword )) {
+                *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't derive master key." };
+                return false;
+            }
+
+            content = mpw_siteResult( masterKey, site->name, site->counter,
+                    MPKeyPurposeAuthentication, NULL, site->type, site->content, site->algorithm );
+            loginContent = mpw_siteResult( masterKey, site->name, MPCounterValueInitial,
+                    MPKeyPurposeIdentification, NULL, site->loginType, site->loginContent, site->algorithm );
+        }
+        else {
+            // Redacted
+            if (site->type & MPSiteFeatureExportContent && site->content && strlen( site->content ))
+                content = mpw_strdup( site->content );
+            if (site->loginType & MPSiteFeatureExportContent && site->loginContent && strlen( site->loginContent ))
+                loginContent = mpw_strdup( site->loginContent );
+        }
+
+        if (strftime( dateString, sizeof( dateString ), "%FT%TZ", gmtime( &site->lastUsed ) ))
+            mpw_string_pushf( out, "%s  %8ld  %lu:%lu:%lu  %25s\t%25s\t%s\n",
+                    dateString, (long)site->uses, (long)site->type, (long)site->algorithm, (long)site->counter,
+                    loginContent?: "", site->name, content?: "" );
+        mpw_free_strings( &content, &loginContent, NULL );
+    }
+    mpw_free( &masterKey, MPMasterKeySize );
+
+    *error = (MPMarshalError){ .type = MPMarshalSuccess };
+    return true;
+}
+
+#if MPW_JSON
+static bool mpw_marshal_write_json(
+        char **out, const MPMarshalledUser *user, MPMarshalError *error) {
+
+    *error = (MPMarshalError){ MPMarshalErrorInternal, "Unexpected internal error." };
+    if (!user->fullName || !strlen( user->fullName )) {
+        *error = (MPMarshalError){ MPMarshalErrorMissing, "Missing full name." };
+        return false;
+    }
+    if (!user->masterPassword || !strlen( user->masterPassword )) {
+        *error = (MPMarshalError){ MPMarshalErrorMasterPassword, "Missing master password." };
+        return false;
+    }
+    MPMasterKey masterKey = NULL;
+    MPAlgorithmVersion masterKeyAlgorithm = user->algorithm - 1;
+    if (!mpw_update_masterKey( &masterKey, &masterKeyAlgorithm, user->algorithm, user->fullName, user->masterPassword )) {
+        *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't derive master key." };
+        return false;
+    }
+
+    // Section: "export"
+    json_object *json_file = json_object_new_object();
+    json_object *json_export = json_object_new_object();
+    json_object_object_add( json_file, "export", json_export );
+    json_object_object_add( json_export, "format", json_object_new_int( 1 ) );
+    json_object_object_add( json_export, "redacted", json_object_new_boolean( user->redacted ) );
+
+    char dateString[21];
+    time_t now = time( NULL );
+    if (strftime( dateString, sizeof( dateString ), "%FT%TZ", gmtime( &now ) ))
+        json_object_object_add( json_export, "date", json_object_new_string( dateString ) );
+
+    // Section: "user"
+    json_object *json_user = json_object_new_object();
+    json_object_object_add( json_file, "user", json_user );
+    json_object_object_add( json_user, "avatar", json_object_new_int( (int32_t)user->avatar ) );
+    json_object_object_add( json_user, "full_name", json_object_new_string( user->fullName ) );
+
+    if (strftime( dateString, sizeof( dateString ), "%FT%TZ", gmtime( &user->lastUsed ) ))
+        json_object_object_add( json_user, "last_used", json_object_new_string( dateString ) );
+    json_object_object_add( json_user, "key_id", json_object_new_string( mpw_id_buf( masterKey, MPMasterKeySize ) ) );
+
+    json_object_object_add( json_user, "algorithm", json_object_new_int( (int32_t)user->algorithm ) );
+    json_object_object_add( json_user, "default_type", json_object_new_int( (int32_t)user->defaultType ) );
+
+    // Section "sites"
+    json_object *json_sites = json_object_new_object();
+    json_object_object_add( json_file, "sites", json_sites );
+    for (size_t s = 0; s < user->sites_count; ++s) {
+        MPMarshalledSite *site = &user->sites[s];
+        if (!site->name || !strlen( site->name ))
+            continue;
+
+        const char *content = NULL, *loginContent = NULL;
+        if (!user->redacted) {
+            // Clear Text
+            if (!mpw_update_masterKey( &masterKey, &masterKeyAlgorithm, site->algorithm, user->fullName, user->masterPassword )) {
+                *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't derive master key." };
+                return false;
+            }
+
+            content = mpw_siteResult( masterKey, site->name, site->counter,
+                    MPKeyPurposeAuthentication, NULL, site->type, site->content, site->algorithm );
+            loginContent = mpw_siteResult( masterKey, site->name, MPCounterValueInitial,
+                    MPKeyPurposeIdentification, NULL, site->loginType, site->loginContent, site->algorithm );
+        }
+        else {
+            // Redacted
+            if (site->type & MPSiteFeatureExportContent && site->content && strlen( site->content ))
+                content = mpw_strdup( site->content );
+            if (site->loginType & MPSiteFeatureExportContent && site->loginContent && strlen( site->loginContent ))
+                loginContent = mpw_strdup( site->loginContent );
+        }
+
+        json_object *json_site = json_object_new_object();
+        json_object_object_add( json_sites, site->name, json_site );
+        json_object_object_add( json_site, "type", json_object_new_int( (int32_t)site->type ) );
+        json_object_object_add( json_site, "counter", json_object_new_int( (int32_t)site->counter ) );
+        json_object_object_add( json_site, "algorithm", json_object_new_int( (int32_t)site->algorithm ) );
+        if (content)
+            json_object_object_add( json_site, "password", json_object_new_string( content ) );
+        if (loginContent)
+            json_object_object_add( json_site, "login_name", json_object_new_string( loginContent ) );
+        json_object_object_add( json_site, "login_type", json_object_new_int( (int32_t)site->loginType ) );
+
+        json_object_object_add( json_site, "uses", json_object_new_int( (int32_t)site->uses ) );
+        if (strftime( dateString, sizeof( dateString ), "%FT%TZ", gmtime( &site->lastUsed ) ))
+            json_object_object_add( json_site, "last_used", json_object_new_string( dateString ) );
+
+        json_object *json_site_questions = json_object_new_object();
+        json_object_object_add( json_site, "questions", json_site_questions );
+        for (size_t q = 0; q < site->questions_count; ++q) {
+            MPMarshalledQuestion *question = &site->questions[q];
+            if (!question->keyword)
+                continue;
+
+            json_object *json_site_question = json_object_new_object();
+            json_object_object_add( json_site_questions, question->keyword, json_site_question );
+            json_object_object_add( json_site_question, "type", json_object_new_int( (int32_t)question->type ) );
+
+            if (!user->redacted) {
+                // Clear Text
+                const char *answerContent = mpw_siteResult( masterKey, site->name, MPCounterValueInitial,
+                        MPKeyPurposeRecovery, question->keyword, question->type, question->content, site->algorithm );
+                json_object_object_add( json_site_question, "answer", json_object_new_string( answerContent ) );
+            }
+            else {
+                // Redacted
+                if (site->type & MPSiteFeatureExportContent && question->content && strlen( question->content ))
+                    json_object_object_add( json_site_question, "answer", json_object_new_string( question->content ) );
+            }
+        }
+
+        json_object *json_site_mpw = json_object_new_object();
+        json_object_object_add( json_site, "_ext_mpw", json_site_mpw );
+        if (site->url)
+            json_object_object_add( json_site_mpw, "url", json_object_new_string( site->url ) );
+
+        mpw_free_strings( &content, &loginContent, NULL );
+    }
+
+    mpw_string_pushf( out, "%s\n", json_object_to_json_string_ext( json_file, JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED ) );
+    mpw_free( &masterKey, MPMasterKeySize );
+    json_object_put( json_file );
+
+    *error = (MPMarshalError){ .type = MPMarshalSuccess };
+    return true;
+}
+#endif
+
+bool mpw_marshal_write(
+        char **out, const MPMarshalFormat outFormat, const MPMarshalledUser *user, MPMarshalError *error) {
+
+    switch (outFormat) {
+        case MPMarshalFormatNone:
+            *error = (MPMarshalError){ .type = MPMarshalSuccess };
+            return false;
+        case MPMarshalFormatFlat:
+            return mpw_marshal_write_flat( out, user, error );
+#if MPW_JSON
+        case MPMarshalFormatJSON:
+            return mpw_marshal_write_json( out, user, error );
+#endif
+        default:
+            *error = (MPMarshalError){ MPMarshalErrorFormat, mpw_str( "Unsupported output format: %u", outFormat ) };
+            return false;
+    }
+}
+
+static void mpw_marshal_read_flat_info(
+        const char *in, MPMarshalInfo *info) {
+
+    info->algorithm = MPAlgorithmVersionCurrent;
+
+    // Parse import data.
+    bool headerStarted = false;
+    for (const char *endOfLine, *positionInLine = in; (endOfLine = strstr( positionInLine, "\n" )); positionInLine = endOfLine + 1) {
+
+        // Comment or header
+        if (*positionInLine == '#') {
+            ++positionInLine;
+
+            if (!headerStarted) {
+                if (*positionInLine == '#')
+                    // ## starts header
+                    headerStarted = true;
+                // Comment before header
+                continue;
+            }
+            if (*positionInLine == '#')
+                // ## ends header
+                break;
+
+            // Header
+            char *headerName = mpw_get_token( &positionInLine, endOfLine, ":\n" );
+            char *headerValue = mpw_get_token( &positionInLine, endOfLine, "\n" );
+            if (!headerName || !headerValue)
+                continue;
+
+            if (strcmp( headerName, "Algorithm" ) == 0)
+                info->algorithm = (MPAlgorithmVersion)atoi( headerValue );
+            if (strcmp( headerName, "Full Name" ) == 0 || strcmp( headerName, "User Name" ) == 0)
+                info->fullName = mpw_strdup( headerValue );
+            if (strcmp( headerName, "Key ID" ) == 0)
+                info->keyID = mpw_strdup( headerValue );
+            if (strcmp( headerName, "Passwords" ) == 0)
+                info->redacted = strcmp( headerValue, "VISIBLE" ) != 0;
+            if (strcmp( headerName, "Date" ) == 0)
+                info->date = mpw_mktime( headerValue );
+
+            mpw_free_strings( &headerName, &headerValue, NULL );
+            continue;
+        }
+    }
+}
+
+static MPMarshalledUser *mpw_marshal_read_flat(
+        const char *in, const char *masterPassword, MPMarshalError *error) {
+
+    *error = (MPMarshalError){ MPMarshalErrorInternal, "Unexpected internal error." };
+    if (!in || !strlen( in )) {
+        error->type = MPMarshalErrorStructure;
+        error->description = mpw_str( "No input data." );
+        return NULL;
+    }
+
+    // Parse import data.
+    MPMasterKey masterKey = NULL;
+    MPMarshalledUser *user = NULL;
+    unsigned int format = 0, avatar = 0;
+    char *fullName = NULL, *keyID = NULL;
+    MPAlgorithmVersion algorithm = MPAlgorithmVersionCurrent, masterKeyAlgorithm = (MPAlgorithmVersion)-1;
+    MPResultType defaultType = MPResultTypeDefault;
+    bool headerStarted = false, headerEnded = false, importRedacted = false;
+    for (const char *endOfLine, *positionInLine = in; (endOfLine = strstr( positionInLine, "\n" )); positionInLine = endOfLine + 1) {
+
+        // Comment or header
+        if (*positionInLine == '#') {
+            ++positionInLine;
+
+            if (!headerStarted) {
+                if (*positionInLine == '#')
+                    // ## starts header
+                    headerStarted = true;
+                // Comment before header
+                continue;
+            }
+            if (headerEnded)
+                // Comment after header
+                continue;
+            if (*positionInLine == '#') {
+                // ## ends header
+                headerEnded = true;
+                continue;
+            }
+
+            // Header
+            char *headerName = mpw_get_token( &positionInLine, endOfLine, ":\n" );
+            char *headerValue = mpw_get_token( &positionInLine, endOfLine, "\n" );
+            if (!headerName || !headerValue) {
+                error->type = MPMarshalErrorStructure;
+                error->description = mpw_str( "Invalid header: %s", mpw_strndup( positionInLine, (size_t)(endOfLine - positionInLine) ) );
+                return NULL;
+            }
+
+            if (strcmp( headerName, "Format" ) == 0)
+                format = (unsigned int)atoi( headerValue );
+            if (strcmp( headerName, "Full Name" ) == 0 || strcmp( headerName, "User Name" ) == 0)
+                fullName = mpw_strdup( headerValue );
+            if (strcmp( headerName, "Avatar" ) == 0)
+                avatar = (unsigned int)atoi( headerValue );
+            if (strcmp( headerName, "Key ID" ) == 0)
+                keyID = mpw_strdup( headerValue );
+            if (strcmp( headerName, "Algorithm" ) == 0) {
+                int value = atoi( headerValue );
+                if (value < MPAlgorithmVersionFirst || value > MPAlgorithmVersionLast) {
+                    *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid user algorithm version: %s", headerValue ) };
+                    return NULL;
+                }
+                algorithm = (MPAlgorithmVersion)value;
+            }
+            if (strcmp( headerName, "Default Type" ) == 0) {
+                int value = atoi( headerValue );
+                if (!mpw_nameForType( (MPResultType)value )) {
+                    *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid user default type: %s", headerValue ) };
+                    return NULL;
+                }
+                defaultType = (MPResultType)value;
+            }
+            if (strcmp( headerName, "Passwords" ) == 0)
+                importRedacted = strcmp( headerValue, "VISIBLE" ) != 0;
+
+            mpw_free_strings( &headerName, &headerValue, NULL );
+            continue;
+        }
+        if (!headerEnded)
+            continue;
+        if (!fullName) {
+            *error = (MPMarshalError){ MPMarshalErrorMissing, "Missing header: Full Name" };
+            return NULL;
+        }
+        if (positionInLine >= endOfLine)
+            continue;
+
+        if (!user) {
+            if (!mpw_update_masterKey( &masterKey, &masterKeyAlgorithm, algorithm, fullName, masterPassword )) {
+                *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't derive master key." };
+                return NULL;
+            }
+            if (keyID && !mpw_id_buf_equals( keyID, mpw_id_buf( masterKey, MPMasterKeySize ) )) {
+                *error = (MPMarshalError){ MPMarshalErrorMasterPassword, "Master password doesn't match key ID." };
+                return NULL;
+            }
+            if (!(user = mpw_marshal_user( fullName, masterPassword, algorithm ))) {
+                *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't allocate a new user." };
+                return NULL;
+            }
+
+            user->redacted = importRedacted;
+            user->avatar = avatar;
+            user->defaultType = defaultType;
+        }
+
+        // Site
+        char *siteLoginName = NULL, *siteName = NULL, *siteContent = NULL;
+        char *str_lastUsed = NULL, *str_uses = NULL, *str_type = NULL, *str_algorithm = NULL, *str_counter = NULL;
+        switch (format) {
+            case 0: {
+                str_lastUsed = mpw_get_token( &positionInLine, endOfLine, " \t\n" );
+                str_uses = mpw_get_token( &positionInLine, endOfLine, " \t\n" );
+                char *typeAndVersion = mpw_get_token( &positionInLine, endOfLine, " \t\n" );
+                if (typeAndVersion) {
+                    str_type = mpw_strdup( strtok( typeAndVersion, ":" ) );
+                    str_algorithm = mpw_strdup( strtok( NULL, "" ) );
+                    mpw_free_string( &typeAndVersion );
+                }
+                str_counter = mpw_strdup( "1" );
+                siteLoginName = NULL;
+                siteName = mpw_get_token( &positionInLine, endOfLine, "\t\n" );
+                siteContent = mpw_get_token( &positionInLine, endOfLine, "\n" );
+                break;
+            }
+            case 1: {
+                str_lastUsed = mpw_get_token( &positionInLine, endOfLine, " \t\n" );
+                str_uses = mpw_get_token( &positionInLine, endOfLine, " \t\n" );
+                char *typeAndVersionAndCounter = mpw_get_token( &positionInLine, endOfLine, " \t\n" );
+                if (typeAndVersionAndCounter) {
+                    str_type = mpw_strdup( strtok( typeAndVersionAndCounter, ":" ) );
+                    str_algorithm = mpw_strdup( strtok( NULL, ":" ) );
+                    str_counter = mpw_strdup( strtok( NULL, "" ) );
+                    mpw_free_string( &typeAndVersionAndCounter );
+                }
+                siteLoginName = mpw_get_token( &positionInLine, endOfLine, "\t\n" );
+                siteName = mpw_get_token( &positionInLine, endOfLine, "\t\n" );
+                siteContent = mpw_get_token( &positionInLine, endOfLine, "\n" );
+                break;
+            }
+            default: {
+                *error = (MPMarshalError){ MPMarshalErrorFormat, mpw_str( "Unexpected import format: %u", format ) };
+                return NULL;
+            }
+        }
+
+        if (siteName && str_type && str_counter && str_algorithm && str_uses && str_lastUsed) {
+            MPResultType siteType = (MPResultType)atoi( str_type );
+            if (!mpw_nameForType( siteType )) {
+                *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid site type: %s: %s", siteName, str_type ) };
+                return NULL;
+            }
+            long long int value = atoll( str_counter );
+            if (value < MPCounterValueFirst || value > MPCounterValueLast) {
+                *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid site counter: %s: %s", siteName, str_counter ) };
+                return NULL;
+            }
+            MPCounterValue siteCounter = (MPCounterValue)value;
+            value = atoll( str_algorithm );
+            if (value < MPAlgorithmVersionFirst || value > MPAlgorithmVersionLast) {
+                *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid site algorithm: %s: %s", siteName, str_algorithm ) };
+                return NULL;
+            }
+            MPAlgorithmVersion siteAlgorithm = (MPAlgorithmVersion)value;
+            time_t siteLastUsed = mpw_mktime( str_lastUsed );
+            if (!siteLastUsed) {
+                *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid site last used: %s: %s", siteName, str_lastUsed ) };
+                return NULL;
+            }
+
+            MPMarshalledSite *site = mpw_marshal_site(
+                    user, siteName, siteType, siteCounter, siteAlgorithm );
+            if (!site) {
+                *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't allocate a new site." };
+                return NULL;
+            }
+
+            site->uses = (unsigned int)atoi( str_uses );
+            site->lastUsed = siteLastUsed;
+            if (!user->redacted) {
+                // Clear Text
+                if (!mpw_update_masterKey( &masterKey, &masterKeyAlgorithm, site->algorithm, fullName, masterPassword )) {
+                    *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't derive master key." };
+                    return NULL;
+                }
+
+                if (siteContent && strlen( siteContent ))
+                    site->content = mpw_siteState( masterKey, site->name, site->counter,
+                            MPKeyPurposeAuthentication, NULL, site->type, siteContent, site->algorithm );
+                if (siteLoginName && strlen( siteLoginName ))
+                    site->loginContent = mpw_siteState( masterKey, site->name, MPCounterValueInitial,
+                            MPKeyPurposeIdentification, NULL, site->loginType, siteLoginName, site->algorithm );
+            }
+            else {
+                // Redacted
+                if (siteContent && strlen( siteContent ))
+                    site->content = mpw_strdup( siteContent );
+                if (siteLoginName && strlen( siteLoginName ))
+                    site->loginContent = mpw_strdup( siteLoginName );
+            }
+        }
+        else {
+            error->type = MPMarshalErrorMissing;
+            error->description = mpw_str(
+                    "Missing one of: lastUsed=%s, uses=%s, type=%s, version=%s, counter=%s, loginName=%s, siteName=%s",
+                    str_lastUsed, str_uses, str_type, str_algorithm, str_counter, siteLoginName, siteName );
+            return NULL;
+        }
+
+        mpw_free_strings( &str_lastUsed, &str_uses, &str_type, &str_algorithm, &str_counter, NULL );
+        mpw_free_strings( &siteLoginName, &siteName, &siteContent, NULL );
+    }
+    mpw_free_strings( &fullName, &keyID, NULL );
+    mpw_free( &masterKey, MPMasterKeySize );
+
+    *error = (MPMarshalError){ .type = MPMarshalSuccess };
+    return user;
+}
+
+#if MPW_JSON
+static void mpw_marshal_read_json_info(
+        const char *in, MPMarshalInfo *info) {
+
+    // Parse JSON.
+    enum json_tokener_error json_error = json_tokener_success;
+    json_object *json_file = json_tokener_parse_verbose( in, &json_error );
+    if (!json_file || json_error != json_tokener_success)
+        return;
+
+    // Section: "export"
+    int64_t fileFormat = mpw_get_json_int( json_file, "export.format", 0 );
+    if (fileFormat < 1)
+        return;
+    info->redacted = mpw_get_json_boolean( json_file, "export.redacted", true );
+    info->date = mpw_mktime( mpw_get_json_string( json_file, "export.date", NULL ) );
+
+    // Section: "user"
+    info->algorithm = (MPAlgorithmVersion)mpw_get_json_int( json_file, "user.algorithm", MPAlgorithmVersionCurrent );
+    info->fullName = mpw_strdup( mpw_get_json_string( json_file, "user.full_name", NULL ) );
+    info->keyID = mpw_strdup( mpw_get_json_string( json_file, "user.key_id", NULL ) );
+
+    json_object_put( json_file );
+}
+
+static MPMarshalledUser *mpw_marshal_read_json(
+        const char *in, const char *masterPassword, MPMarshalError *error) {
+
+    *error = (MPMarshalError){ MPMarshalErrorInternal, "Unexpected internal error." };
+    if (!in || !strlen( in )) {
+        error->type = MPMarshalErrorStructure;
+        error->description = mpw_str( "No input data." );
+        return NULL;
+    }
+
+    // Parse JSON.
+    enum json_tokener_error json_error = json_tokener_success;
+    json_object *json_file = json_tokener_parse_verbose( in, &json_error );
+    if (!json_file || json_error != json_tokener_success) {
+        *error = (MPMarshalError){ MPMarshalErrorStructure, mpw_str( "JSON error: %s", json_tokener_error_desc( json_error ) ) };
+        return NULL;
+    }
+
+    // Parse import data.
+    MPMasterKey masterKey = NULL;
+    MPAlgorithmVersion masterKeyAlgorithm = (MPAlgorithmVersion)-1;
+    MPMarshalledUser *user = NULL;
+
+    // Section: "export"
+    int64_t fileFormat = mpw_get_json_int( json_file, "export.format", 0 );
+    if (fileFormat < 1) {
+        *error = (MPMarshalError){ MPMarshalErrorFormat, mpw_str( "Unsupported format: %u", fileFormat ) };
+        return NULL;
+    }
+    bool fileRedacted = mpw_get_json_boolean( json_file, "export.redacted", true );
+
+    // Section: "user"
+    unsigned int avatar = (unsigned int)mpw_get_json_int( json_file, "user.avatar", 0 );
+    const char *fullName = mpw_get_json_string( json_file, "user.full_name", NULL );
+    const char *str_lastUsed = mpw_get_json_string( json_file, "user.last_used", NULL );
+    const char *keyID = mpw_get_json_string( json_file, "user.key_id", NULL );
+    int64_t value = mpw_get_json_int( json_file, "user.algorithm", MPAlgorithmVersionCurrent );
+    if (value < MPAlgorithmVersionFirst || value > MPAlgorithmVersionLast) {
+        *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid user algorithm version: %u", value ) };
+        return NULL;
+    }
+    MPAlgorithmVersion algorithm = (MPAlgorithmVersion)value;
+    MPResultType defaultType = (MPResultType)mpw_get_json_int( json_file, "user.default_type", MPResultTypeDefault );
+    if (!mpw_nameForType( defaultType )) {
+        *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid user default type: %u", defaultType ) };
+        return NULL;
+    }
+    time_t lastUsed = mpw_mktime( str_lastUsed );
+    if (!lastUsed) {
+        *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid user last used: %s", str_lastUsed ) };
+        return NULL;
+    }
+    if (!fullName || !strlen( fullName )) {
+        *error = (MPMarshalError){ MPMarshalErrorMissing, "Missing value for full name." };
+        return NULL;
+    }
+    if (!mpw_update_masterKey( &masterKey, &masterKeyAlgorithm, algorithm, fullName, masterPassword )) {
+        *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't derive master key." };
+        return NULL;
+    }
+    if (keyID && !mpw_id_buf_equals( keyID, mpw_id_buf( masterKey, MPMasterKeySize ) )) {
+        *error = (MPMarshalError){ MPMarshalErrorMasterPassword, "Master password doesn't match key ID." };
+        return NULL;
+    }
+    if (!(user = mpw_marshal_user( fullName, masterPassword, algorithm ))) {
+        *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't allocate a new user." };
+        return NULL;
+    }
+    user->redacted = fileRedacted;
+    user->avatar = avatar;
+    user->defaultType = defaultType;
+    user->lastUsed = lastUsed;
+
+    // Section "sites"
+    json_object_iter json_site;
+    json_object *json_sites = mpw_get_json_section( json_file, "sites" );
+    json_object_object_foreachC( json_sites, json_site ) {
+        const char *siteName = json_site.key;
+        value = mpw_get_json_int( json_site.val, "algorithm", (int32_t)user->algorithm );
+        if (value < MPAlgorithmVersionFirst || value > MPAlgorithmVersionLast) {
+            *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid site algorithm version: %s: %d", siteName, value ) };
+            return NULL;
+        }
+        MPAlgorithmVersion siteAlgorithm = (MPAlgorithmVersion)value;
+        MPResultType siteType = (MPResultType)mpw_get_json_int( json_site.val, "type", (int32_t)user->defaultType );
+        if (!mpw_nameForType( siteType )) {
+            *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid site type: %s: %u", siteName, siteType ) };
+            return NULL;
+        }
+        value = mpw_get_json_int( json_site.val, "counter", 1 );
+        if (value < MPCounterValueFirst || value > MPCounterValueLast) {
+            *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid site counter: %s: %d", siteName, value ) };
+            return NULL;
+        }
+        MPCounterValue siteCounter = (MPCounterValue)value;
+        const char *siteContent = mpw_get_json_string( json_site.val, "password", NULL );
+        const char *siteLoginName = mpw_get_json_string( json_site.val, "login_name", NULL );
+        MPResultType siteLoginType = (MPResultType)mpw_get_json_int( json_site.val, "login_type", MPResultTypeTemplateName );
+        unsigned int siteUses = (unsigned int)mpw_get_json_int( json_site.val, "uses", 0 );
+        str_lastUsed = mpw_get_json_string( json_site.val, "last_used", NULL );
+        time_t siteLastUsed = mpw_mktime( str_lastUsed );
+        if (!siteLastUsed) {
+            *error = (MPMarshalError){ MPMarshalErrorIllegal, mpw_str( "Invalid site last used: %s: %s", siteName, str_lastUsed ) };
+            return NULL;
+        }
+
+        json_object *json_site_mpw = mpw_get_json_section( json_site.val, "_ext_mpw" );
+        const char *siteURL = mpw_get_json_string( json_site_mpw, "url", NULL );
+
+        MPMarshalledSite *site = mpw_marshal_site( user, siteName, siteType, siteCounter, siteAlgorithm );
+        if (!site) {
+            *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't allocate a new site." };
+            return NULL;
+        }
+
+        site->loginType = siteLoginType;
+        site->url = siteURL? mpw_strdup( siteURL ): NULL;
+        site->uses = siteUses;
+        site->lastUsed = siteLastUsed;
+        if (!user->redacted) {
+            // Clear Text
+            if (!mpw_update_masterKey( &masterKey, &masterKeyAlgorithm, site->algorithm, fullName, masterPassword )) {
+                *error = (MPMarshalError){ MPMarshalErrorInternal, "Couldn't derive master key." };
+                return NULL;
+            }
+
+            if (siteContent && strlen( siteContent ))
+                site->content = mpw_siteState( masterKey, site->name, site->counter,
+                        MPKeyPurposeAuthentication, NULL, site->type, siteContent, site->algorithm );
+            if (siteLoginName && strlen( siteLoginName ))
+                site->loginContent = mpw_siteState( masterKey, site->name, MPCounterValueInitial,
+                        MPKeyPurposeIdentification, NULL, site->loginType, siteLoginName, site->algorithm );
+        }
+        else {
+            // Redacted
+            if (siteContent && strlen( siteContent ))
+                site->content = mpw_strdup( siteContent );
+            if (siteLoginName && strlen( siteLoginName ))
+                site->loginContent = mpw_strdup( siteLoginName );
+        }
+
+        json_object_iter json_site_question;
+        json_object *json_site_questions = mpw_get_json_section( json_site.val, "questions" );
+        json_object_object_foreachC( json_site_questions, json_site_question ) {
+            MPMarshalledQuestion *question = mpw_marshal_question( site, json_site_question.key );
+            const char *answerContent = mpw_get_json_string( json_site_question.val, "answer", NULL );
+            question->type = (MPResultType)mpw_get_json_int( json_site_question.val, "type", MPResultTypeTemplatePhrase );
+
+            if (!user->redacted) {
+                // Clear Text
+                if (answerContent && strlen( answerContent ))
+                    question->content = mpw_siteState( masterKey, site->name, MPCounterValueInitial,
+                            MPKeyPurposeRecovery, question->keyword, question->type, answerContent, site->algorithm );
+            }
+            else {
+                // Redacted
+                if (answerContent && strlen( answerContent ))
+                    question->content = mpw_strdup( answerContent );
+            }
+        }
+    }
+    json_object_put( json_file );
+
+    *error = (MPMarshalError){ .type = MPMarshalSuccess };
+    return user;
+}
+#endif
+
+MPMarshalInfo *mpw_marshal_read_info(
+        const char *in) {
+
+    MPMarshalInfo *info = malloc( sizeof( MPMarshalInfo ) );
+    *info = (MPMarshalInfo){ .format = MPMarshalFormatNone };
+
+    if (in && strlen( in )) {
+        if (in[0] == '#') {
+            *info = (MPMarshalInfo){ .format = MPMarshalFormatFlat };
+            mpw_marshal_read_flat_info( in, info );
+        }
+        else if (in[0] == '{') {
+            *info = (MPMarshalInfo){ .format = MPMarshalFormatJSON };
+#if MPW_JSON
+            mpw_marshal_read_json_info( in, info );
+#endif
+        }
+    }
+
+    return info;
+}
+
+MPMarshalledUser *mpw_marshal_read(
+        const char *in, const MPMarshalFormat inFormat, const char *masterPassword, MPMarshalError *error) {
+
+    switch (inFormat) {
+        case MPMarshalFormatNone:
+            *error = (MPMarshalError){ .type = MPMarshalSuccess };
+            return false;
+        case MPMarshalFormatFlat:
+            return mpw_marshal_read_flat( in, masterPassword, error );
+#if MPW_JSON
+        case MPMarshalFormatJSON:
+            return mpw_marshal_read_json( in, masterPassword, error );
+#endif
+        default:
+            *error = (MPMarshalError){ MPMarshalErrorFormat, mpw_str( "Unsupported input format: %u", inFormat ) };
+            return NULL;
+    }
+}
+
+const MPMarshalFormat mpw_formatWithName(
+        const char *formatName) {
+
+    if (!formatName || !strlen( formatName ))
+        return MPMarshalFormatNone;
+
+    // Lower-case to standardize it.
+    size_t stdFormatNameSize = strlen( formatName );
+    char stdFormatName[stdFormatNameSize + 1];
+    for (size_t c = 0; c < stdFormatNameSize; ++c)
+        stdFormatName[c] = (char)tolower( formatName[c] );
+    stdFormatName[stdFormatNameSize] = '\0';
+
+    if (strncmp( mpw_nameForFormat( MPMarshalFormatNone ), stdFormatName, strlen( stdFormatName ) ) == 0)
+        return MPMarshalFormatNone;
+    if (strncmp( mpw_nameForFormat( MPMarshalFormatFlat ), stdFormatName, strlen( stdFormatName ) ) == 0)
+        return MPMarshalFormatFlat;
+    if (strncmp( mpw_nameForFormat( MPMarshalFormatJSON ), stdFormatName, strlen( stdFormatName ) ) == 0)
+        return MPMarshalFormatJSON;
+
+    dbg( "Not a format name: %s", stdFormatName );
+    return (MPMarshalFormat)ERR;
+}
+
+const char *mpw_nameForFormat(
+        const MPMarshalFormat format) {
+
+    switch (format) {
+        case MPMarshalFormatNone:
+            return "none";
+        case MPMarshalFormatFlat:
+            return "flat";
+        case MPMarshalFormatJSON:
+            return "json";
+        default: {
+            dbg( "Unknown format: %d", format );
+            return NULL;
+        }
+    }
+}
+
+const char *mpw_marshal_format_extension(
+        const MPMarshalFormat format) {
+
+    switch (format) {
+        case MPMarshalFormatNone:
+            return NULL;
+        case MPMarshalFormatFlat:
+            return "mpsites";
+        case MPMarshalFormatJSON:
+            return "mpsites.json";
+        default: {
+            dbg( "Unknown format: %d", format );
+            return NULL;
+        }
+    }
+}

core/c/mpw-marshal.h

@@ -0,0 +1,159 @@
+//==============================================================================
+// 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_MARSHAL_H
+#define _MPW_MARSHAL_H
+
+#include <time.h>
+
+#include "mpw-algorithm.h"
+
+//// Types.
+
+typedef mpw_enum( unsigned int, MPMarshalFormat ) {
+    /** Do not marshal. */
+            MPMarshalFormatNone,
+    /** Marshal using the line-based plain-text format. */
+            MPMarshalFormatFlat,
+    /** Marshal using the JSON structured format. */
+            MPMarshalFormatJSON,
+
+#if MPW_JSON
+    MPMarshalFormatDefault = MPMarshalFormatJSON,
+#else
+    MPMarshalFormatDefault = MPMarshalFormatFlat,
+#endif
+};
+
+typedef mpw_enum( unsigned int, MPMarshalErrorType ) {
+    /** The marshalling operation completed successfully. */
+            MPMarshalSuccess,
+    /** An error in the structure of the marshall file interrupted marshalling. */
+            MPMarshalErrorStructure,
+    /** The marshall file uses an unsupported format version. */
+            MPMarshalErrorFormat,
+    /** A required value is missing or not specified. */
+            MPMarshalErrorMissing,
+    /** The given master password is not valid. */
+            MPMarshalErrorMasterPassword,
+    /** An illegal value was specified. */
+            MPMarshalErrorIllegal,
+    /** An internal system error interrupted marshalling. */
+            MPMarshalErrorInternal,
+};
+typedef struct MPMarshalError {
+    MPMarshalErrorType type;
+    const char *description;
+} MPMarshalError;
+
+typedef struct MPMarshalledQuestion {
+    const char *keyword;
+    const char *content;
+    MPResultType type;
+} MPMarshalledQuestion;
+
+typedef struct MPMarshalledSite {
+    const char *name;
+    const char *content;
+    MPResultType type;
+    MPCounterValue counter;
+    MPAlgorithmVersion algorithm;
+
+    const char *loginContent;
+    MPResultType loginType;
+
+    const char *url;
+    unsigned int uses;
+    time_t lastUsed;
+
+    size_t questions_count;
+    MPMarshalledQuestion *questions;
+} MPMarshalledSite;
+
+typedef struct MPMarshalledUser {
+    const char *fullName;
+    const char *masterPassword;
+    MPAlgorithmVersion algorithm;
+    bool redacted;
+
+    unsigned int avatar;
+    MPResultType defaultType;
+    time_t lastUsed;
+
+    size_t sites_count;
+    MPMarshalledSite *sites;
+} MPMarshalledUser;
+
+typedef struct MPMarshalInfo {
+    MPMarshalFormat format;
+    MPAlgorithmVersion algorithm;
+    const char *fullName;
+    const char *keyID;
+    bool redacted;
+    time_t date;
+} MPMarshalInfo;
+
+//// Marshalling.
+
+/** Write the user and all associated data out to the given output buffer using the given marshalling format. */
+bool mpw_marshal_write(
+        char **out, const MPMarshalFormat outFormat, const MPMarshalledUser *user, MPMarshalError *error);
+/** Try to read metadata on the sites in the input buffer. */
+MPMarshalInfo *mpw_marshal_read_info(
+        const char *in);
+/** Unmarshall sites in the given input buffer by parsing it using the given marshalling format. */
+MPMarshalledUser *mpw_marshal_read(
+        const char *in, const MPMarshalFormat inFormat, const char *masterPassword, MPMarshalError *error);
+
+//// Utilities.
+
+/** Create a new user object ready for marshalling. */
+MPMarshalledUser *mpw_marshal_user(
+        const char *fullName, const char *masterPassword, const MPAlgorithmVersion algorithmVersion);
+/** Create a new site attached to the given user object, ready for marshalling. */
+MPMarshalledSite *mpw_marshal_site(
+        MPMarshalledUser *user,
+        const char *siteName, const MPResultType resultType, const MPCounterValue siteCounter, const MPAlgorithmVersion algorithmVersion);
+/** Create a new question attached to the given site object, ready for marshalling. */
+MPMarshalledQuestion *mpw_marshal_question(
+        MPMarshalledSite *site, const char *keyword);
+/** Free the given user object and all associated data. */
+bool mpw_marshal_info_free(
+        MPMarshalInfo **info);
+bool mpw_marshal_free(
+        MPMarshalledUser **user);
+
+//// Format.
+
+/**
+ * @return The purpose represented by the given name.
+ */
+const MPMarshalFormat mpw_formatWithName(
+        const char *formatName);
+/**
+ * @return The standard name for the given purpose.
+ */
+const char *mpw_nameForFormat(
+        const MPMarshalFormat format);
+/**
+ * @return The file extension that's recommended for files that use the given marshalling format.
+ */
+const char *mpw_marshal_format_extension(
+        const MPMarshalFormat format);
+
+#endif // _MPW_MARSHAL_H

core/c/mpw-types.c

@@ -16,30 +16,19 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
+#include <string.h>
+#include <ctype.h>
+
 #include "mpw-types.h"
 #include "mpw-util.h"
 
-MP_LIBS_BEGIN
-#include <string.h>
-#include <ctype.h>
-MP_LIBS_END
-
 const size_t MPMasterKeySize = 64;
 const size_t MPSiteKeySize = 256 / 8; // Size of HMAC-SHA-256
-const MPIdenticon MPIdenticonUnset = {
-        .leftArm = "",
-        .body = "",
-        .rightArm = "",
-        .accessory = "",
-        .color = MPIdenticonColorUnset,
-};
 
-const MPResultType mpw_type_named(const char *typeName) {
+const MPResultType mpw_typeWithName(const char *typeName) {
 
     // Find what password type is represented by the type letter.
     if (strlen( typeName ) == 1) {
-        if ('0' == typeName[0])
-            return MPResultTypeNone;
         if ('x' == typeName[0])
             return MPResultTypeTemplateMaximum;
         if ('l' == typeName[0])
@@ -64,75 +53,44 @@ const MPResultType mpw_type_named(const char *typeName) {
             return MPResultTypeDeriveKey;
     }
 
+    // Lower-case typeName to standardize it.
+    size_t stdTypeNameSize = strlen( typeName );
+    char stdTypeName[stdTypeNameSize + 1];
+    for (size_t c = 0; c < stdTypeNameSize; ++c)
+        stdTypeName[c] = (char)tolower( typeName[c] );
+    stdTypeName[stdTypeNameSize] = '\0';
+
     // Find what password type is represented by the type name.
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeNone ), typeName, strlen( typeName ) ) == OK)
-        return MPResultTypeNone;
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplateMaximum ), typeName, strlen( typeName ) ) == OK)
+    if (strncmp( mpw_nameForType( MPResultTypeTemplateMaximum ), stdTypeName, strlen( stdTypeName ) ) == 0)
         return MPResultTypeTemplateMaximum;
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplateLong ), typeName, strlen( typeName ) ) == OK)
+    if (strncmp( mpw_nameForType( MPResultTypeTemplateLong ), stdTypeName, strlen( stdTypeName ) ) == 0)
         return MPResultTypeTemplateLong;
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplateMedium ), typeName, strlen( typeName ) ) == OK)
+    if (strncmp( mpw_nameForType( MPResultTypeTemplateMedium ), stdTypeName, strlen( stdTypeName ) ) == 0)
         return MPResultTypeTemplateMedium;
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplateBasic ), typeName, strlen( typeName ) ) == OK)
+    if (strncmp( mpw_nameForType( MPResultTypeTemplateBasic ), stdTypeName, strlen( stdTypeName ) ) == 0)
         return MPResultTypeTemplateBasic;
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplateShort ), typeName, strlen( typeName ) ) == OK)
+    if (strncmp( mpw_nameForType( MPResultTypeTemplateShort ), stdTypeName, strlen( stdTypeName ) ) == 0)
         return MPResultTypeTemplateShort;
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplatePIN ), typeName, strlen( typeName ) ) == OK)
+    if (strncmp( mpw_nameForType( MPResultTypeTemplatePIN ), stdTypeName, strlen( stdTypeName ) ) == 0)
         return MPResultTypeTemplatePIN;
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplateName ), typeName, strlen( typeName ) ) == OK)
+    if (strncmp( mpw_nameForType( MPResultTypeTemplateName ), stdTypeName, strlen( stdTypeName ) ) == 0)
         return MPResultTypeTemplateName;
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeTemplatePhrase ), typeName, strlen( typeName ) ) == OK)
+    if (strncmp( mpw_nameForType( MPResultTypeTemplatePhrase ), stdTypeName, strlen( stdTypeName ) ) == 0)
         return MPResultTypeTemplatePhrase;
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeStatefulPersonal ), typeName, strlen( typeName ) ) == OK)
+    if (strncmp( mpw_nameForType( MPResultTypeStatefulPersonal ), stdTypeName, strlen( stdTypeName ) ) == 0)
         return MPResultTypeStatefulPersonal;
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeStatefulDevice ), typeName, strlen( typeName ) ) == OK)
+    if (strncmp( mpw_nameForType( MPResultTypeStatefulDevice ), stdTypeName, strlen( stdTypeName ) ) == 0)
         return MPResultTypeStatefulDevice;
-    if (mpw_strncasecmp( mpw_type_short_name( MPResultTypeDeriveKey ), typeName, strlen( typeName ) ) == OK)
+    if (strncmp( mpw_nameForType( MPResultTypeDeriveKey ), stdTypeName, strlen( stdTypeName ) ) == 0)
         return MPResultTypeDeriveKey;
 
-    dbg( "Not a generated type name: %s", typeName );
+    dbg( "Not a generated type name: %s", stdTypeName );
     return (MPResultType)ERR;
 }
 
-const char *mpw_type_abbreviation(const MPResultType resultType) {
+const char *mpw_nameForType(MPResultType resultType) {
 
     switch (resultType) {
-        case MPResultTypeNone:
-            return "no";
-        case MPResultTypeTemplateMaximum:
-            return "max";
-        case MPResultTypeTemplateLong:
-            return "long";
-        case MPResultTypeTemplateMedium:
-            return "med";
-        case MPResultTypeTemplateBasic:
-            return "basic";
-        case MPResultTypeTemplateShort:
-            return "short";
-        case MPResultTypeTemplatePIN:
-            return "pin";
-        case MPResultTypeTemplateName:
-            return "name";
-        case MPResultTypeTemplatePhrase:
-            return "phrase";
-        case MPResultTypeStatefulPersonal:
-            return "own";
-        case MPResultTypeStatefulDevice:
-            return "device";
-        case MPResultTypeDeriveKey:
-            return "key";
-        default: {
-            dbg( "Unknown password type: %d", resultType );
-            return NULL;
-        }
-    }
-}
-
-const char *mpw_type_short_name(const MPResultType resultType) {
-
-    switch (resultType) {
-        case MPResultTypeNone:
-            return "none";
         case MPResultTypeTemplateMaximum:
             return "maximum";
         case MPResultTypeTemplateLong:
@@ -162,41 +120,7 @@ const char *mpw_type_short_name(const MPResultType resultType) {
     }
 }
 
-const char *mpw_type_long_name(const MPResultType resultType) {
-
-    switch (resultType) {
-        case MPResultTypeNone:
-            return "None";
-        case MPResultTypeTemplateMaximum:
-            return "Maximum Security Password";
-        case MPResultTypeTemplateLong:
-            return "Long Password";
-        case MPResultTypeTemplateMedium:
-            return "Medium Password";
-        case MPResultTypeTemplateBasic:
-            return "Basic Password";
-        case MPResultTypeTemplateShort:
-            return "Short Password";
-        case MPResultTypeTemplatePIN:
-            return "PIN";
-        case MPResultTypeTemplateName:
-            return "Name";
-        case MPResultTypeTemplatePhrase:
-            return "Phrase";
-        case MPResultTypeStatefulPersonal:
-            return "Personal Password";
-        case MPResultTypeStatefulDevice:
-            return "Device Private Password";
-        case MPResultTypeDeriveKey:
-            return "Crypto Key";
-        default: {
-            dbg( "Unknown password type: %d", resultType );
-            return NULL;
-        }
-    }
-}
-
-const char **mpw_type_templates(const MPResultType type, size_t *count) {
+const char **mpw_templatesForType(MPResultType type, size_t *count) {
 
     if (!(type & MPResultTypeClassTemplate)) {
         dbg( "Not a generated type: %d", type );
@@ -205,35 +129,35 @@ const char **mpw_type_templates(const MPResultType type, size_t *count) {
 
     switch (type) {
         case MPResultTypeTemplateMaximum:
-            return mpw_strings( count,
-                    "anoxxxxxxxxxxxxxxxxx", "axxxxxxxxxxxxxxxxxno", NULL );
+            return mpw_alloc_array( count, const char *,
+                    "anoxxxxxxxxxxxxxxxxx", "axxxxxxxxxxxxxxxxxno" );
         case MPResultTypeTemplateLong:
-            return mpw_strings( count,
+            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", NULL );
+                    "CvccnoCvcvCvcc", "CvccCvcvnoCvcc", "CvccCvcvCvccno" );
         case MPResultTypeTemplateMedium:
-            return mpw_strings( count,
-                    "CvcnoCvc", "CvcCvcno", NULL );
+            return mpw_alloc_array( count, const char *,
+                    "CvcnoCvc", "CvcCvcno" );
         case MPResultTypeTemplateShort:
-            return mpw_strings( count,
-                    "Cvcn", NULL );
+            return mpw_alloc_array( count, const char *,
+                    "Cvcn" );
         case MPResultTypeTemplateBasic:
-            return mpw_strings( count,
-                    "aaanaaan", "aannaaan", "aaannaaa", NULL );
+            return mpw_alloc_array( count, const char *,
+                    "aaanaaan", "aannaaan", "aaannaaa" );
         case MPResultTypeTemplatePIN:
-            return mpw_strings( count,
-                    "nnnn", NULL );
+            return mpw_alloc_array( count, const char *,
+                    "nnnn" );
         case MPResultTypeTemplateName:
-            return mpw_strings( count,
-                    "cvccvcvcv", NULL );
+            return mpw_alloc_array( count, const char *,
+                    "cvccvcvcv" );
         case MPResultTypeTemplatePhrase:
-            return mpw_strings( count,
-                    "cvcc cvc cvccvcv cvc", "cvc cvccvcvcv cvcv", "cv cvccv cvc cvcvccv", NULL );
+            return mpw_alloc_array( count, const char *,
+                    "cvcc cvc cvccvcv cvc", "cvc cvccvcvcv cvcv", "cv cvccv cvc cvcvccv" );
         default: {
             dbg( "Unknown generated type: %d", type );
             return NULL;
@@ -241,30 +165,37 @@ const char **mpw_type_templates(const MPResultType type, size_t *count) {
     }
 }
 
-const char *mpw_type_template(const MPResultType type, const uint8_t templateIndex) {
+const char *mpw_templateForType(MPResultType type, uint8_t templateIndex) {
 
     size_t count = 0;
-    const char **templates = mpw_type_templates( type, &count );
+    const char **templates = mpw_templatesForType( type, &count );
     char const *template = templates && count? templates[templateIndex % count]: NULL;
     free( templates );
 
     return template;
 }
 
-const MPKeyPurpose mpw_purpose_named(const char *purposeName) {
+const MPKeyPurpose mpw_purposeWithName(const char *purposeName) {
 
-    if (mpw_strncasecmp( mpw_purpose_name( MPKeyPurposeAuthentication ), purposeName, strlen( purposeName ) ) == OK)
+    // Lower-case and trim optionally leading "generated" string from typeName to standardize it.
+    size_t stdPurposeNameSize = strlen( purposeName );
+    char stdPurposeName[stdPurposeNameSize + 1];
+    for (size_t c = 0; c < stdPurposeNameSize; ++c)
+        stdPurposeName[c] = (char)tolower( purposeName[c] );
+    stdPurposeName[stdPurposeNameSize] = '\0';
+
+    if (strncmp( mpw_nameForPurpose( MPKeyPurposeAuthentication ), stdPurposeName, strlen( stdPurposeName ) ) == 0)
         return MPKeyPurposeAuthentication;
-    if (mpw_strncasecmp( mpw_purpose_name( MPKeyPurposeIdentification ), purposeName, strlen( purposeName ) ) == OK)
+    if (strncmp( mpw_nameForPurpose( MPKeyPurposeIdentification ), stdPurposeName, strlen( stdPurposeName ) ) == 0)
         return MPKeyPurposeIdentification;
-    if (mpw_strncasecmp( mpw_purpose_name( MPKeyPurposeRecovery ), purposeName, strlen( purposeName ) ) == OK)
+    if (strncmp( mpw_nameForPurpose( MPKeyPurposeRecovery ), stdPurposeName, strlen( stdPurposeName ) ) == 0)
         return MPKeyPurposeRecovery;
 
-    dbg( "Not a purpose name: %s", purposeName );
+    dbg( "Not a purpose name: %s", stdPurposeName );
     return (MPKeyPurpose)ERR;
 }
 
-const char *mpw_purpose_name(const MPKeyPurpose purpose) {
+const char *mpw_nameForPurpose(MPKeyPurpose purpose) {
 
     switch (purpose) {
         case MPKeyPurposeAuthentication:
@@ -280,7 +211,7 @@ const char *mpw_purpose_name(const MPKeyPurpose purpose) {
     }
 }
 
-const char *mpw_purpose_scope(const MPKeyPurpose purpose) {
+const char *mpw_scopeForPurpose(MPKeyPurpose purpose) {
 
     switch (purpose) {
         case MPKeyPurposeAuthentication:
@@ -296,7 +227,7 @@ const char *mpw_purpose_scope(const MPKeyPurpose purpose) {
     }
 }
 
-const char *mpw_class_characters(const char characterClass) {
+const char *mpw_charactersInClass(char characterClass) {
 
     switch (characterClass) {
         case 'V':
@@ -326,10 +257,10 @@ const char *mpw_class_characters(const char characterClass) {
     }
 }
 
-const char mpw_class_character(const char characterClass, const uint8_t seedByte) {
+const char mpw_characterFromClass(char characterClass, uint8_t seedByte) {
 
-    const char *classCharacters = mpw_class_characters( characterClass );
-    if (!classCharacters || !strlen( classCharacters ))
+    const char *classCharacters = mpw_charactersInClass( characterClass );
+    if (!classCharacters)
         return '\0';
 
     return classCharacters[seedByte % strlen( classCharacters )];

core/c/mpw-types.h

@@ -19,17 +19,9 @@
 #ifndef _MPW_TYPES_H
 #define _MPW_TYPES_H
 
-#ifndef MP_LIBS_BEGIN
-#define MP_LIBS_BEGIN
-#define MP_LIBS_END
-#endif
-
-MP_LIBS_BEGIN
-#define __STDC_WANT_LIB_EXT1__ 1
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
-MP_LIBS_END
 
 #ifdef NS_ENUM
 #define mpw_enum(_type, _name) NS_ENUM(_type, _name)
@@ -37,10 +29,8 @@ MP_LIBS_END
 #define mpw_enum(_type, _name) _type _name; enum
 #endif
 
-#ifdef NS_OPTIONS
-#define mpw_opts(_type, _name) NS_OPTIONS(_type, _name)
-#else
-#define mpw_opts(_type, _name) _type _name; enum
+#ifndef __unused
+#define __unused __attribute__((unused))
 #endif
 
 //// Types.
@@ -59,7 +49,7 @@ typedef mpw_enum( uint8_t, MPKeyPurpose ) {
 };
 
 // bit 4 - 9
-typedef mpw_opts( uint16_t, MPResultTypeClass ) {
+typedef mpw_enum( uint16_t, MPResultTypeClass ) {
     /** Use the site key to generate a password from a template. */
             MPResultTypeClassTemplate = 1 << 4,
     /** Use the site key to encrypt and decrypt a stateful entity. */
@@ -69,7 +59,7 @@ typedef mpw_opts( uint16_t, MPResultTypeClass ) {
 };
 
 // bit 10 - 15
-typedef mpw_opts( uint16_t, MPSiteFeature ) {
+typedef mpw_enum( uint16_t, MPSiteFeature ) {
     /** Export the key-protected content data. */
             MPSiteFeatureExportContent = 1 << 10,
     /** Never export content. */
@@ -80,9 +70,6 @@ typedef mpw_opts( uint16_t, MPSiteFeature ) {
 
 // bit 0-3 | MPResultTypeClass | MPSiteFeature
 typedef mpw_enum( uint32_t, MPResultType ) {
-    /** 0: Don't produce a result */
-            MPResultTypeNone = 0,
-
     /** 16: pg^VMAUBk5x3p%HP%i4= */
             MPResultTypeTemplateMaximum = 0x0 | MPResultTypeClassTemplate | 0x0,
     /** 17: BiroYena8:Kixa */
@@ -101,15 +88,14 @@ typedef mpw_enum( uint32_t, MPResultType ) {
             MPResultTypeTemplatePhrase = 0xF | MPResultTypeClassTemplate | 0x0,
 
     /** 1056: Custom saved password. */
-            MPResultTypeStatefulPersonal = 0x0 | MPResultTypeClassStateful | MPSiteFeatureExportContent,
+    MPResultTypeStatefulPersonal = 0x0 | MPResultTypeClassStateful | MPSiteFeatureExportContent,
     /** 2081: Custom saved password that should not be exported from the device. */
-            MPResultTypeStatefulDevice = 0x1 | MPResultTypeClassStateful | MPSiteFeatureDevicePrivate,
+    MPResultTypeStatefulDevice = 0x1 | MPResultTypeClassStateful | MPSiteFeatureDevicePrivate,
 
     /** 4160: Derive a unique binary key. */
-            MPResultTypeDeriveKey = 0x0 | MPResultTypeClassDerive | MPSiteFeatureAlternative,
+    MPResultTypeDeriveKey = 0x0 | MPResultTypeClassDerive | MPSiteFeatureAlternative,
 
-    MPResultTypeDefaultResult = MPResultTypeTemplateLong,
-    MPResultTypeDefaultLogin = MPResultTypeTemplateName,
+    MPResultTypeDefault = MPResultTypeTemplateLong,
 };
 
 typedef mpw_enum ( uint32_t, MPCounterValue ) {
@@ -125,17 +111,16 @@ typedef mpw_enum ( uint32_t, MPCounterValue ) {
 
 /** These colours are compatible with the original ANSI SGR. */
 typedef mpw_enum( uint8_t, MPIdenticonColor ) {
-    MPIdenticonColorUnset,
-    MPIdenticonColorRed,
+    MPIdenticonColorRed = 1,
     MPIdenticonColorGreen,
     MPIdenticonColorYellow,
     MPIdenticonColorBlue,
     MPIdenticonColorMagenta,
     MPIdenticonColorCyan,
-    MPIdenticonColorMono,
+    MPIdenticonColorWhite,
 
     MPIdenticonColorFirst = MPIdenticonColorRed,
-    MPIdenticonColorLast = MPIdenticonColorMono,
+    MPIdenticonColorLast = MPIdenticonColorWhite,
 };
 
 typedef struct {
@@ -145,58 +130,51 @@ typedef struct {
     const char *accessory;
     MPIdenticonColor color;
 } MPIdenticon;
-extern const MPIdenticon MPIdenticonUnset;
 
 //// Type utilities.
 
 /**
- * @return The purpose represented by the given name or ERR if the name does not represent a known purpose.
+ * @return The purpose represented by the given name.
  */
-const MPKeyPurpose mpw_purpose_named(const char *purposeName);
+const MPKeyPurpose mpw_purposeWithName(const char *purposeName);
 /**
- * @return The standard name (static) for the given purpose or NULL if the purpose is not known.
+ * @return The standard name for the given purpose.
  */
-const char *mpw_purpose_name(const MPKeyPurpose purpose);
+const char *mpw_nameForPurpose(MPKeyPurpose purpose);
 /**
- * @return The scope identifier (static) to apply when encoding for the given purpose or NULL if the purpose is not known.
+ * @return An internal string containing the scope identifier to apply when encoding for the given purpose.
  */
-const char *mpw_purpose_scope(const MPKeyPurpose purpose);
+const char *mpw_scopeForPurpose(MPKeyPurpose purpose);
 
 /**
- * @return The password type represented by the given name or ERR if the name does not represent a known type.
+ * @return The password type represented by the given name.
  */
-const MPResultType mpw_type_named(const char *typeName);
+const MPResultType mpw_typeWithName(const char *typeName);
 /**
- * @return The standard identifying name (static) for the given password type or NULL if the type is not known.
+ * @return The standard name for the given password type.
  */
-const char *mpw_type_abbreviation(const MPResultType resultType);
-/**
- * @return The standard identifying name (static) for the given password type or NULL if the type is not known.
- */
-const char *mpw_type_short_name(const MPResultType resultType);
-/**
- * @return The descriptive name (static) for the given password type or NULL if the type is not known.
- */
-const char *mpw_type_long_name(const MPResultType resultType);
+const char *mpw_nameForType(MPResultType resultType);
 
 /**
- * @return An array (allocated, count) of strings (static) that express the templates to use for the given type.
- *         NULL if the type is not known or is not a MPResultTypeClassTemplate.
+ * @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_type_templates(const MPResultType type, size_t *count);
+const char **mpw_templatesForType(MPResultType type, size_t *count);
 /**
- * @return A string (static) that contains the password encoding template of the given type for a seed that starts with the given byte.
- *         NULL if the type is not known or is not a MPResultTypeClassTemplate.
+ * @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_type_template(const MPResultType type, const uint8_t templateIndex);
+const char *mpw_templateForType(MPResultType type, uint8_t templateIndex);
 
 /**
- * @return An string (static) with all the characters in the given character class or NULL if the character class is not known.
+ * @return An internal string that contains all the characters that occur in the given character class.
  */
-const char *mpw_class_characters(const char characterClass);
+const char *mpw_charactersInClass(char characterClass);
 /**
- * @return A character from given character class that encodes the given byte or NUL if the character class is not known or is empty.
+ * @return A character from given character class that encodes the given byte.
  */
-const char mpw_class_character(const char characterClass, const uint8_t seedByte);
+const char mpw_characterFromClass(char characterClass, uint8_t seedByte);
 
 #endif // _MPW_TYPES_H

core/c/mpw-util.c

@@ -16,9 +16,6 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-#include "mpw-util.h"
-
-MP_LIBS_BEGIN
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
@@ -32,121 +29,12 @@ MP_LIBS_BEGIN
 #define AES_ECB 0
 #define AES_CBC 1
 #include "aes.h"
-MP_LIBS_END
 
-LogLevel mpw_verbosity = LogLevelInfo;
-FILE *mpw_log_sink_file_target = NULL;
+#include "mpw-util.h"
 
-static MPLogSink **sinks;
-static size_t sinks_count;
-
-bool mpw_log_sink_register(MPLogSink *sink) {
-
-    if (!mpw_realloc( &sinks, NULL, sizeof( MPLogSink * ) * ++sinks_count )) {
-        --sinks_count;
-        return false;
-    }
-
-    sinks[sinks_count - 1] = sink;
-    return true;
-}
-
-bool mpw_log_sink_unregister(MPLogSink *sink) {
-
-    for (unsigned int r = 0; r < sinks_count; ++r) {
-        if (sinks[r] == sink) {
-            sinks[r] = NULL;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void mpw_log_sink(LogLevel level, const char *file, int line, const char *function, const char *format, ...) {
-
-    if (mpw_verbosity < level)
-        return;
-
-    va_list args;
-    va_start( args, format );
-    mpw_log_vsink( level, file, line, function, format, args );
-    va_end( args );
-}
-
-void mpw_log_vsink(LogLevel level, const char *file, int line, const char *function, const char *format, va_list args) {
-
-    if (mpw_verbosity < level)
-        return;
-
-    return mpw_log_ssink( level, file, line, function, mpw_vstr( format, args ) );
-}
-
-void mpw_log_ssink(LogLevel level, const char *file, int line, const char *function, const char *message) {
-
-    if (mpw_verbosity < level)
-        return;
-
-    MPLogEvent record = (MPLogEvent){
-            .occurrence = time( NULL ),
-            .level = level,
-            .file = file,
-            .line = line,
-            .function = function,
-            .message = message,
-    };
-
-    bool sunk = false;
-    for (unsigned int s = 0; s < sinks_count; ++s) {
-        MPLogSink *sink = sinks[s];
-
-        if (sink)
-            sunk |= sink( &record );
-    }
-    if (!sunk)
-        sunk = mpw_log_sink_file( &record );
-
-    if (record.level <= LogLevelError) {
-        /* error breakpoint */;
-    }
-    if (record.level <= LogLevelFatal)
-        abort();
-}
-
-bool mpw_log_sink_file(const MPLogEvent *record) {
-
-    if (!mpw_log_sink_file_target)
-        mpw_log_sink_file_target = stderr;
-
-    if (mpw_verbosity >= LogLevelDebug) {
-        switch (record->level) {
-            case LogLevelTrace:
-                fprintf( mpw_log_sink_file_target, "[TRC] " );
-                break;
-            case LogLevelDebug:
-                fprintf( mpw_log_sink_file_target, "[DBG] " );
-                break;
-            case LogLevelInfo:
-                fprintf( mpw_log_sink_file_target, "[INF] " );
-                break;
-            case LogLevelWarning:
-                fprintf( mpw_log_sink_file_target, "[WRN] " );
-                break;
-            case LogLevelError:
-                fprintf( mpw_log_sink_file_target, "[ERR] " );
-                break;
-            case LogLevelFatal:
-                fprintf( mpw_log_sink_file_target, "[FTL] " );
-                break;
-            default:
-                fprintf( mpw_log_sink_file_target, "[???] " );
-                break;
-        }
-    }
-
-    fprintf( mpw_log_sink_file_target, "%s\n", record->message );
-    return true;
-}
+#ifdef inf_level
+int mpw_verbosity = inf_level;
+#endif
 
 void mpw_uint16(const uint16_t number, uint8_t buf[2]) {
 
@@ -174,27 +62,6 @@ void mpw_uint64(const uint64_t number, uint8_t buf[8]) {
     buf[7] = (uint8_t)((number >> 0L) & UINT8_MAX);
 }
 
-const char **mpw_strings(size_t *count, const char *strings, ...) {
-
-    va_list args;
-    va_start( args, strings );
-    const char **array = NULL;
-    size_t size = 0;
-    for (const char *string = strings; string; (string = va_arg( args, const char * ))) {
-        size_t cursor = size / sizeof( *array );
-        if (!mpw_realloc( &array, &size, sizeof( string ) )) {
-            mpw_free( &array, size );
-            *count = 0;
-            return NULL;
-        }
-        array[cursor] = string;
-    }
-    va_end( args );
-
-    *count = size / sizeof( *array );
-    return array;
-}
-
 bool mpw_push_buf(uint8_t **buffer, size_t *bufferSize, const void *pushBuffer, const size_t pushSize) {
 
     if (!buffer || !bufferSize || !pushBuffer || !pushSize)
@@ -285,7 +152,7 @@ bool __mpw_free(void **buffer, const size_t bufferSize) {
 
 bool __mpw_free_string(char **string) {
 
-    return string && *string && __mpw_free( (void **)string, strlen( *string ) );
+    return *string && __mpw_free( (void **)string, strlen( *string ) );
 }
 
 bool __mpw_free_strings(char **strings, ...) {
@@ -302,10 +169,10 @@ bool __mpw_free_strings(char **strings, ...) {
     return success;
 }
 
-uint8_t const *mpw_kdf_scrypt(const size_t keySize, const uint8_t *secret, const size_t secretSize, const uint8_t *salt, const size_t saltSize,
-        const uint64_t N, const uint32_t r, const uint32_t p) {
+uint8_t const *mpw_kdf_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 || !secretSize || !saltSize)
+    if (!secret || !salt)
         return NULL;
 
     uint8_t *key = malloc( keySize );
@@ -318,7 +185,7 @@ uint8_t const *mpw_kdf_scrypt(const size_t keySize, const uint8_t *secret, const
         return NULL;
     }
 #elif MPW_SODIUM
-    if (crypto_pwhash_scryptsalsa208sha256_ll( secret, secretSize, salt, saltSize, N, r, p, key, keySize ) != 0) {
+    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;
     }
@@ -401,55 +268,49 @@ uint8_t const *mpw_hash_hmac_sha256(const uint8_t *key, const size_t keySize, co
     return mac;
 }
 
+// We do our best to not fail on odd buf's, eg. non-padded cipher texts.
 static uint8_t const *mpw_aes(bool encrypt, const uint8_t *key, const size_t keySize, const uint8_t *buf, size_t *bufSize) {
 
-    if (!key || keySize < AES_BLOCKLEN || !bufSize || !*bufSize)
+    if (!key || keySize < 16 || !*bufSize)
         return NULL;
 
     // IV = zero
-    static uint8_t *iv = NULL;
-    if (!iv)
-        iv = calloc( AES_BLOCKLEN, sizeof( uint8_t ) );
+    uint8_t iv[16];
+    mpw_zero( iv, sizeof iv );
 
     // Add PKCS#7 padding
-    uint32_t aesSize = ((uint32_t)*bufSize + AES_BLOCKLEN - 1) & -AES_BLOCKLEN; // round up to block size.
-    if (encrypt && !(*bufSize % AES_BLOCKLEN)) // add pad block if plain text fits block size.
-        aesSize += AES_BLOCKLEN;
-    uint8_t *resultBuf = calloc( aesSize, sizeof( uint8_t ) );
-    if (!resultBuf)
-        return NULL;
-    uint8_t *aesBuf = malloc( aesSize );
-    if (!aesBuf) {
-        mpw_free( &resultBuf, aesSize );
-        return NULL;
-    }
-
+    uint32_t aesSize = ((uint32_t)*bufSize + 15 / 16) * 16; // round up to block size.
+    if (encrypt && !(*bufSize % 16)) // add pad block if plain text fits block size.
+        encrypt += 16;
+    uint8_t aesBuf[aesSize];
     memcpy( aesBuf, buf, *bufSize );
-    memset( aesBuf + *bufSize, (int)(aesSize - *bufSize), aesSize - *bufSize );
+    memset( aesBuf + *bufSize, aesSize - *bufSize, aesSize - *bufSize );
+    uint8_t *resultBuf = malloc( aesSize );
 
     if (encrypt)
         AES_CBC_encrypt_buffer( resultBuf, aesBuf, aesSize, key, iv );
     else
         AES_CBC_decrypt_buffer( resultBuf, aesBuf, aesSize, key, iv );
-    mpw_free( &aesBuf, aesSize );
+    mpw_zero( aesBuf, aesSize );
+    mpw_zero( iv, 16 );
 
     // Truncate PKCS#7 padding
     if (encrypt)
         *bufSize = aesSize;
-    else if (resultBuf[aesSize - 1] <= AES_BLOCKLEN)
+    else if (*bufSize % 16 == 0 && resultBuf[aesSize - 1] < 16)
         *bufSize -= resultBuf[aesSize - 1];
 
     return resultBuf;
 }
 
-uint8_t const *mpw_aes_encrypt(const uint8_t *key, const size_t keySize, const uint8_t *plainBuffer, size_t *bufferSize) {
+uint8_t const *mpw_aes_encrypt(const uint8_t *key, const size_t keySize, const uint8_t *plainBuf, size_t *bufSize) {
 
-    return mpw_aes( true, key, keySize, plainBuffer, bufferSize );
+    return mpw_aes( true, key, keySize, plainBuf, bufSize );
 }
 
-uint8_t const *mpw_aes_decrypt(const uint8_t *key, const size_t keySize, const uint8_t *cipherBuffer, size_t *bufferSize) {
+uint8_t const *mpw_aes_decrypt(const uint8_t *key, const size_t keySize, const uint8_t *cipherBuf, size_t *bufSize) {
 
-    return mpw_aes( false, key, keySize, cipherBuffer, bufferSize );
+    return mpw_aes( false, key, keySize, cipherBuf, bufSize );
 }
 
 #if UNUSED
@@ -481,10 +342,10 @@ const char *mpw_hotp(const uint8_t *key, size_t keySize, uint64_t movingFactor,
 }
 #endif
 
-const MPKeyID mpw_id_buf(const void *buf, const size_t length) {
+MPKeyID mpw_id_buf(const void *buf, size_t length) {
 
     if (!buf)
-        return NULL;
+        return "<unset>";
 
 #if MPW_CPERCIVA
     uint8_t hash[32];
@@ -499,16 +360,17 @@ const MPKeyID mpw_id_buf(const void *buf, const size_t length) {
     return mpw_hex( hash, sizeof( hash ) / sizeof( uint8_t ) );
 }
 
-bool mpw_id_buf_equals(MPKeyID id1, MPKeyID id2) {
-
-    if (!id1 || !id2)
-        return !id1 && !id2;
+bool mpw_id_buf_equals(const char *id1, const char *id2) {
 
     size_t size = strlen( id1 );
     if (size != strlen( id2 ))
         return false;
 
-    return mpw_strncasecmp( id1, id2, size ) == OK;
+    for (size_t c = 0; c < size; ++c)
+        if (tolower( id1[c] ) != tolower( id2[c] ))
+            return false;
+
+    return true;
 }
 
 const char *mpw_str(const char *format, ...) {
@@ -523,55 +385,50 @@ const char *mpw_str(const char *format, ...) {
 
 const char *mpw_vstr(const char *format, va_list args) {
 
-    if (!format)
+    // TODO: We should find a way to get rid of this shared storage medium.
+    // TODO: Not thread-safe
+    static char *str_str;
+    static size_t str_str_max;
+    if (!str_str && !(str_str = calloc( str_str_max = 1, sizeof( char ) )))
         return NULL;
 
-    // TODO: shared storage leaks information, has an implicit recursion cap and isn't thread-safe.
-    static char *str_str[10];
-    static size_t str_str_i;
-    str_str_i = (str_str_i + 1) % (sizeof( str_str ) / sizeof( *str_str ));
-
     do {
-        va_list args_copy;
-        va_copy( args_copy, args );
-        // FIXME: size is determined by string length, potentially unsafe if string can be modified.
-        size_t str_size = str_str[str_str_i]? strlen( str_str[str_str_i] ) + 1: 0;
-        size_t str_chars = (size_t)vsnprintf( str_str[str_str_i], str_size, format, args_copy );
-        va_end( args_copy );
+        va_list args_attempt;
+        va_copy( args_attempt, args );
+        size_t len = (size_t)vsnprintf( str_str, str_str_max, format, args_attempt );
+        va_end( args_attempt );
 
-        if (str_chars < 0)
+        if ((int)len < 0)
             return NULL;
-        if (str_chars < str_size)
+        if (len < str_str_max)
             break;
 
-        if (!mpw_realloc( &str_str[str_str_i], NULL, str_chars + 1 ))
+        if (!mpw_realloc( &str_str, &str_str_max, len - str_str_max + 1 ))
             return NULL;
-        memset( str_str[str_str_i], '.', str_chars );
-        str_str[str_str_i][str_chars] = '\0';
     } while (true);
 
-    return str_str[str_str_i];
+    return str_str;
 }
 
-const char *mpw_hex(const void *buf, const size_t length) {
+const char *mpw_hex(const void *buf, size_t length) {
 
-    if (!buf || !length)
-        return NULL;
+    // TODO: We should find a way to get rid of this shared storage medium.
+    // TODO: Not thread-safe
+    static char **mpw_hex_buf;
+    static unsigned int mpw_hex_buf_i;
 
-    // TODO: shared storage leaks information, has an implicit recursion cap and isn't thread-safe.
-    static char *mpw_hex_buf[10];
-    static size_t mpw_hex_buf_i;
-    mpw_hex_buf_i = (mpw_hex_buf_i + 1) % (sizeof( mpw_hex_buf ) / sizeof( *mpw_hex_buf ));
-    if (!mpw_realloc( &mpw_hex_buf[mpw_hex_buf_i], NULL, length * 2 + 1 ))
-        return NULL;
+    if (!mpw_hex_buf)
+        mpw_hex_buf = calloc( 10, sizeof( char * ) );
+    mpw_hex_buf_i = (mpw_hex_buf_i + 1) % 10;
 
-    for (size_t kH = 0; kH < length; kH++)
-        sprintf( &(mpw_hex_buf[mpw_hex_buf_i][kH * 2]), "%02hhX", ((const uint8_t *)buf)[kH] );
+    if (mpw_realloc( &mpw_hex_buf[mpw_hex_buf_i], NULL, 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(const uint32_t number) {
+const char *mpw_hex_l(uint32_t number) {
 
     uint8_t buf[4 /* 32 / 8 */];
     buf[0] = (uint8_t)((number >> 24) & UINT8_MAX);
@@ -581,68 +438,35 @@ const char *mpw_hex_l(const uint32_t number) {
     return mpw_hex( &buf, sizeof( buf ) );
 }
 
-const uint8_t *mpw_unhex(const char *hex, size_t *length) {
+/**
+* @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 (!hex)
-        return NULL;
-
-    size_t hexLength = strlen( hex );
-    if (hexLength == 0 || hexLength % 2 != 0)
-        return NULL;
-
-    size_t bufLength = hexLength / 2;
-    if (length)
-        *length = bufLength;
-
-    uint8_t *buf = malloc( bufLength );
-    for (size_t b = 0; b < bufLength; ++b)
-        if (sscanf( hex + b * 2, "%02hhX", &buf[b] ) != 1) {
-            mpw_free( &buf, bufLength );
-            return NULL;
-        }
-
-    return buf;
-}
-
-size_t mpw_utf8_charlen(const char *utf8String) {
-
-    if (!utf8String)
+    if (!utf8Byte)
         return 0;
-
-    // Legal UTF-8 byte sequences: <http://www.unicode.org/unicode/uni2errata/UTF-8_Corrigendum.html>
-    unsigned char utf8Char = (unsigned char)*utf8String;
-    if (utf8Char >= 0x00 && utf8Char <= 0x7F)
-        return min( 1, strlen( utf8String ) );
-    if (utf8Char >= 0xC2 && utf8Char <= 0xDF)
-        return min( 2, strlen( utf8String ) );
-    if (utf8Char >= 0xE0 && utf8Char <= 0xEF)
-        return min( 3, strlen( utf8String ) );
-    if (utf8Char >= 0xF0 && utf8Char <= 0xF4)
-        return min( 4, strlen( utf8String ) );
+    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;
 }
 
-size_t mpw_utf8_strchars(const char *utf8String) {
+const size_t mpw_utf8_strlen(const char *utf8String) {
 
-    size_t strchars = 0, charlen;
-    for (char *remaining = (char *)utf8String; remaining && *remaining; remaining += charlen, ++strchars)
-        if (!(charlen = mpw_utf8_charlen( remaining )))
-            return 0;
+    size_t charlen = 0;
+    char *remainingString = (char *)utf8String;
+    for (int charByteSize; (charByteSize = mpw_utf8_sizeof( (unsigned char)*remainingString )); remainingString += charByteSize)
+        ++charlen;
 
-    return strchars;
-}
-
-void *mpw_memdup(const void *src, const size_t len) {
-
-    if (!src)
-        return NULL;
-
-    char *dst = malloc( len );
-    if (dst)
-        memcpy( dst, src, len );
-
-    return dst;
+    return charlen;
 }
 
 char *mpw_strdup(const char *src) {
@@ -651,10 +475,14 @@ char *mpw_strdup(const char *src) {
         return NULL;
 
     size_t len = strlen( src );
-    return mpw_memdup( src, len + 1 );
+    char *dst = malloc( len + 1 );
+    memcpy( dst, src, len );
+    dst[len] = '\0';
+
+    return dst;
 }
 
-char *mpw_strndup(const char *src, const size_t max) {
+char *mpw_strndup(const char *src, size_t max) {
 
     if (!src)
         return NULL;
@@ -662,23 +490,9 @@ char *mpw_strndup(const char *src, const size_t max) {
     size_t len = 0;
     for (; len < max && src[len] != '\0'; ++len);
 
-    char *dst = calloc( len + 1, sizeof( char ) );
-    if (dst)
-        memcpy( dst, src, len );
+    char *dst = malloc( len + 1 );
+    memcpy( dst, src, len );
+    dst[len] = '\0';
 
     return dst;
 }
-
-int mpw_strcasecmp(const char *s1, const char *s2) {
-
-    return mpw_strncasecmp( s1, s2, s1 && s2? min( strlen( s1 ), strlen( s2 ) ): 0 );
-}
-
-int mpw_strncasecmp(const char *s1, const char *s2, size_t max) {
-
-    int cmp = s1 && s2 && max > 0? 0: s1? 1: -1;
-    for (; !cmp && max && max-- > 0 && s1 && s2; ++s1, ++s2)
-        cmp = tolower( (unsigned char)*s1 ) - tolower( (unsigned char)*s2 );
-
-    return cmp;
-}

core/c/mpw-util.h

@@ -0,0 +1,211 @@
+//==============================================================================
+// 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_UTIL_H
+#define _MPW_UTIL_H
+
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "mpw-types.h"
+
+//// Logging.
+extern int mpw_verbosity;
+
+#ifndef mpw_log_do
+#define mpw_log_do(level, format, ...) \
+    fprintf( stderr, format "\n", ##__VA_ARGS__ )
+#endif
+
+#ifndef mpw_log
+#define mpw_log(level, ...) ({ \
+    if (mpw_verbosity >= level) { \
+        mpw_log_do( level, ##__VA_ARGS__ ); \
+    }; })
+#endif
+
+#ifndef trc
+/** Logging internal state. */
+#define trc_level 3
+#define trc(...) mpw_log( trc_level, ##__VA_ARGS__ )
+
+/** Logging state and events interesting when investigating issues. */
+#define dbg_level 2
+#define dbg(...) mpw_log( dbg_level, ##__VA_ARGS__ )
+
+/** User messages. */
+#define inf_level 1
+#define inf(...) mpw_log( inf_level, ##__VA_ARGS__ )
+
+/** Recoverable issues and user suggestions. */
+#define wrn_level 0
+#define wrn(...) mpw_log( wrn_level, ##__VA_ARGS__ )
+
+/** Unrecoverable issues. */
+#define err_level -1
+#define err(...) mpw_log( err_level, ##__VA_ARGS__ )
+
+/** Issues that lead to abortion. */
+#define ftl_level -2
+#define ftl(...) mpw_log( ftl_level, ##__VA_ARGS__ )
+#endif
+
+#ifndef min
+#define min(a, b) ({ \
+    __typeof__ (a) _a = (a); \
+    __typeof__ (b) _b = (b); \
+    _a < _b ? _a : _b; })
+#endif
+#ifndef max
+#define max(a, b) ({ \
+    __typeof__ (a) _a = (a); \
+    __typeof__ (b) _b = (b); \
+    _a > _b ? _a : _b; })
+#endif
+#ifndef ERR
+#define ERR -1
+#endif
+#ifndef OK
+#define OK 0
+#endif
+#ifndef stringify
+#define stringify(s) #s
+#endif
+#ifndef stringify_def
+#define stringify_def(s) stringify(s)
+#endif
+
+//// Buffers and memory.
+
+/** Write a number to a byte buffer using mpw's endianness (big/network endian). */
+void mpw_uint16(const uint16_t number, uint8_t buf[2]);
+void mpw_uint32(const uint32_t number, uint8_t buf[4]);
+void mpw_uint64(const uint64_t number, uint8_t buf[8]);
+
+/** Allocate a new array of _type, assign its element count to _count if not NULL and populate it with the varargs. */
+#define mpw_alloc_array(_count, _type, ...) ({ \
+    _type stackElements[] = { __VA_ARGS__ }; \
+    if (_count) \
+        *_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. */
+bool mpw_push_buf(
+        uint8_t **buffer, size_t *bufferSize, const void *pushBuffer, const size_t pushSize);
+/** Push a string onto a buffer.  reallocs the given buffer and appends the given string. */
+bool mpw_push_string(
+        uint8_t **buffer, size_t *bufferSize, const char *pushString);
+/** Push a string onto another string.  reallocs the target string and appends the source string. */
+bool mpw_string_push(
+        char **string, const char *pushString);
+bool mpw_string_pushf(
+        char **string, const char *pushFormat, ...);
+/** Push an integer onto a buffer.  reallocs the given buffer and appends the given integer. */
+bool mpw_push_int(
+        uint8_t **buffer, size_t *bufferSize, const uint32_t pushInt);
+/** Reallocate the given buffer from the given size by adding the delta size.
+  * On success, the buffer size pointer will be updated to the buffer's new size
+  * and the buffer pointer may be updated to a new memory address.
+  * On failure, the buffer and pointers will remain unaffected.
+  * @param buffer A pointer to the buffer to reallocate.
+  * @param bufferSize A pointer to the buffer's actual size.
+  * @param deltaSize The amount to increase the buffer's size by.
+  * @return true if successful, false if reallocation failed.
+  */
+#define mpw_realloc(buffer, bufferSize, deltaSize) \
+        ({ __typeof__(buffer) _b = buffer; const void *__b = *_b; (void)__b; __mpw_realloc( (const void **)_b, bufferSize, deltaSize ); })
+bool __mpw_realloc(const void **buffer, size_t *bufferSize, const size_t deltaSize);
+void mpw_zero(
+        void *buffer, size_t bufferSize);
+/** Free a buffer after zero'ing its contents, then set the reference to NULL. */
+#define mpw_free(buffer, bufferSize) \
+        ({ __typeof__(buffer) _b = buffer; const void *__b = *_b; (void)__b; __mpw_free( (void **)_b, bufferSize ); })
+bool __mpw_free(
+        void **buffer, size_t bufferSize);
+/** Free a string after zero'ing its contents, then set the reference to NULL. */
+#define mpw_free_string(string) \
+        ({ __typeof__(string) _s = string; const char *__s = *_s; (void)__s; __mpw_free_string( (char **)_s ); })
+bool __mpw_free_string(
+        char **string);
+/** Free strings after zero'ing their contents, then set the references to NULL.  Terminate the va_list with NULL. */
+#define mpw_free_strings(strings, ...) \
+        ({ __typeof__(strings) _s = strings; const char *__s = *_s; (void)__s; __mpw_free_strings( (char **)_s, __VA_ARGS__ ); })
+bool __mpw_free_strings(
+        char **strings, ...);
+
+//// Cryptographic functions.
+
+/** Derive a key from the given secret and salt using the scrypt KDF.
+  * @return A new keySize allocated buffer containing the key. */
+uint8_t const *mpw_kdf_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);
+/** Derive a subkey from the given key using the blake2b KDF.
+  * @return A new keySize allocated buffer containing the key. */
+uint8_t const *mpw_kdf_blake2b(
+        const size_t subkeySize, const uint8_t *key, const size_t keySize,
+        const uint8_t *context, const size_t contextSize, const uint64_t id, const char *personal);
+/** Calculate the MAC for the given message with the given key using SHA256-HMAC.
+  * @return A new 32-byte allocated buffer containing the MAC. */
+uint8_t const *mpw_hash_hmac_sha256(
+        const uint8_t *key, const size_t keySize, const uint8_t *salt, const size_t saltSize);
+/** Encrypt a plainBuf with the given key using AES-128-CBC.
+  * @return A new bufSize allocated buffer containing the cipherBuf. */
+uint8_t const *mpw_aes_encrypt(
+        const uint8_t *key, const size_t keySize, const uint8_t *plainBuf, size_t *bufSize);
+/** Decrypt a cipherBuf with the given key using AES-128-CBC.
+  * @return A new bufSize allocated buffer containing the plainBuf. */
+uint8_t const *mpw_aes_decrypt(
+        const uint8_t *key, const size_t keySize, const uint8_t *cipherBuf, size_t *bufSize);
+/** Calculate an OTP using RFC-4226.
+  * @return A newly allocated string containing exactly `digits` decimal OTP digits. */
+#if UNUSED
+const char *mpw_hotp(
+        const uint8_t *key, size_t keySize, uint64_t movingFactor, uint8_t digits, uint8_t truncationOffset);
+#endif
+
+//// Visualizers.
+
+/** Compose a formatted string.
+  * @return A C-string in a reused buffer, do not free or store it. */
+const char *mpw_str(const char *format, ...);
+const char *mpw_vstr(const char *format, va_list args);
+/** 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. */
+MPKeyID mpw_id_buf(const void *buf, size_t length);
+/** Compare two fingerprints for equality.
+  * @return true if the buffers represent identical fingerprints. */
+bool mpw_id_buf_equals(const char *id1, const char *id2);
+
+//// String utilities.
+
+/** @return The amount of display characters in the given UTF-8 string. */
+const size_t mpw_utf8_strlen(const char *utf8String);
+/** Drop-in for POSIX strdup(3). */
+char *mpw_strdup(const char *src);
+/** Drop-in for POSIX strndup(3). */
+char *mpw_strndup(const char *src, size_t max);
+
+#endif // _MPW_UTIL_H

core/java/algorithm/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id 'java'
+}
+
+description = 'Master Password Algorithm Implementation'
+
+dependencies {
+    compile (group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.6-p11') {
+        exclude( module: 'joda-time' )
+    }
+    compile group: 'com.lyndir.lhunath.opal', name: 'opal-crypto', version: '1.6-p11'
+
+    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,49 @@
+<?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-p11</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>joda-time</groupId>
+                    <artifactId>joda-time</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.lyndir.lhunath.opal</groupId>
+            <artifactId>opal-crypto</artifactId>
+            <version>1.6-p11</version>
+        </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/MPAlgorithm.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.google.common.primitives.UnsignedInteger;
+import com.lyndir.lhunath.opal.system.MessageAuthenticationDigests;
+import com.lyndir.lhunath.opal.system.MessageDigests;
+import java.io.Serializable;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+import javax.annotation.Nullable;
+
+
+/**
+ * @see MPMasterKey.Version
+ */
+public interface MPAlgorithm {
+
+    /**
+     * mpw: validity for the time-based rolling counter.
+     */
+    int mpw_otp_window = 5 * 60 /* s */;
+
+    /**
+     * mpw: Key ID hash.
+     */
+    MessageDigests mpw_hash = MessageDigests.SHA256;
+
+    /**
+     * mpw: Site digest.
+     */
+    MessageAuthenticationDigests mpw_digest = MessageAuthenticationDigests.HmacSHA256;
+
+    /**
+     * mpw: Platform-agnostic byte order.
+     */
+    ByteOrder mpw_byteOrder = ByteOrder.BIG_ENDIAN;
+
+    /**
+     * mpw: Input character encoding.
+     */
+    Charset mpw_charset = Charsets.UTF_8;
+
+    /**
+     * mpw: Master key size (byte).
+     */
+    int mpw_dkLen = 64;
+
+    /**
+     * scrypt: Parallelization parameter.
+     */
+    int scrypt_p = 2;
+
+    /**
+     * scrypt: Memory cost parameter.
+     */
+    int scrypt_r = 8;
+
+    /**
+     * scrypt: CPU cost parameter.
+     */
+    int scrypt_N = 32768;
+
+    MPMasterKey.Version getAlgorithmVersion();
+
+    byte[] masterKey(String fullName, char[] masterPassword);
+
+    byte[] siteKey(byte[] masterKey, String siteName, UnsignedInteger siteCounter, MPKeyPurpose keyPurpose,
+                   @Nullable String keyContext);
+
+    String siteResult(byte[] masterKey, final byte[] siteKey, String siteName, UnsignedInteger siteCounter, MPKeyPurpose keyPurpose,
+                      @Nullable String keyContext, MPResultType resultType, @Nullable String resultParam);
+
+    String sitePasswordFromTemplate(byte[] masterKey, byte[] siteKey, MPResultType resultType, @Nullable String resultParam);
+
+    String sitePasswordFromCrypt(byte[] masterKey, byte[] siteKey, MPResultType resultType, @Nullable String resultParam);
+
+    String sitePasswordFromDerive(byte[] masterKey, byte[] siteKey, MPResultType resultType, @Nullable String resultParam);
+
+    String siteState(byte[] masterKey, final byte[] siteKey, String siteName, UnsignedInteger siteCounter, MPKeyPurpose keyPurpose,
+                     @Nullable String keyContext, MPResultType resultType, String resultParam);
+}

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

@@ -0,0 +1,248 @@
+//==============================================================================
+// 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.masterpassword.MPUtils.*;
+
+import com.google.common.base.*;
+import com.google.common.primitives.Bytes;
+import com.google.common.primitives.UnsignedInteger;
+import com.lambdaworks.crypto.SCrypt;
+import com.lyndir.lhunath.opal.crypto.CryptUtils;
+import com.lyndir.lhunath.opal.system.*;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import com.lyndir.lhunath.opal.system.util.ConversionUtils;
+import java.nio.*;
+import java.security.GeneralSecurityException;
+import java.util.Arrays;
+import javax.annotation.Nullable;
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+
+
+/**
+ * @author lhunath, 2014-08-30
+ * @see MPMasterKey.Version#V0
+ */
+public class MPAlgorithmV0 implements MPAlgorithm {
+
+    protected final Logger logger = Logger.get( getClass() );
+
+    @Override
+    public MPMasterKey.Version getAlgorithmVersion() {
+
+        return MPMasterKey.Version.V0;
+    }
+
+    @Override
+    public byte[] masterKey(final String fullName, final char[] masterPassword) {
+
+        byte[] fullNameBytes       = fullName.getBytes( mpw_charset );
+        byte[] fullNameLengthBytes = bytesForInt( fullName.length() );
+
+        String keyScope = MPKeyPurpose.Authentication.getScope();
+        logger.trc( "keyScope: %s", keyScope );
+
+        // Calculate the master key salt.
+        logger.trc( "masterKeySalt: keyScope=%s | #fullName=%s | fullName=%s",
+                    keyScope, CodeUtils.encodeHex( fullNameLengthBytes ), fullName );
+        byte[] masterKeySalt = Bytes.concat( keyScope.getBytes( mpw_charset ), fullNameLengthBytes, fullNameBytes );
+        logger.trc( "  => masterKeySalt.id: %s", CodeUtils.encodeHex( idForBytes( masterKeySalt ) ) );
+
+        // Calculate the master key.
+        logger.trc( "masterKey: scrypt( masterPassword, masterKeySalt, N=%d, r=%d, p=%d )",
+                    scrypt_N, scrypt_r, scrypt_p );
+        byte[] masterPasswordBytes = bytesForChars( masterPassword );
+        byte[] masterKey           = scrypt( masterKeySalt, masterPasswordBytes );
+        Arrays.fill( masterKeySalt, (byte) 0 );
+        Arrays.fill( masterPasswordBytes, (byte) 0 );
+        logger.trc( "  => masterKey.id: %s", CodeUtils.encodeHex( idForBytes( masterKey ) ) );
+
+        return masterKey;
+    }
+
+    protected byte[] scrypt(final byte[] masterKeySalt, final byte[] mpBytes) {
+        try {
+            //if (isAllowNative())
+            return SCrypt.scrypt( mpBytes, masterKeySalt, scrypt_N, scrypt_r, scrypt_p, mpw_dkLen );
+            //else
+            //    return SCrypt.scryptJ( mpBytes, masterKeySalt, scrypt_N, scrypt_r, scrypt_p, mpw_dkLen );
+        }
+        catch (final GeneralSecurityException e) {
+            throw logger.bug( e );
+        }
+    }
+
+    @Override
+    public byte[] siteKey(final byte[] masterKey, final String siteName, UnsignedInteger siteCounter, final MPKeyPurpose keyPurpose,
+                          @Nullable final String keyContext) {
+
+        String keyScope = keyPurpose.getScope();
+        logger.trc( "keyScope: %s", keyScope );
+
+        // OTP counter value.
+        if (siteCounter.longValue() == 0)
+            siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (mpw_otp_window * 1000)) * mpw_otp_window );
+
+        // Calculate the site seed.
+        byte[] siteNameBytes         = siteName.getBytes( mpw_charset );
+        byte[] siteNameLengthBytes   = bytesForInt( siteName.length() );
+        byte[] siteCounterBytes      = bytesForInt( siteCounter );
+        byte[] keyContextBytes       = ((keyContext == null) || keyContext.isEmpty())? null: keyContext.getBytes( mpw_charset );
+        byte[] keyContextLengthBytes = (keyContextBytes == null)? null: bytesForInt( keyContextBytes.length );
+        logger.trc( "siteSalt: keyScope=%s | #siteName=%s | siteName=%s | siteCounter=%s | #keyContext=%s | keyContext=%s",
+                    keyScope, CodeUtils.encodeHex( siteNameLengthBytes ), siteName, CodeUtils.encodeHex( siteCounterBytes ),
+                    (keyContextLengthBytes == null)? null: CodeUtils.encodeHex( keyContextLengthBytes ), keyContext );
+
+        byte[] sitePasswordInfo = Bytes.concat( keyScope.getBytes( mpw_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes );
+        if (keyContextBytes != null)
+            sitePasswordInfo = Bytes.concat( sitePasswordInfo, keyContextLengthBytes, keyContextBytes );
+        logger.trc( "  => siteSalt.id: %s", CodeUtils.encodeHex( idForBytes( sitePasswordInfo ) ) );
+
+        logger.trc( "siteKey: hmac-sha256( masterKey.id=%s, siteSalt )", CodeUtils.encodeHex( idForBytes( masterKey ) ) );
+        byte[] sitePasswordSeedBytes = mpw_digest.of( masterKey, sitePasswordInfo );
+        logger.trc( "  => siteKey.id: %s", CodeUtils.encodeHex( idForBytes( sitePasswordSeedBytes ) ) );
+
+        return sitePasswordSeedBytes;
+    }
+
+    @Override
+    public String siteResult(final byte[] masterKey, final byte[] siteKey, final String siteName, final UnsignedInteger siteCounter,
+                             final MPKeyPurpose keyPurpose,
+                             @Nullable final String keyContext, final MPResultType resultType, @Nullable final String resultParam) {
+
+        switch (resultType.getTypeClass()) {
+            case Template:
+                return sitePasswordFromTemplate( masterKey, siteKey, resultType, resultParam );
+            case Stateful:
+                return sitePasswordFromCrypt( masterKey, siteKey, resultType, resultParam );
+            case Derive:
+                return sitePasswordFromDerive( masterKey, siteKey, resultType, resultParam );
+        }
+
+        throw logger.bug( "Unsupported result type class: %s", resultType.getTypeClass() );
+    }
+
+    @Override
+    public String sitePasswordFromTemplate(final byte[] masterKey, final byte[] siteKey, final MPResultType resultType,
+                                           @Nullable final String resultParam) {
+
+        int[] _siteKey = new int[siteKey.length];
+        for (int i = 0; i < siteKey.length; ++i) {
+            ByteBuffer buf = ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( mpw_byteOrder );
+            Arrays.fill( buf.array(), (byte) ((siteKey[i] > 0)? 0x00: 0xFF) );
+            buf.position( 2 );
+            buf.put( siteKey[i] ).rewind();
+            _siteKey[i] = buf.getInt() & 0xFFFF;
+        }
+
+        // Determine the template.
+        Preconditions.checkState( _siteKey.length > 0 );
+        int        templateIndex = _siteKey[0];
+        MPTemplate template      = resultType.getTemplateAtRollingIndex( templateIndex );
+        logger.trc( "template: %d => %s", templateIndex, template.getTemplateString() );
+
+        // Encode the password from the seed using the template.
+        StringBuilder password = new StringBuilder( template.length() );
+        for (int i = 0; i < template.length(); ++i) {
+            int                      characterIndex    = _siteKey[i + 1];
+            MPTemplateCharacterClass characterClass    = template.getCharacterClassAtIndex( i );
+            char                     passwordCharacter = characterClass.getCharacterAtRollingIndex( characterIndex );
+            logger.trc( "  - class: %c, index: %5d (0x%2H) => character: %c",
+                        characterClass.getIdentifier(), characterIndex, _siteKey[i + 1], passwordCharacter );
+
+            password.append( passwordCharacter );
+        }
+        logger.trc( "  => password: %s", password );
+
+        return password.toString();
+    }
+
+    @Override
+    public String sitePasswordFromCrypt(final byte[] masterKey, final byte[] siteKey, final MPResultType resultType,
+                                        @Nullable final String resultParam) {
+
+        Preconditions.checkNotNull( resultParam );
+        Preconditions.checkArgument( !resultParam.isEmpty() );
+
+        try {
+            // Base64-decode
+            byte[] cipherBuf = CryptUtils.decodeBase64( resultParam );
+            logger.trc( "b64 decoded: %d bytes = %s", cipherBuf.length, CodeUtils.encodeHex( cipherBuf ) );
+
+            // Decrypt
+            byte[] plainBuf  = CryptUtils.decrypt( cipherBuf, masterKey, true );
+            String plainText = mpw_charset.decode( ByteBuffer.wrap( plainBuf ) ).toString();
+            logger.trc( "decrypted -> plainText: %d bytes = %s = %s", plainBuf.length, plainText, CodeUtils.encodeHex( plainBuf ) );
+
+            return plainText;
+        }
+        catch (final BadPaddingException e) {
+            throw Throwables.propagate( e );
+        }
+    }
+
+    @Override
+    public String sitePasswordFromDerive(final byte[] masterKey, final byte[] siteKey, final MPResultType resultType,
+                                         @Nullable final String resultParam) {
+
+        if (resultType == MPResultType.DeriveKey) {
+            int resultParamInt = ConversionUtils.toIntegerNN( resultParam );
+            if (resultParamInt == 0)
+                resultParamInt = 512;
+            if ((resultParamInt < 128) || (resultParamInt > 512) || ((resultParamInt % 8) != 0))
+                throw logger.bug( "Parameter is not a valid key size (should be 128 - 512): %s", resultParam );
+            int keySize = resultParamInt / 8;
+            logger.trc( "keySize: %d", keySize );
+
+            // Derive key
+            byte[] resultKey = null; // TODO: mpw_kdf_blake2b( keySize, siteKey, MPSiteKeySize, NULL, 0, 0, NULL );
+            if (resultKey == null)
+                throw logger.bug( "Could not derive result key." );
+
+            // Base64-encode
+            String b64Key = Verify.verifyNotNull( CryptUtils.encodeBase64( resultKey ) );
+            logger.trc( "b64 encoded -> key: %s", b64Key );
+
+            return b64Key;
+        } else
+            throw logger.bug( "Unsupported derived password type: %s", resultType );
+    }
+
+    @Override
+    public String siteState(final byte[] masterKey, final byte[] siteKey, final String siteName, final UnsignedInteger siteCounter,
+                            final MPKeyPurpose keyPurpose,
+                            @Nullable final String keyContext, final MPResultType resultType, final String resultParam) {
+
+        try {
+            // Encrypt
+            byte[] cipherBuf = CryptUtils.encrypt( resultParam.getBytes( mpw_charset ), masterKey, true );
+            logger.trc( "cipherBuf: %d bytes = %s", cipherBuf.length, CodeUtils.encodeHex( cipherBuf ) );
+
+            // Base64-encode
+            String cipherText = Verify.verifyNotNull( CryptUtils.encodeBase64( cipherBuf ) );
+            logger.trc( "b64 encoded -> cipherText: %s", cipherText );
+
+            return cipherText;
+        }
+        catch (final IllegalBlockSizeException e) {
+            throw logger.bug( e );
+        }
+    }
+}

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

@@ -0,0 +1,62 @@
+//==============================================================================
+// 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 javax.annotation.Nullable;
+
+
+/**
+ * @see MPMasterKey.Version#V1
+ *
+ * @author lhunath, 2014-08-30
+ */
+public class MPAlgorithmV1 extends MPAlgorithmV0 {
+
+    @Override
+    public MPMasterKey.Version getAlgorithmVersion() {
+
+        return MPMasterKey.Version.V1;
+    }
+
+    @Override
+    public String sitePasswordFromTemplate(final byte[] masterKey, final byte[] siteKey, final MPResultType resultType, @Nullable final String resultParam) {
+
+        // Determine the template.
+        Preconditions.checkState( siteKey.length > 0 );
+        int templateIndex = siteKey[0] & 0xFF; // Convert to unsigned int.
+        MPTemplate template = resultType.getTemplateAtRollingIndex( templateIndex );
+        logger.trc( "template: %d => %s", templateIndex, template.getTemplateString() );
+
+        // Encode the password from the seed using the template.
+        StringBuilder password = new StringBuilder( template.length() );
+        for (int i = 0; i < template.length(); ++i) {
+            int characterIndex = siteKey[i + 1] & 0xFF; // Convert to unsigned int.
+            MPTemplateCharacterClass characterClass = template.getCharacterClassAtIndex( i );
+            char passwordCharacter = characterClass.getCharacterAtRollingIndex( characterIndex );
+            logger.trc( "  - class: %c, index: %3d (0x%2H) => character: %c",
+                        characterClass.getIdentifier(), characterIndex, siteKey[i + 1], passwordCharacter );
+
+            password.append( passwordCharacter );
+        }
+        logger.trc( "  => password: %s", password );
+
+        return password.toString();
+    }
+}

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

@@ -0,0 +1,74 @@
+//==============================================================================
+// 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.masterpassword.MPUtils.*;
+
+import com.google.common.primitives.Bytes;
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.lhunath.opal.system.CodeUtils;
+import javax.annotation.Nullable;
+
+
+/**
+ * @see MPMasterKey.Version#V2
+ * 
+ * @author lhunath, 2014-08-30
+ */
+public class MPAlgorithmV2 extends MPAlgorithmV1 {
+
+    @Override
+    public MPMasterKey.Version getAlgorithmVersion() {
+
+        return MPMasterKey.Version.V2;
+    }
+
+    @Override
+    public byte[] siteKey(final byte[] masterKey, final String siteName, UnsignedInteger siteCounter, final MPKeyPurpose keyPurpose,
+                             @Nullable final String keyContext) {
+
+        String keyScope = keyPurpose.getScope();
+        logger.trc( "keyScope: %s", keyScope );
+
+        // OTP counter value.
+        if (siteCounter.longValue() == 0)
+            siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (MPAlgorithm.mpw_otp_window * 1000)) * MPAlgorithm.mpw_otp_window );
+
+        // Calculate the site seed.
+        byte[] siteNameBytes = siteName.getBytes( MPAlgorithm.mpw_charset );
+        byte[] siteNameLengthBytes = bytesForInt( siteNameBytes.length );
+        byte[] siteCounterBytes = bytesForInt( siteCounter );
+        byte[] keyContextBytes = ((keyContext == null) || keyContext.isEmpty())? null: keyContext.getBytes( MPAlgorithm.mpw_charset );
+        byte[] keyContextLengthBytes = (keyContextBytes == null)? null: bytesForInt( keyContextBytes.length );
+        logger.trc( "siteSalt: keyScope=%s | #siteName=%s | siteName=%s | siteCounter=%s | #keyContext=%s | keyContext=%s",
+                    keyScope, CodeUtils.encodeHex( siteNameLengthBytes ), siteName, CodeUtils.encodeHex( siteCounterBytes ),
+                    (keyContextLengthBytes == null)? null: CodeUtils.encodeHex( keyContextLengthBytes ), keyContext );
+
+        byte[] sitePasswordInfo = Bytes.concat( keyScope.getBytes( MPAlgorithm.mpw_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes );
+        if (keyContextBytes != null)
+            sitePasswordInfo = Bytes.concat( sitePasswordInfo, keyContextLengthBytes, keyContextBytes );
+        logger.trc( "  => siteSalt.id: %s", CodeUtils.encodeHex( idForBytes( sitePasswordInfo ) ) );
+
+        logger.trc( "siteKey: hmac-sha256( masterKey.id=%s, siteSalt )", CodeUtils.encodeHex( idForBytes( masterKey ) ) );
+        byte[] sitePasswordSeedBytes = MPAlgorithm.mpw_digest.of( masterKey, sitePasswordInfo );
+        logger.trc( "  => siteKey.id: %s", CodeUtils.encodeHex( idForBytes( sitePasswordSeedBytes ) ) );
+
+        return sitePasswordSeedBytes;
+    }
+}

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

@@ -0,0 +1,67 @@
+//==============================================================================
+// 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.masterpassword.MPUtils.*;
+
+import com.google.common.primitives.Bytes;
+import com.lyndir.lhunath.opal.system.CodeUtils;
+import java.util.Arrays;
+
+
+/**
+ * @see MPMasterKey.Version#V3
+ *
+ * @author lhunath, 2014-08-30
+ */
+public class MPAlgorithmV3 extends MPAlgorithmV2 {
+
+    @Override
+    public MPMasterKey.Version getAlgorithmVersion() {
+
+        return MPMasterKey.Version.V3;
+    }
+
+    @Override
+    public byte[] masterKey(final String fullName, final char[] masterPassword) {
+
+        byte[] fullNameBytes = fullName.getBytes( MPAlgorithm.mpw_charset );
+        byte[] fullNameLengthBytes = MPUtils.bytesForInt( fullNameBytes.length );
+
+        String keyScope = MPKeyPurpose.Authentication.getScope();
+        logger.trc( "keyScope: %s", keyScope );
+
+        // Calculate the master key salt.
+        logger.trc( "masterKeySalt: keyScope=%s | #fullName=%s | fullName=%s",
+                    keyScope, CodeUtils.encodeHex( fullNameLengthBytes ), fullName );
+        byte[] masterKeySalt = Bytes.concat( keyScope.getBytes( MPAlgorithm.mpw_charset ), fullNameLengthBytes, fullNameBytes );
+        logger.trc( "  => masterKeySalt.id: %s", CodeUtils.encodeHex( idForBytes( masterKeySalt ) ) );
+
+        // Calculate the master key.
+        logger.trc( "masterKey: scrypt( masterPassword, masterKeySalt, N=%d, r=%d, p=%d )",
+                    MPAlgorithm.scrypt_N, MPAlgorithm.scrypt_r, MPAlgorithm.scrypt_p );
+        byte[] mpBytes = bytesForChars( masterPassword );
+        byte[] masterKey = scrypt( masterKeySalt, mpBytes );
+        Arrays.fill( masterKeySalt, (byte) 0 );
+        Arrays.fill( mpBytes, (byte) 0 );
+        logger.trc( "  => masterKey.id: %s", CodeUtils.encodeHex( idForBytes( masterKey ) ) );
+
+        return masterKey;
+    }
+}

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

@@ -16,7 +16,7 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-package com.lyndir.masterpassword.model;
+package com.lyndir.masterpassword;
 
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
@@ -25,15 +25,14 @@ import org.joda.time.format.ISODateTimeFormat;
 /**
  * @author lhunath, 2016-10-29
  */
-public final class MPModelConstants {
+public final class MPConstant {
 
     /* Environment */
 
     /**
      * mpw: default path to look for run configuration files if the platform default is not desired.
      */
-    public static final String env_rcDir = "MPW_RCDIR";
-
+    public static final String env_rcDir        = "MPW_RCDIR";
     /**
      * mpw: permit automatic update checks.
      */
@@ -41,5 +40,7 @@ public final class MPModelConstants {
 
     /* Algorithm */
 
-    public static final DateTimeFormatter dateTimeFormatter = ISODateTimeFormat.dateTimeNoMillis().withZoneUTC();
+    public static final int MS_PER_S = 1000;
+
+    public static final DateTimeFormatter dateTimeFormatter = ISODateTimeFormat.dateTimeNoMillis();
 }

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/MPInvalidatedException.java

@@ -19,9 +19,7 @@
 package com.lyndir.masterpassword;
 
 /**
- * @author lhunath, 2018-06-10
+ * @author lhunath, 2017-09-21
  */
-public class MPConstants {
-
-    public static final int MS_PER_S = 1000;
+public class MPInvalidatedException extends Exception {
 }

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

@@ -18,8 +18,6 @@
 
 package com.lyndir.masterpassword;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
 import com.lyndir.lhunath.opal.system.logging.Logger;
 import java.util.Locale;
 import javax.annotation.Nullable;
@@ -35,12 +33,10 @@ public enum MPKeyPurpose {
      * Generate a key for authentication.
      */
     Authentication( "authentication", "Generate a key for authentication.", "com.lyndir.masterpassword" ),
-
     /**
      * Generate a name for identification.
      */
     Identification( "identification", "Generate a name for identification.", "com.lyndir.masterpassword.login" ),
-
     /**
      * Generate a recovery token.
      */
@@ -89,13 +85,11 @@ public enum MPKeyPurpose {
         throw logger.bug( "No purpose for name: %s", shortNamePrefix );
     }
 
-    @JsonCreator
     public static MPKeyPurpose forInt(final int keyPurpose) {
 
         return values()[keyPurpose];
     }
 
-    @JsonValue
     public int toInt() {
 
         return ordinal();

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

@@ -0,0 +1,246 @@
+//==============================================================================
+// 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.masterpassword.MPUtils.*;
+
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.lhunath.opal.system.CodeUtils;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.util.Arrays;
+import java.util.EnumMap;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
+/**
+ * @author lhunath, 2014-08-30
+ */
+public class MPMasterKey {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MPMasterKey.class );
+
+    private final EnumMap<Version, byte[]> keyByVersion = new EnumMap<>( Version.class );
+    private final String fullName;
+    private final char[] masterPassword;
+
+    private boolean invalidated;
+
+    /**
+     * @param masterPassword The characters of the user's master password.  Note: this array is held by reference and its contents
+     *                       invalidated on {@link #invalidate()}.
+     */
+    @SuppressWarnings("AssignmentToCollectionOrArrayFieldFromParameter")
+    public MPMasterKey(final String fullName, final char[] masterPassword) {
+
+        this.fullName = fullName;
+        this.masterPassword = masterPassword;
+    }
+
+    /**
+     * Derive the master key for a user based on their name and master password.
+     *
+     * @throws MPInvalidatedException {@link #invalidate()} has been called on this object.
+     */
+    private byte[] masterKey(final Version algorithmVersion)
+            throws MPInvalidatedException {
+        Preconditions.checkArgument( masterPassword.length > 0 );
+
+        if (invalidated)
+            throw new MPInvalidatedException();
+
+        byte[] key = keyByVersion.get( algorithmVersion );
+        if (key == null) {
+            logger.trc( "-- mpw_masterKey (algorithm: %d)", algorithmVersion.toInt() );
+            logger.trc( "fullName: %s", fullName );
+            logger.trc( "masterPassword.id: %s", CodeUtils.encodeHex( idForBytes( bytesForChars( masterPassword ) ) ) );
+
+            keyByVersion.put( algorithmVersion, key = algorithmVersion.getAlgorithm().masterKey( fullName, masterPassword ) );
+        }
+
+        return key;
+    }
+
+    /**
+     * Derive the master key for a user based on their name and master password.
+     *
+     * @throws MPInvalidatedException {@link #invalidate()} has been called on this object.
+     */
+    private byte[] siteKey(final String siteName, final UnsignedInteger siteCounter, final MPKeyPurpose keyPurpose,
+                           @Nullable final String keyContext, final Version algorithmVersion)
+            throws MPInvalidatedException {
+        Preconditions.checkArgument( !siteName.isEmpty() );
+
+        byte[] masterKey = masterKey( algorithmVersion );
+
+        logger.trc( "-- mpw_siteKey (algorithm: %d)", algorithmVersion.toInt() );
+        logger.trc( "siteName: %s", siteName );
+        logger.trc( "siteCounter: %s", siteCounter );
+        logger.trc( "keyPurpose: %d (%s)", keyPurpose.toInt(), keyPurpose.getShortName() );
+        logger.trc( "keyContext: %s", keyContext );
+
+        return algorithmVersion.getAlgorithm().siteKey( masterKey, siteName, siteCounter, keyPurpose, keyContext );
+    }
+
+    /**
+     * Generate a site result token.
+     *
+     * @param siteName    A site identifier.
+     * @param siteCounter The result identifier.
+     * @param keyPurpose  The intended purpose for this site result.
+     * @param keyContext  A site-scoped result modifier.
+     * @param resultType  The type of result to generate.
+     * @param resultParam A parameter for the resultType.  For stateful result types, the output of
+     *                    {@link #siteState(String, UnsignedInteger, MPKeyPurpose, String, MPResultType, String, Version)}.
+     *
+     * @throws MPInvalidatedException {@link #invalidate()} has been called on this object.
+     */
+    public String siteResult(final String siteName, final UnsignedInteger siteCounter, final MPKeyPurpose keyPurpose,
+                             @Nullable final String keyContext, final MPResultType resultType, @Nullable final String resultParam,
+                             final Version algorithmVersion)
+            throws MPInvalidatedException {
+
+        byte[] masterKey = masterKey( algorithmVersion );
+        byte[] siteKey = siteKey( siteName, siteCounter, keyPurpose, keyContext, algorithmVersion );
+
+        logger.trc( "-- mpw_siteResult (algorithm: %d)", algorithmVersion.toInt() );
+        logger.trc( "resultType: %d (%s)", resultType.getType(), resultType.getShortName() );
+        logger.trc( "resultParam: %s", resultParam );
+
+        return algorithmVersion.getAlgorithm().siteResult(
+                masterKey, siteKey, siteName, siteCounter, keyPurpose, keyContext, resultType, resultParam );
+    }
+
+    /**
+     * Encrypt a stateful site token for persistence.
+     *
+     * @param siteName    A site identifier.
+     * @param siteCounter The result identifier.
+     * @param keyPurpose  The intended purpose for the site token.
+     * @param keyContext  A site-scoped key modifier.
+     * @param resultType  The type of result token to encrypt.
+     * @param resultParam The result token desired from
+     *                    {@link #siteResult(String, UnsignedInteger, MPKeyPurpose, String, MPResultType, String, Version)}.
+     *
+     * @throws MPInvalidatedException {@link #invalidate()} has been called on this object.
+     */
+    public String siteState(final String siteName, final UnsignedInteger siteCounter, final MPKeyPurpose keyPurpose,
+                            @Nullable final String keyContext, final MPResultType resultType, @Nullable final String resultParam,
+                            final Version algorithmVersion)
+            throws MPInvalidatedException {
+
+        Preconditions.checkNotNull( resultParam );
+        Preconditions.checkArgument( !resultParam.isEmpty() );
+
+        byte[] masterKey = masterKey( algorithmVersion );
+        byte[] siteKey = siteKey( siteName, siteCounter, keyPurpose, keyContext, algorithmVersion );
+
+        logger.trc( "-- mpw_siteState (algorithm: %d)", algorithmVersion.toInt() );
+        logger.trc( "resultType: %d (%s)", resultType.getType(), resultType.getShortName() );
+        logger.trc( "resultParam: %d bytes = %s", resultParam.getBytes( MPAlgorithm.mpw_charset ).length, resultParam );
+
+        return algorithmVersion.getAlgorithm().siteState(
+                masterKey, siteKey, siteName, siteCounter, keyPurpose, keyContext, resultType, resultParam );
+    }
+
+    @Nonnull
+    public String getFullName() {
+
+        return fullName;
+    }
+
+    /**
+     * Calculate an identifier for the master key.
+     *
+     * @throws MPInvalidatedException {@link #invalidate()} has been called on this object.
+     */
+    public byte[] getKeyID(final Version algorithmVersion)
+            throws MPInvalidatedException {
+
+        return idForBytes( masterKey( algorithmVersion ) );
+    }
+
+    /**
+     * Wipe this key's secrets from memory, making the object permanently unusable.
+     */
+    public void invalidate() {
+
+        invalidated = true;
+        for (final byte[] key : keyByVersion.values())
+            Arrays.fill( key, (byte) 0 );
+        Arrays.fill( masterPassword, (char) 0 );
+    }
+
+    /**
+     * The algorithm iterations.
+     */
+    public enum Version {
+
+        /**
+         * bugs:
+         * - does math with chars whose signedness was platform-dependent.
+         * - miscounted the byte-length for multi-byte site names.
+         * - miscounted the byte-length for multi-byte user names.
+         */
+        V0( new MPAlgorithmV0() ),
+
+        /**
+         * bugs:
+         * - miscounted the byte-length for multi-byte site names.
+         * - miscounted the byte-length for multi-byte user names.
+         */
+        V1( new MPAlgorithmV1() ),
+
+        /**
+         * bugs:
+         * - miscounted the byte-length for multi-byte user names.
+         */
+        V2( new MPAlgorithmV2() ),
+
+        /**
+         * bugs:
+         * - no known issues.
+         */
+        V3( new MPAlgorithmV3() );
+
+        public static final Version CURRENT = V3;
+
+        private final MPAlgorithm algorithm;
+
+        Version(final MPAlgorithm algorithm) {
+            this.algorithm = algorithm;
+        }
+
+        public MPAlgorithm getAlgorithm() {
+            return algorithm;
+        }
+
+        public static Version fromInt(final int algorithmVersion) {
+
+            return values()[algorithmVersion];
+        }
+
+        public int toInt() {
+
+            return ordinal();
+        }
+    }
+}

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

@@ -18,13 +18,10 @@
 
 package com.lyndir.masterpassword;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.lyndir.lhunath.opal.system.logging.Logger;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 import javax.annotation.Nullable;
 import org.jetbrains.annotations.Contract;
 
@@ -34,22 +31,21 @@ import org.jetbrains.annotations.Contract;
  *
  * @author lhunath
  */
-@SuppressWarnings({ "RedundantTypeArguments", "SpellCheckingInspection" })
 public enum MPResultType {
     // bit 0-3 | MPResultTypeClass | MPSiteFeature
 
     /**
-     * 16: pg^VMAUBk5x3p%HP%i4=
+     * pg^VMAUBk5x3p%HP%i4=
      */
-    GeneratedMaximum( "maximum", "Maximum Security", "pg^VMAUBk5x3p%HP%i4=", "20 characters, contains symbols", //
+    GeneratedMaximum( "maximum", "20 characters, contains symbols.", //
                       ImmutableList.of( new MPTemplate( "anoxxxxxxxxxxxxxxxxx" ),
                                         new MPTemplate( "axxxxxxxxxxxxxxxxxno" ) ), //
                       MPResultTypeClass.Template, 0x0 ),
 
     /**
-     * 17: BiroYena8:Kixa
+     * BiroYena8:Kixa
      */
-    GeneratedLong( "long", "Long Password", "BiroYena8:Kixa", "Copy-friendly, 14 characters, contains symbols", //
+    GeneratedLong( "long", "Copy-friendly, 14 characters, contains symbols.", //
                    ImmutableList.of( new MPTemplate( "CvcvnoCvcvCvcv" ), new MPTemplate( "CvcvCvcvnoCvcv" ),
                                      new MPTemplate( "CvcvCvcvCvcvno" ), new MPTemplate( "CvccnoCvcvCvcv" ),
                                      new MPTemplate( "CvccCvcvnoCvcv" ), new MPTemplate( "CvccCvcvCvcvno" ),
@@ -64,93 +60,88 @@ public enum MPResultType {
                    MPResultTypeClass.Template, 0x1 ),
 
     /**
-     * 18: BirSuj0-
+     * BirSuj0-
      */
-    GeneratedMedium( "medium", "Medium Password", "BirSuj0-", "Copy-friendly, 8 characters, contains symbols", //
+    GeneratedMedium( "medium", "Copy-friendly, 8 characters, contains symbols.", //
                      ImmutableList.of( new MPTemplate( "CvcnoCvc" ),
                                        new MPTemplate( "CvcCvcno" ) ), //
                      MPResultTypeClass.Template, 0x2 ),
 
     /**
-     * 19: Bir8
+     * pO98MoD0
      */
-    GeneratedShort( "short", "Short Password", "Bir8", "Copy-friendly, 4 characters, no symbols", //
-                    ImmutableList.of( new MPTemplate( "Cvcn" ) ), //
-                    MPResultTypeClass.Template, 0x3 ),
-
-    /**
-     * 20: pO98MoD0
-     */
-    GeneratedBasic( "basic", "Basic Password", "pO98MoD0", "8 characters, no symbols", //
+    GeneratedBasic( "basic", "8 characters, no symbols.", //
                     ImmutableList.of( new MPTemplate( "aaanaaan" ),
                                       new MPTemplate( "aannaaan" ),
                                       new MPTemplate( "aaannaaa" ) ), //
+                    MPResultTypeClass.Template, 0x3 ),
+
+    /**
+     * Bir8
+     */
+    GeneratedShort( "short", "Copy-friendly, 4 characters, no symbols.", //
+                    ImmutableList.of( new MPTemplate( "Cvcn" ) ), //
                     MPResultTypeClass.Template, 0x4 ),
 
     /**
-     * 21: 2798
+     * 2798
      */
-    GeneratedPIN( "pin", "PIN Code", "2798", "4 numbers", //
+    GeneratedPIN( "pin", "4 numbers.", //
                   ImmutableList.of( new MPTemplate( "nnnn" ) ), //
                   MPResultTypeClass.Template, 0x5 ),
 
     /**
-     * 30: birsujano
+     * birsujano
      */
-    GeneratedName( "name", "Name", "birsujano", "9 letter name", //
+    GeneratedName( "name", "9 letter name.", //
                    ImmutableList.of( new MPTemplate( "cvccvcvcv" ) ), //
                    MPResultTypeClass.Template, 0xE ),
 
     /**
-     * 31: bir yennoquce fefi
+     * bir yennoquce fefi
      */
-    GeneratedPhrase( "phrase", "Phrase", "bir yennoquce fefi", "20 character sentence", //
+    GeneratedPhrase( "phrase", "20 character sentence.", //
                      ImmutableList.of( new MPTemplate( "cvcc cvc cvccvcv cvc" ),
                                        new MPTemplate( "cvc cvccvcvcv cvcv" ),
                                        new MPTemplate( "cv cvccv cvc cvcvccv" ) ), //
                      MPResultTypeClass.Template, 0xF ),
 
     /**
-     * 1056: Custom saved value.
+     * Custom saved password.
      */
-    StoredPersonal( "personal", "Saved", null, "AES-encrypted, exportable", //
+    StoredPersonal( "personal", "AES-encrypted, exportable.", //
                     ImmutableList.<MPTemplate>of(), //
                     MPResultTypeClass.Stateful, 0x0, MPSiteFeature.ExportContent ),
 
     /**
-     * 2081: Custom saved value that should not be exported from the device.
+     * Custom saved password that should not be exported from the device.
      */
-    StoredDevicePrivate( "device", "Private", null, "AES-encrypted, not exported", //
+    StoredDevicePrivate( "device", "AES-encrypted, not exported.", //
                          ImmutableList.<MPTemplate>of(), //
                          MPResultTypeClass.Stateful, 0x1, MPSiteFeature.DevicePrivate ),
 
     /**
-     * 4160: Derive a unique binary key.
+     * Derive a unique binary key.
      */
-    DeriveKey( "key", "Binary Key", null, "Encryption key", //
-               ImmutableList.<MPTemplate>of(), //
-               MPResultTypeClass.Derive, 0x0, MPSiteFeature.Alternative );
+    DeriveKey( "key", "Encryption key.", //
+                           ImmutableList.<MPTemplate>of(), //
+                           MPResultTypeClass.Derive, 0x0, MPSiteFeature.Alternative );
+
+    public static final MPResultType DEFAULT = GeneratedLong;
 
     static final Logger logger = Logger.get( MPResultType.class );
 
-    private final String                      shortName;
-    private final String                      longName;
+    private final String             shortName;
+    private final String             description;
+    private final List<MPTemplate>   templates;
+    private final MPResultTypeClass  typeClass;
+    private final int                typeIndex;
+    private final Set<MPSiteFeature> typeFeatures;
 
-    @Nullable
-    private final String                      sample;
-    private final String                      description;
-    private final List<MPTemplate>            templates;
-    private final MPResultTypeClass           typeClass;
-    private final int                         typeIndex;
-    private final ImmutableSet<MPSiteFeature> typeFeatures;
-
-    MPResultType(final String shortName, final String longName, @Nullable final String sample, final String description,
-                 final List<MPTemplate> templates,
+    MPResultType(final String shortName, final String description, final List<MPTemplate> templates,
                  final MPResultTypeClass typeClass, final int typeIndex, final MPSiteFeature... typeFeatures) {
 
         this.shortName = shortName;
-        this.longName = longName;
-        this.sample = sample;
         this.description = description;
         this.templates = templates;
         this.typeClass = typeClass;
@@ -167,15 +158,6 @@ public enum MPResultType {
         return shortName;
     }
 
-    public String getLongName() {
-        return longName;
-    }
-
-    @Nullable
-    public String getSample() {
-        return sample;
-    }
-
     public String getDescription() {
 
         return description;
@@ -186,18 +168,11 @@ public enum MPResultType {
         return typeClass;
     }
 
-    @SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType" /* IDEA-191042 */)
-    public ImmutableSet<MPSiteFeature> getTypeFeatures() {
+    public Set<MPSiteFeature> getTypeFeatures() {
 
         return typeFeatures;
     }
 
-    public boolean supportsTypeFeature(final MPSiteFeature feature) {
-
-        return typeFeatures.contains( feature );
-    }
-
-    @JsonValue
     public int getType() {
         int mask = typeIndex | typeClass.getMask();
         for (final MPSiteFeature typeFeature : typeFeatures)
@@ -245,7 +220,6 @@ public enum MPResultType {
      *
      * @return The type registered with the given type.
      */
-    @JsonCreator
     public static MPResultType forType(final int type) {
 
         for (final MPResultType resultType : values())
@@ -260,7 +234,6 @@ public enum MPResultType {
      *
      * @return All types that support the given mask's class & features.
      */
-    @SuppressWarnings({ "MagicNumber", "UnnecessaryParentheses" /* IDEA-191040 */ })
     public static ImmutableList<MPResultType> forMask(final int mask) {
 
         int typeMask = mask & ~0xF; // Ignore resultType bit 0-3

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/MPUtils.java

@@ -0,0 +1,53 @@
+//==============================================================================
+// 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.UnsignedInteger;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.util.Arrays;
+
+
+/**
+ * @author lhunath, 2017-09-20
+ */
+public final class MPUtils {
+
+    public static byte[] bytesForInt(final int number) {
+        return ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( MPAlgorithm.mpw_byteOrder ).putInt( number ).array();
+    }
+
+    public static byte[] bytesForInt(final UnsignedInteger number) {
+        return ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( MPAlgorithm.mpw_byteOrder ).putInt( number.intValue() ).array();
+    }
+
+    public static byte[] bytesForChars(final char[] characters) {
+        ByteBuffer byteBuffer = MPAlgorithm.mpw_charset.encode( CharBuffer.wrap( characters ) );
+
+        byte[] bytes = new byte[byteBuffer.remaining()];
+        byteBuffer.get( bytes );
+
+        Arrays.fill( byteBuffer.array(), (byte) 0 );
+        return bytes;
+    }
+
+    public static byte[] idForBytes(final byte[] bytes) {
+        return MPAlgorithm.mpw_hash.of( bytes );
+    }
+}

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;
+
+@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/MPFileSite.java

@@ -0,0 +1,205 @@
+//==============================================================================
+// 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.model;
+
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.masterpassword.*;
+import javax.annotation.Nullable;
+import org.joda.time.Instant;
+
+
+/**
+ * @author lhunath, 14-12-05
+ */
+public class MPFileSite extends MPSite {
+
+    private final MPFileUser          user;
+    private       String              siteName;
+    @Nullable
+    private       String              siteContent;
+    private       UnsignedInteger     siteCounter;
+    private       MPResultType        resultType;
+    private       MPMasterKey.Version algorithmVersion;
+
+    @Nullable
+    private String       loginContent;
+    @Nullable
+    private MPResultType loginType;
+
+    @Nullable
+    private String  url;
+    private int     uses;
+    private Instant lastUsed;
+
+    public MPFileSite(final MPFileUser user, final String siteName) {
+        this( user, siteName, DEFAULT_COUNTER, MPResultType.DEFAULT, MPMasterKey.Version.CURRENT );
+    }
+
+    public MPFileSite(final MPFileUser user, final String siteName, final UnsignedInteger siteCounter, final MPResultType resultType,
+                      final MPMasterKey.Version algorithmVersion) {
+        this.user = user;
+        this.siteName = siteName;
+        this.siteCounter = siteCounter;
+        this.resultType = resultType;
+        this.algorithmVersion = algorithmVersion;
+        this.lastUsed = new Instant();
+    }
+
+    protected MPFileSite(final MPFileUser user, final String siteName, @Nullable final String siteContent,
+                         final UnsignedInteger siteCounter,
+                         final MPResultType resultType, final MPMasterKey.Version algorithmVersion,
+                         @Nullable final String loginContent, @Nullable final MPResultType loginType,
+                         @Nullable final String url, final int uses, final Instant lastUsed) {
+        this.user = user;
+        this.siteName = siteName;
+        this.siteContent = siteContent;
+        this.siteCounter = siteCounter;
+        this.resultType = resultType;
+        this.algorithmVersion = algorithmVersion;
+        this.loginContent = loginContent;
+        this.loginType = loginType;
+        this.url = url;
+        this.uses = uses;
+        this.lastUsed = lastUsed;
+    }
+
+    public String resultFor(final MPMasterKey masterKey)
+            throws MPInvalidatedException {
+
+        return resultFor( masterKey, MPKeyPurpose.Authentication, null );
+    }
+
+    public String resultFor(final MPMasterKey masterKey, final MPKeyPurpose keyPurpose, @Nullable final String keyContext)
+            throws MPInvalidatedException {
+
+        return resultFor( masterKey, keyPurpose, keyContext, getSiteContent() );
+    }
+
+    public String loginFor(final MPMasterKey masterKey)
+            throws MPInvalidatedException {
+
+        if (loginType == null)
+            loginType = MPResultType.GeneratedName;
+
+        return loginFor( masterKey, loginType, loginContent );
+    }
+
+    public MPFileUser getUser() {
+        return user;
+    }
+
+    @Override
+    public String getSiteName() {
+        return siteName;
+    }
+
+    @Override
+    public void setSiteName(final String siteName) {
+        this.siteName = siteName;
+    }
+
+    @Nullable
+    public String getSiteContent() {
+        return siteContent;
+    }
+
+    public void setSitePassword(final MPMasterKey masterKey, @Nullable final MPResultType resultType, @Nullable final String result)
+            throws MPInvalidatedException {
+        this.resultType = resultType;
+        if (result == null)
+            this.siteContent = null;
+        else
+            this.siteContent = masterKey.siteState(
+                    getSiteName(), getSiteCounter(), MPKeyPurpose.Authentication, null, getResultType(), result, getAlgorithmVersion() );
+    }
+
+    @Override
+    public UnsignedInteger getSiteCounter() {
+        return siteCounter;
+    }
+
+    @Override
+    public void setSiteCounter(final UnsignedInteger siteCounter) {
+        this.siteCounter = siteCounter;
+    }
+
+    @Override
+    public MPResultType getResultType() {
+        return resultType;
+    }
+
+    @Override
+    public void setResultType(final MPResultType resultType) {
+        this.resultType = resultType;
+    }
+
+    @Override
+    public MPMasterKey.Version getAlgorithmVersion() {
+        return algorithmVersion;
+    }
+
+    @Override
+    public void setAlgorithmVersion(final MPMasterKey.Version algorithmVersion) {
+        this.algorithmVersion = algorithmVersion;
+    }
+
+    @Nullable
+    public MPResultType getLoginType() {
+        return loginType;
+    }
+
+    @Nullable
+    public String getLoginContent() {
+        return loginContent;
+    }
+
+    public void setLoginName(final MPMasterKey masterKey, @Nullable final MPResultType loginType, @Nullable final String result)
+            throws MPInvalidatedException {
+        this.loginType = loginType;
+        if (this.loginType != null)
+            if (result == null)
+                this.loginContent = null;
+            else
+                this.loginContent = masterKey.siteState(
+                        siteName, DEFAULT_COUNTER, MPKeyPurpose.Identification, null, this.loginType, result, algorithmVersion );
+    }
+
+    @Nullable
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(@Nullable final String url) {
+        this.url = url;
+    }
+
+    public int getUses() {
+        return uses;
+    }
+
+    public Instant getLastUsed() {
+        return lastUsed;
+    }
+
+    public void use() {
+        uses++;
+        lastUsed = new Instant();
+        user.use();
+    }
+}

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

@@ -0,0 +1,172 @@
+//==============================================================================
+// 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.model;
+
+import com.google.common.collect.*;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import com.lyndir.masterpassword.*;
+import java.util.*;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.joda.time.*;
+
+
+/**
+ * @author lhunath, 14-12-07
+ */
+public class MPFileUser extends MPUser<MPFileSite> implements Comparable<MPFileUser> {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MPFileUser.class );
+
+    private final String fullName;
+    private final Collection<MPFileSite> sites = Sets.newHashSet();
+
+    @Nullable
+    private byte[]              keyID;
+    private MPMasterKey.Version algorithmVersion;
+
+    private int             avatar;
+    private MPResultType    defaultType;
+    private ReadableInstant lastUsed;
+
+    public MPFileUser(final String fullName) {
+        this( fullName, null, MPMasterKey.Version.CURRENT );
+    }
+
+    public MPFileUser(final String fullName, @Nullable final byte[] keyID, final MPMasterKey.Version algorithmVersion) {
+        this( fullName, keyID, algorithmVersion, 0, MPResultType.DEFAULT, new Instant() );
+    }
+
+    public MPFileUser(final String fullName, @Nullable final byte[] keyID, final MPMasterKey.Version algorithmVersion, final int avatar,
+                      final MPResultType 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;
+    }
+
+    @Override
+    public String getFullName() {
+        return fullName;
+    }
+
+    @Override
+    public MPMasterKey.Version getAlgorithmVersion() {
+        return algorithmVersion;
+    }
+
+    public void setAlgorithmVersion(final MPMasterKey.Version algorithmVersion) {
+        this.algorithmVersion = algorithmVersion;
+    }
+
+    @Override
+    public int getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(final int avatar) {
+        this.avatar = avatar;
+    }
+
+    public MPResultType getDefaultType() {
+        return defaultType;
+    }
+
+    public void setDefaultType(final MPResultType defaultType) {
+        this.defaultType = defaultType;
+    }
+
+    public ReadableInstant getLastUsed() {
+        return lastUsed;
+    }
+
+    public void use() {
+        lastUsed = new Instant();
+    }
+
+    public Iterable<MPFileSite> getSites() {
+        return sites;
+    }
+
+    @Override
+    public void addSite(final MPFileSite site) {
+        sites.add( site );
+    }
+
+    @Override
+    public void deleteSite(final MPFileSite site) {
+        sites.remove( site );
+    }
+
+    @Override
+    public Collection<MPFileSite> findSites(final String query) {
+        ImmutableList.Builder<MPFileSite> results = ImmutableList.builder();
+        for (final MPFileSite site : getSites())
+            if (site.getSiteName().startsWith( query ))
+                results.add( site );
+
+        return results.build();
+    }
+
+    /**
+     * 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 MPIncorrectMasterPasswordException If authentication fails due to the given master password not matching the user's keyID.
+     */
+    @Nonnull
+    @Override
+    public MPMasterKey authenticate(final char[] masterPassword)
+            throws MPIncorrectMasterPasswordException {
+        try {
+            key = new MPMasterKey( getFullName(), masterPassword );
+            if ((keyID == null) || (keyID.length == 0))
+                keyID = key.getKeyID( algorithmVersion );
+            else if (!Arrays.equals( key.getKeyID( algorithmVersion ), keyID ))
+                throw new MPIncorrectMasterPasswordException( this );
+
+            return key;
+        }
+        catch (final MPInvalidatedException e) {
+            throw logger.bug( e );
+        }
+    }
+
+    void save()
+            throws MPInvalidatedException {
+        MPFileUserManager.get().save( this, getMasterKey() );
+    }
+
+    @Override
+    public int compareTo(final MPFileUser o) {
+        int comparison = getLastUsed().compareTo( o.getLastUsed() );
+        if (comparison == 0)
+            comparison = getFullName().compareTo( o.getFullName() );
+
+        return comparison;
+    }
+}

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

@@ -0,0 +1,139 @@
+//==============================================================================
+// 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.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.*;
+import java.io.*;
+import javax.annotation.Nonnull;
+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 MPFileUserManager extends MPUserManager {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MPFileUserManager.class );
+    private static final MPFileUserManager 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 MPFileUserManager get() {
+        MPUserManager.instance = instance;
+        return instance;
+    }
+
+    public static MPFileUserManager create(final File userFilesDirectory) {
+        return new MPFileUserManager( userFilesDirectory );
+    }
+
+    protected MPFileUserManager(final File userFilesDirectory) {
+
+        super( unmarshallUsers( userFilesDirectory ) );
+        this.userFilesDirectory = userFilesDirectory;
+    }
+
+    private static Iterable<MPFileUser> 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, MPFileUser>() {
+            @Nullable
+            @Override
+            public MPFileUser apply(@Nullable final File file) {
+                try {
+                    return new MPFlatUnmarshaller().unmarshall( Preconditions.checkNotNull( file ) );
+                }
+                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 deleteUser(final MPFileUser user) {
+        super.deleteUser( user );
+
+        // Remove deleted users.
+        File userFile = getUserFile( user );
+        if (userFile.exists() && !userFile.delete())
+            logger.err( "Couldn't delete file: %s", userFile );
+    }
+
+    /**
+     * Write the current user state to disk.
+     */
+    public void save(final MPFileUser user, final MPMasterKey masterKey)
+            throws MPInvalidatedException {
+        try {
+            new CharSink() {
+                @Override
+                public Writer openStream()
+                        throws IOException {
+                    return new OutputStreamWriter( new FileOutputStream( getUserFile( user ) ), Charsets.UTF_8 );
+                }
+            }.write( new MPFlatMarshaller().marshall( user, masterKey, MPMarshaller.ContentMode.PROTECTED ) );
+        }
+        catch (final IOException e) {
+            logger.err( e, "Unable to save sites for user: %s", user );
+        }
+    }
+
+    @Nonnull
+    private File getUserFile(final MPFileUser user) {
+        return new File( userFilesDirectory, user.getFullName() + ".mpsites" );
+    }
+
+    /**
+     * @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/MPFlatMarshaller.java

@@ -16,80 +16,65 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-package com.lyndir.masterpassword.model.impl;
+package com.lyndir.masterpassword.model;
 
-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.ObjectUtils.ifNotNullElse;
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
 
-import com.google.common.base.Charsets;
-import com.google.common.io.CharSink;
-import com.lyndir.masterpassword.MPAlgorithmException;
-import com.lyndir.masterpassword.MPKeyUnavailableException;
-import com.lyndir.masterpassword.model.MPModelConstants;
-import java.io.*;
+import com.lyndir.masterpassword.*;
 import org.joda.time.Instant;
 
 
 /**
  * @author lhunath, 2017-09-20
  */
-@SuppressWarnings({ "HardcodedLineSeparator", "MagicCharacter" })
 public class MPFlatMarshaller implements MPMarshaller {
 
     private static final int FORMAT = 1;
 
     @Override
-    public void marshall(final MPFileUser user)
-            throws IOException, MPKeyUnavailableException, MPMarshalException, MPAlgorithmException {
-        if (!user.isComplete())
-            throw new IllegalStateException( "Cannot marshall an incomplete user: " + user );
-
+    public String marshall(final MPFileUser user, final MPMasterKey masterKey, final ContentMode contentMode)
+            throws MPInvalidatedException {
         StringBuilder content = new StringBuilder();
         content.append( "# Master Password site export\n" );
-        content.append( "#     " ).append( user.getContentMode().description() ).append( '\n' );
+        content.append( "#     " ).append( contentMode.description() ).append( '\n' );
         content.append( "# \n" );
         content.append( "##\n" );
         content.append( "# Format: " ).append( FORMAT ).append( '\n' );
-        content.append( "# Date: " ).append( MPModelConstants.dateTimeFormatter.print( new Instant() ) ).append( '\n' );
+        content.append( "# Date: " ).append( MPConstant.dateTimeFormatter.print( new Instant() ) ).append( '\n' );
         content.append( "# User Name: " ).append( user.getFullName() ).append( '\n' );
         content.append( "# Full Name: " ).append( user.getFullName() ).append( '\n' );
         content.append( "# Avatar: " ).append( user.getAvatar() ).append( '\n' );
-        content.append( "# Key ID: " ).append( user.getKeyID() ).append( '\n' );
-        content.append( "# Algorithm: " ).append( user.getAlgorithm().version().toInt() ).append( '\n' );
-        content.append( "# Default Type: " ).append( user.getPreferences().getDefaultType().getType() ).append( '\n' );
-        content.append( "# Passwords: " ).append( user.getContentMode().name() ).append( '\n' );
+        content.append( "# Key ID: " ).append( user.exportKeyID() ).append( '\n' );
+        content.append( "# Algorithm: " ).append( MPMasterKey.Version.CURRENT.toInt() ).append( '\n' );
+        content.append( "# Default Type: " ).append( user.getDefaultType().getType() ).append( '\n' );
+        content.append( "# Passwords: " ).append( contentMode.name() ).append( '\n' );
         content.append( "##\n" );
         content.append( "#\n" );
         content.append( "#               Last     Times  Password                      Login\t                     Site\tSite\n" );
         content.append( "#               used      used      type                       name\t                     name\tpassword\n" );
 
         for (final MPFileSite site : user.getSites()) {
-            String loginName = site.getLoginState();
-            String password  = site.getResultState();
-            if (!user.getContentMode().isRedacted()) {
-                loginName = site.getLogin();
-                password = site.getResult();
+            String loginName = site.getLoginContent();
+            String password = site.getSiteContent();
+            if (!contentMode.isRedacted()) {
+                loginName = site.loginFor( masterKey );
+                password = site.resultFor( masterKey );
             }
 
             content.append( strf( "%s  %8d  %8s  %25s\t%25s\t%s\n", //
-                                  MPModelConstants.dateTimeFormatter.print( site.getLastUsed() ), // lastUsed
+                                  MPConstant.dateTimeFormatter.print( site.getLastUsed() ), // lastUsed
                                   site.getUses(), // uses
                                   strf( "%d:%d:%d", //
                                         site.getResultType().getType(), // type
-                                        site.getAlgorithm().version().toInt(), // algorithm
-                                        site.getCounter().intValue() ), // counter
+                                        site.getAlgorithmVersion().toInt(), // algorithm
+                                        site.getSiteCounter().intValue() ), // counter
                                   ifNotNullElse( loginName, "" ), // loginName
                                   site.getSiteName(), // siteName
                                   ifNotNullElse( password, "" ) // password
             ) );
         }
 
-        new CharSink() {
-            @Override
-            public Writer openStream()
-                    throws IOException {
-                return new OutputStreamWriter( new FileOutputStream( user.getFile() ), Charsets.UTF_8 );
-            }
-        }.write( content.toString() );
+        return content.toString();
     }
 }

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

@@ -0,0 +1,139 @@
+//==============================================================================
+// 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.model;
+
+import com.google.common.base.*;
+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.util.ConversionUtils;
+import com.lyndir.masterpassword.*;
+import java.io.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.annotation.Nonnull;
+import org.joda.time.DateTime;
+
+
+/**
+ * @author lhunath, 14-12-07
+ */
+public class MPFlatUnmarshaller implements MPUnmarshaller {
+
+    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 static final Pattern   colon             = Pattern.compile( ":" );
+
+    @Nonnull
+    @Override
+    public MPFileUser unmarshall(@Nonnull final File file)
+            throws IOException {
+        try (Reader reader = new InputStreamReader( new FileInputStream( file ), Charsets.UTF_8 )) {
+            return unmarshall( CharStreams.toString( reader ) );
+        }
+    }
+
+    @Nonnull
+    @Override
+    public MPFileUser unmarshall(@Nonnull final String content) {
+        MPFileUser   user         = null;
+        byte[]       keyID        = null;
+        String       fullName     = null;
+        int          mpVersion    = 0, importFormat = 0, avatar = 0;
+        boolean      clearContent = false, headerStarted = false;
+        MPResultType defaultType  = MPResultType.DEFAULT;
+
+        //noinspection HardcodedLineSeparator
+        for (final String line : Splitter.on( CharMatcher.anyOf( "\r\n" ) ).omitEmptyStrings().split( content ))
+            // Header delimitor.
+            if (line.startsWith( "##" ))
+                if (!headerStarted)
+                    // Starts the header.
+                    headerStarted = true;
+                else
+                    // Ends the header.
+                    user = new MPFileUser( fullName, keyID, MPMasterKey.Version.fromInt( mpVersion ), avatar, defaultType, new DateTime( 0 ) );
+
+                // Comment.
+            else if (line.startsWith( "#" )) {
+                if (headerStarted && (user == 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 = MPResultType.forType( ConversionUtils.toIntegerNN( value ) );
+                    }
+                }
+            }
+
+            // No comment.
+            else if (user != null) {
+                Matcher siteMatcher = unmarshallFormats[importFormat].matcher( line );
+                if (!siteMatcher.matches())
+                    return null;
+
+                MPFileSite site;
+                switch (importFormat) {
+                    case 0:
+                        site = new MPFileSite( user, //
+                                               siteMatcher.group( 5 ), siteMatcher.group( 6 ), MPFileSite.DEFAULT_COUNTER,
+                                               MPResultType.forType( ConversionUtils.toIntegerNN( siteMatcher.group( 3 ) ) ),
+                                               MPMasterKey.Version.fromInt( ConversionUtils.toIntegerNN(
+                                                   colon.matcher( siteMatcher.group( 4 ) ).replaceAll( "" ) ) ),
+                                               null, null, null, ConversionUtils.toIntegerNN( siteMatcher.group( 2 ) ),
+                                               MPConstant.dateTimeFormatter.parseDateTime( siteMatcher.group( 1 ) ).toInstant() );
+                        break;
+
+                    case 1:
+                        site = new MPFileSite( user, //
+                                               siteMatcher.group( 7 ), siteMatcher.group( 8 ),
+                                               UnsignedInteger.valueOf( colon.matcher( siteMatcher.group( 5 ) ).replaceAll( "" ) ),
+                                               MPResultType.forType( ConversionUtils.toIntegerNN( siteMatcher.group( 3 ) ) ),
+                                               MPMasterKey.Version.fromInt( ConversionUtils.toIntegerNN(
+                                                   colon.matcher( siteMatcher.group( 4 ) ).replaceAll( "" ) ) ),
+                                               siteMatcher.group( 6 ), MPResultType.GeneratedName, null,
+                                               ConversionUtils.toIntegerNN( siteMatcher.group( 2 ) ),
+                                               MPConstant.dateTimeFormatter.parseDateTime( siteMatcher.group( 1 ) ).toInstant() );
+                        break;
+
+                    default:
+                        throw new UnsupportedOperationException( "Unexpected format: " + importFormat );
+                }
+
+                user.addSite( site );
+            }
+
+        return Preconditions.checkNotNull( user, "No full header found in import file." );
+    }
+}

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

@@ -18,23 +18,20 @@
 
 package com.lyndir.masterpassword.model;
 
-import com.lyndir.masterpassword.MPException;
-
-
 /**
  * @author lhunath, 14-12-17
  */
-public class MPIncorrectMasterPasswordException extends MPException {
+public class MPIncorrectMasterPasswordException extends Exception {
 
-    private final MPUser<?> user;
+    private final MPFileUser user;
 
-    public MPIncorrectMasterPasswordException(final MPUser<?> user) {
+    public MPIncorrectMasterPasswordException(final MPFileUser user) {
         super( "Incorrect master password for user: " + user.getFullName() );
 
         this.user = user;
     }
 
-    public MPUser<?> getUser() {
+    public MPFileUser getUser() {
         return user;
     }
 }

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

@@ -16,18 +16,19 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-package com.lyndir.masterpassword;
+package com.lyndir.masterpassword.model;
+
+import com.lyndir.masterpassword.MPMasterKey;
+
 
 /**
- * @author lhunath, 2017-09-21
+ * @author lhunath, 2017-09-20
  */
-public class MPAlgorithmException extends MPException {
+public class MPJSONMarshaller implements MPMarshaller {
 
-    public MPAlgorithmException(final String message) {
-        super( message );
-    }
-
-    public MPAlgorithmException(final String message, final Throwable cause) {
-        super( message, cause );
+    @Override
+    public String marshall(final MPFileUser user, final MPMasterKey masterKey, final ContentMode contentMode) {
+        // TODO
+        return null;
     }
 }

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

@@ -16,25 +16,30 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-package com.lyndir.masterpassword.model.impl;
+package com.lyndir.masterpassword.model;
 
-import com.lyndir.masterpassword.MPAlgorithmException;
-import com.lyndir.masterpassword.MPKeyUnavailableException;
-import com.lyndir.masterpassword.model.MPIncorrectMasterPasswordException;
 import java.io.File;
 import java.io.IOException;
 import javax.annotation.Nonnull;
 
 
 /**
- * @author lhunath, 14-12-07
+ * @author lhunath, 2017-09-20
  */
-public interface MPUnmarshaller {
+public class MPJSONUnmarshaller implements MPUnmarshaller {
 
     @Nonnull
-    MPFileUser readUser(File file)
-            throws IOException, MPMarshalException;
+    @Override
+    public MPFileUser unmarshall(@Nonnull final File file)
+            throws IOException {
+        // TODO
+        return null;
+    }
 
-    void readSites(MPFileUser user)
-            throws IOException, MPMarshalException, MPIncorrectMasterPasswordException, MPKeyUnavailableException, MPAlgorithmException;
+    @Nonnull
+    @Override
+    public MPFileUser unmarshall(@Nonnull final String content) {
+        // TODO
+        return null;
+    }
 }

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

@@ -16,15 +16,10 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-package com.lyndir.masterpassword.model.impl;
-
-import java.io.File;
-
+package com.lyndir.masterpassword.model;
 
 /**
  * @author lhunath, 2017-09-20
- *
- * This enum is ordered from oldest to newest format, the latest being most preferred.
  */
 public enum MPMarshalFormat {
     /**
@@ -40,11 +35,6 @@ public enum MPMarshalFormat {
         public MPUnmarshaller unmarshaller() {
             return new MPFlatUnmarshaller();
         }
-
-        @Override
-        public String fileSuffix() {
-            return ".mpsites";
-        }
     },
 
     /**
@@ -60,11 +50,6 @@ public enum MPMarshalFormat {
         public MPUnmarshaller unmarshaller() {
             return new MPJSONUnmarshaller();
         }
-
-        @Override
-        public String fileSuffix() {
-            return ".mpsites.json";
-        }
     };
 
     public static final MPMarshalFormat DEFAULT = JSON;
@@ -72,11 +57,4 @@ public enum MPMarshalFormat {
     public abstract MPMarshaller marshaller();
 
     public abstract MPUnmarshaller unmarshaller();
-
-    @SuppressWarnings("MethodReturnAlwaysConstant")
-    public abstract String fileSuffix();
-
-    public boolean matches(final File file) {
-        return file.getName().endsWith( fileSuffix() );
-    }
 }

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

@@ -16,32 +16,29 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-package com.lyndir.masterpassword.model.impl;
+package com.lyndir.masterpassword.model;
 
-import com.lyndir.masterpassword.MPAlgorithmException;
-import com.lyndir.masterpassword.MPKeyUnavailableException;
-import java.io.IOException;
+import com.lyndir.masterpassword.MPInvalidatedException;
+import com.lyndir.masterpassword.MPMasterKey;
 
 
 /**
  * @author lhunath, 14-12-07
  */
-@FunctionalInterface
 public interface MPMarshaller {
 
-    void marshall(MPFileUser user)
-            throws IOException, MPKeyUnavailableException, MPMarshalException, MPAlgorithmException;
+    String marshall(MPFileUser user, MPMasterKey masterKey, ContentMode contentMode)
+            throws MPInvalidatedException;
 
     enum ContentMode {
-        PROTECTED( "Export of site names and stored passwords (unless device-private) encrypted with the master key.", true ),
-        VISIBLE( "Export of site names and passwords in clear-text.", false );
+        PROTECTED( "Export of site names and stored passwords (unless device-private) encrypted with the master key." ),
+        VISIBLE( "Export of site names and passwords in clear-text." );
 
-        private final String  description;
-        private final boolean redacted;
+        private final String description;
+        private boolean redacted;
 
-        ContentMode(final String description, final boolean redacted) {
+        ContentMode(final String description) {
             this.description = description;
-            this.redacted = redacted;
         }
 
         public String description() {

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

@@ -0,0 +1,81 @@
+//==============================================================================
+// 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.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;
+
+
+/**
+ * @author lhunath, 14-12-16
+ */
+public abstract class MPSite {
+
+    public static final UnsignedInteger DEFAULT_COUNTER = UnsignedInteger.ONE;
+
+    public abstract String getSiteName();
+
+    public abstract void setSiteName(String siteName);
+
+    public abstract UnsignedInteger getSiteCounter();
+
+    public abstract void setSiteCounter(UnsignedInteger siteCounter);
+
+    public abstract MPResultType getResultType();
+
+    public abstract void setResultType(MPResultType resultType);
+
+    public abstract MPMasterKey.Version getAlgorithmVersion();
+
+    public abstract void setAlgorithmVersion(MPMasterKey.Version algorithmVersion);
+
+    public String resultFor(final MPMasterKey masterKey, final MPKeyPurpose keyPurpose, @Nullable final String keyContext,
+                            @Nullable final String siteContent)
+            throws MPInvalidatedException {
+
+        return masterKey.siteResult(
+                getSiteName(), getSiteCounter(), keyPurpose, keyContext, getResultType(), siteContent, getAlgorithmVersion() );
+    }
+
+    public String loginFor(final MPMasterKey masterKey, final MPResultType loginType, @Nullable final String loginContent)
+            throws MPInvalidatedException {
+
+        return masterKey.siteResult(
+                getSiteName(), DEFAULT_COUNTER, MPKeyPurpose.Identification, null, loginType, loginContent, getAlgorithmVersion() );
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        return (this == obj) || ((obj instanceof MPSite) && Objects.equals( getSiteName(), ((MPSite) obj).getSiteName() ));
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode( getSiteName() );
+    }
+
+    @Override
+    public String toString() {
+        return strf( "{%s: %s}", getClass().getSimpleName(), getSiteName() );
+    }
+}

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

@@ -18,44 +18,38 @@
 
 package com.lyndir.masterpassword.model;
 
-import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
 
 import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
 
 
 /**
  * @author lhunath, 14-12-07
  */
-public class MPSiteResult implements Comparable<MPSiteResult> {
+public class MPSiteResult {
 
-    private final MPSite<?> site;
+    private final MPFileSite site;
 
-    public MPSiteResult(final MPSite<?> site) {
+    public MPSiteResult(final MPFileSite site) {
         this.site = site;
     }
 
-    public MPSite<?> getSite() {
+    public MPFileSite getSite() {
         return site;
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hashCode( getSite() );
-    }
-
     @Override
     public boolean equals(final Object obj) {
-        return (this == obj) || ((obj instanceof MPSiteResult) && Objects.equals( getSite(), ((MPSiteResult) obj).getSite() ));
+        return (this == obj) || ((obj instanceof MPSiteResult) && Objects.equals( site, ((MPSiteResult) obj).site ));
     }
 
     @Override
-    public int compareTo(@NotNull final MPSiteResult o) {
-        return getSite().compareTo( o.getSite() );
+    public int hashCode() {
+        return Objects.hashCode( site );
     }
 
     @Override
     public String toString() {
-        return strf( "{%s: %s}", getClass().getSimpleName(), getSite() );
+        return strf( "{MPSiteResult: %s}", site );
     }
 }

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

@@ -16,18 +16,21 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-package com.lyndir.masterpassword;
+package com.lyndir.masterpassword.model;
+
+import java.io.*;
+import javax.annotation.Nonnull;
+
 
 /**
- * @author lhunath, 2018-06-03
+ * @author lhunath, 14-12-07
  */
-public class MPException extends Exception {
+public interface MPUnmarshaller {
 
-    public MPException(final String message) {
-        super( message );
-    }
+    @Nonnull
+    MPFileUser unmarshall(@Nonnull File file)
+            throws IOException;
 
-    public MPException(final String message, final Throwable cause) {
-        super( message, cause );
-    }
+    @Nonnull
+    MPFileUser unmarshall(@Nonnull String content);
 }

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

@@ -0,0 +1,86 @@
+//==============================================================================
+// 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.model;
+
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
+
+import com.google.common.base.Preconditions;
+import com.lyndir.lhunath.opal.system.CodeUtils;
+import com.lyndir.masterpassword.MPInvalidatedException;
+import com.lyndir.masterpassword.MPMasterKey;
+import java.util.*;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
+/**
+ * @author lhunath, 2014-06-08
+ */
+public abstract class MPUser<S extends MPSite> {
+
+    @Nullable
+    protected MPMasterKey key;
+
+    public abstract String getFullName();
+
+    public boolean isMasterKeyAvailable() {
+        return key != null;
+    }
+
+    @Nonnull
+    public MPMasterKey getMasterKey() {
+        return Preconditions.checkNotNull( key, "User is not authenticated: " + getFullName() );
+    }
+
+    public String exportKeyID()
+            throws MPInvalidatedException {
+        return CodeUtils.encodeHex( getMasterKey().getKeyID( getAlgorithmVersion() ) );
+    }
+
+    public abstract MPMasterKey.Version getAlgorithmVersion();
+
+    public int getAvatar() {
+        return 0;
+    }
+
+    public abstract void addSite(S site);
+
+    public abstract void deleteSite(S site);
+
+    public abstract Collection<S> findSites(String query);
+
+    @Nonnull
+    public abstract MPMasterKey authenticate(char[] masterPassword)
+            throws MPIncorrectMasterPasswordException;
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode( getFullName() );
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        return (this == obj) || ((obj instanceof MPUser) && Objects.equals( getFullName(), ((MPUser<?>) obj).getFullName() ));
+    }
+
+    @Override
+    public String toString() {
+        return strf( "{%s: %s}", getClass().getSimpleName(), getFullName() );
+    }
+}

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

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

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

@@ -17,6 +17,7 @@
 //==============================================================================
 
 /**
+ *
  * @author lhunath, 15-02-04
  */
 

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,15 +23,13 @@ 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 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.xml.parsers.*;
-import org.xml.sax.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
 import org.xml.sax.ext.DefaultHandler2;
 
 
@@ -42,18 +40,8 @@ import org.xml.sax.ext.DefaultHandler2;
 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 +51,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 +81,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 ))
@@ -129,11 +112,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 );
         }
 
@@ -184,13 +167,17 @@ 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 TestCase() {
+            @Override
+            public boolean run(final MPTests.Case testCase)
+                    throws Exception {
+                MPMasterKey masterKey = new MPMasterKey( testCase.getFullName(), testCase.getMasterPassword().toCharArray() );
+                String sitePassword = masterKey.siteResult( testCase.getSiteName(), testCase.getSiteCounter(), testCase.getKeyPurpose(),
+                                                            testCase.getKeyContext(), testCase.getResultType(),
+                                                            null, testCase.getAlgorithm() );
 
-            return testCase.getResult().equals( sitePassword );
+                return testCase.getResult().equals( sitePassword );
+            }
         } );
     }
 
@@ -204,14 +191,12 @@ 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)

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
-        Integer algorithm;
-        String fullName;
-        String masterPassword;
-        String keyID;
-        String siteName;
-        @Nullable
+        String          identifier;
+        String          parent;
+        Integer         algorithm;
+        String          fullName;
+        String          masterPassword;
+        String          keyID;
+        String          siteName;
         UnsignedInteger siteCounter;
-        String resultType;
-        String keyPurpose;
-        String keyContext;
-        String result;
+        String          resultType;
+        String          keyPurpose;
+        String          keyContext;
+        String          result;
 
-        @XmlTransient
-        private Case parentCase;
+        private transient Case parentCase;
 
         public void initializeParentHierarchy(final MPTests tests) {
 
@@ -190,8 +171,8 @@ public class MPTests {
         }
 
         @Nonnull
-        public MPAlgorithm getAlgorithm() {
-            return MPAlgorithm.Version.fromInt( checkNotNull( algorithm ) );
+        public MPMasterKey.Version getAlgorithm() {
+            return MPMasterKey.Version.fromInt( checkNotNull( algorithm ) );
         }
 
         @Nonnull

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

@@ -0,0 +1 @@
+../../../../../mpw_tests.xml

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

@@ -20,9 +20,9 @@ package com.lyndir.masterpassword;
 
 import static org.testng.Assert.*;
 
+import com.google.common.base.Charsets;
 import com.lyndir.lhunath.opal.system.CodeUtils;
 import com.lyndir.lhunath.opal.system.logging.Logger;
-import java.security.SecureRandom;
 import java.util.Random;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -32,7 +32,6 @@ public class MPMasterKeyTest {
 
     @SuppressWarnings("UnusedDeclaration")
     private static final Logger logger = Logger.get( MPMasterKeyTest.class );
-    private static final Random random = new SecureRandom();
 
     private MPTestSuite testSuite;
 
@@ -41,36 +40,40 @@ public class MPMasterKeyTest {
             throws Exception {
 
         testSuite = new MPTestSuite();
-        //testSuite.getTests().addFilters( "v3_type_maximum" );
     }
 
     @Test
     public void testMasterKey()
             throws Exception {
 
-        testSuite.forEach( "testMasterKey", testCase -> {
-            char[]      masterPassword = testCase.getMasterPassword().toCharArray();
-            MPMasterKey masterKey      = new MPMasterKey( testCase.getFullName(), masterPassword );
+        testSuite.forEach( "testMasterKey", new MPTestSuite.TestCase() {
+            @Override
+            public boolean run(final MPTests.Case testCase)
+                    throws Exception {
+                char[]      masterPassword = testCase.getMasterPassword().toCharArray();
+                MPMasterKey masterKey      = new MPMasterKey( testCase.getFullName(), masterPassword );
 
-            // Test key
-            assertTrue(
-                    testCase.getKeyID().equalsIgnoreCase( masterKey.getKeyID( testCase.getAlgorithm() ) ),
-                    "[testMasterKey] keyID mismatch for test case: " + testCase );
+                // Test key
+                assertEquals(
+                        CodeUtils.encodeHex( masterKey.getKeyID( testCase.getAlgorithm() ) ),
+                        testCase.getKeyID(),
+                        "[testMasterKey] keyID mismatch: " + testCase );
 
-            // Test invalidation
-            masterKey.invalidate();
-            try {
-                masterKey.getKeyID( testCase.getAlgorithm() );
-                fail( "[testMasterKey] invalidate ineffective for test case: " + testCase );
+                // Test invalidation
+                masterKey.invalidate();
+                try {
+                    masterKey.getKeyID( testCase.getAlgorithm() );
+                    fail( "[testMasterKey] invalidate ineffective: " + testCase );
+                }
+                catch (final MPInvalidatedException ignored) {
+                }
+                assertNotEquals(
+                        masterPassword,
+                        testCase.getMasterPassword().toCharArray(),
+                        "[testMasterKey] masterPassword not wiped: " + testCase );
+
+                return true;
             }
-            catch (final MPKeyUnavailableException ignored) {
-            }
-            assertNotEquals(
-                    masterPassword,
-                    testCase.getMasterPassword().toCharArray(),
-                    "[testMasterKey] masterPassword not wiped for test case: " + testCase );
-
-            return true;
         } );
     }
 
@@ -78,20 +81,23 @@ public class MPMasterKeyTest {
     public void testSiteResult()
             throws Exception {
 
-        testSuite.forEach( "testSiteResult", testCase -> {
-            char[]      masterPassword = testCase.getMasterPassword().toCharArray();
-            MPMasterKey masterKey      = new MPMasterKey( testCase.getFullName(), masterPassword );
+        testSuite.forEach( "testSiteResult", new MPTestSuite.TestCase() {
+            @Override
+            public boolean run(final MPTests.Case testCase)
+                    throws Exception {
+                char[]      masterPassword = testCase.getMasterPassword().toCharArray();
+                MPMasterKey masterKey      = new MPMasterKey( testCase.getFullName(), masterPassword );
 
-            // Test site result
-            assertEquals(
-                    masterKey.siteResult( testCase.getSiteName(), testCase.getAlgorithm(), testCase.getSiteCounter(),
-                                          testCase.getKeyPurpose(),
-                                          testCase.getKeyContext(), testCase.getResultType(),
-                                          null ),
-                    testCase.getResult(),
-                    "[testSiteResult] result mismatch for test case: " + testCase );
+                // Test site result
+                assertEquals(
+                        masterKey.siteResult( testCase.getSiteName(), testCase.getSiteCounter(), testCase.getKeyPurpose(),
+                                              testCase.getKeyContext(), testCase.getResultType(),
+                                              null, testCase.getAlgorithm() ),
+                        testCase.getResult(),
+                        "[testSiteResult] result mismatch: " + testCase );
 
-            return true;
+                return true;
+            }
         } );
     }
 
@@ -103,23 +109,25 @@ public class MPMasterKeyTest {
         char[]       masterPassword = testCase.getMasterPassword().toCharArray();
         MPMasterKey  masterKey      = new MPMasterKey( testCase.getFullName(), masterPassword );
 
-        String       password   = randomString( 8 );
-        MPResultType resultType = MPResultType.StoredPersonal;
-        for (final MPAlgorithm.Version algorithm : MPAlgorithm.Version.values()) {
+        String password = randomString( 8 );
+        for (final MPMasterKey.Version version : MPMasterKey.Version.values()) {
+            MPResultType resultType = MPResultType.StoredPersonal;
+
             // Test site state
-            String state = masterKey.siteState( testCase.getSiteName(), algorithm, testCase.getSiteCounter(), testCase.getKeyPurpose(),
-                                                testCase.getKeyContext(), resultType, password );
-            String result = masterKey.siteResult( testCase.getSiteName(), algorithm, testCase.getSiteCounter(), testCase.getKeyPurpose(),
-                                                  testCase.getKeyContext(), resultType, state );
+            String state = masterKey.siteState( testCase.getSiteName(), testCase.getSiteCounter(), testCase.getKeyPurpose(),
+                                                testCase.getKeyContext(), resultType, password, version );
+            String result = masterKey.siteResult( testCase.getSiteName(), testCase.getSiteCounter(), testCase.getKeyPurpose(),
+                                                  testCase.getKeyContext(), resultType, state, version );
 
             assertEquals(
                     result,
                     password,
-                    "[testSiteState] state mismatch for test case: " + testCase );
+                    "[testSiteState] state mismatch: " + testCase );
         }
     }
 
-    private static String randomString(int length) {
+    public static String randomString(int length) {
+        Random        random  = new Random();
         StringBuilder builder = new StringBuilder();
 
         while (length > 0) {

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,28 @@
+<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="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="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
+    <option name="PREFERRED_AVD" value="" />
+    <option name="DEBUGGER_TYPE" value="Java" />
+    <Java />
+    <Profilers>
+      <option name="ENABLE_ADVANCED_PROFILING" 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" show_console_on_std_err="true">
+    <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="masterpassword-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" show_console_on_std_err="true">
+    <module name="" />
+    <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="wholeProject" />
+    </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/README.md

@@ -0,0 +1,7 @@
+To build a release distribution:
+
+STORE_PW=$(mpw masterpassword.keystore) KEY_PW=$(mpw masterpassword-android) gradle 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.

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.3.2'
+    }
+}
+
+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,5 @@
-#Mon Sep 23 12:55:35 EDT 2019
 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-4.3-bin.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,7 +28,7 @@ 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"
@@ -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"`

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,60 @@
+<?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-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,26 @@
+rootProject.name = 'masterpassword'
+
+def local = new Properties();
+try {
+    local.load(file('local.properties').newDataInputStream())
+} catch (FileNotFoundException ignored) {
+}
+
+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-gui'
+project(':masterpassword-gui').projectDir = new File( '../platform-independent/gui-java' )
+
+if (local.containsKey('sdk.dir')) {
+    include 'masterpassword-android'
+    project(':masterpassword-android').projectDir = new File( '../platform-android' )
+} else {
+    logger.warn( "Skipping masterpassword-android since sdk.dir is not defined in local.properties." )
+}

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