2.7-java-3

UI threading improvements.
Save user/site changes to file.
Ordering of user / site fixes.
Add questions to JSON output.
Bring JSON output format in line with C.

.dockerignore

@@ -0,0 +1,28 @@
+# 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
+/gradle/builds
+/platform-android/.externalNativeBuild
+
+# Git
+.git

.gitignore

@@ -14,18 +14,12 @@ DerivedData/
 
 # Generated
 /platform-darwin/Resources/Media/Images.xcassets/
-
-# Media
-public/Press/Background.png
-public/Press/Front-Page.png
-public/Press/MasterPassword_PressKit/MasterPassword_pressrelease_*.pdf
+/platform-darwin/Podfile.lock
+/platform-darwin/Pods/
 
 # Gradle
 build
-!/build
 .gradle
 local.properties
-
-# Maven
-target
-dependency-reduced-pom.xml
+/gradle/builds
+/platform-android/.externalNativeBuild

.gitlab-ci.yml

@@ -0,0 +1,18 @@
+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 )"
+    - "( cd ./gradle && ./gradlew --stacktrace clean test )"
+    - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator clean build )"
+    - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' clean build )"
+  tags:
+    - brew
+    - java_9
+    - xcode_9

.gitmodules

@@ -17,14 +17,14 @@
 	path = platform-darwin/External/jrswizzle
 	url = git://github.com/jonmarimba/jrswizzle.git
 [submodule "MasterPassword/Web/js/mpw-js"]
-	path = platform-independent/web-js/js/mpw-js
+	path = platform-independent/web/js/mpw-js
 	url = https://github.com/tmthrgd/mpw-js.git
-[submodule "platform-darwin/External/libsodium"]
-	path = platform-darwin/External/libsodium
+[submodule "lib/libsodium"]
+	path = lib/libsodium
 	url = https://github.com/jedisct1/libsodium.git
-[submodule "platform-darwin/External/libjson-c"]
-	path = platform-darwin/External/libjson-c
-	url = https://github.com/lhunath/json-c.git
+[submodule "lib/libjson-c"]
+	path = lib/libjson-c
+	url = https://github.com/json-c/json-c.git
 [submodule "public/site"]
 	path = public/site
 	url = https://github.com/Lyndir/MasterPassword.git

.travis.yml

@@ -1,20 +0,0 @@
-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

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

Dockerfile

@@ -0,0 +1,12 @@
+FROM debian:buster-slim
+
+# For i386
+#FROM i386/debian:buster-slim
+#ENTRYPOINT ["linux32", "--"]
+
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
+RUN mkdir -p /usr/share/man/man1
+
+RUN apt-get update && apt-get install openjdk-10-jdk-headless git-core bash libtool automake autoconf make g++
+RUN git clone --depth=3 $(: --shallow-submodules) --recurse-submodules https://gitlab.com/MasterPassword/MasterPassword.git /mpw
+RUN cd /mpw/gradle && ./gradlew -i clean build

README.md

@@ -1,11 +1,4 @@
-[![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 •••|](http://masterpassword.app)
 
 Master Password is a completely new way of thinking about passwords.
 
@@ -13,9 +6,9 @@ It consists of an algorithm that implements the core idea and applications for v
 
 To skip the intro and go straight to the information on how to use the code, [click here](#source-code).
 
-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 available for [📲 iOS](https://itunes.apple.com/app/id510296984), [🖥 macOS](https://masterpassword.app/masterpassword-mac.zip), [📲 Android](https://masterpassword.app/masterpassword-android.apk), [🖥 Desktop](https://masterpassword.app/masterpassword-gui.jar), and [⌨ Console](https://masterpassword.app/masterpassword-cli.tar.gz).
 
-Master Password is also available from the following package managers: [macOS: Homebrew](https://brew.sh/) (`brew install mpw`).
+Master Password is also available from: [macOS: Homebrew](https://brew.sh/) (`brew install mpw`) and [Docker](https://www.docker.com/) (`docker run -ti registry.gitlab.com/masterpassword/masterpassword`).
 Get in touch if you are interested in adding Master Password to any other package managers.
 
 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:
@@ -90,7 +83,7 @@ Master Password is *not* a password manager.  It does not store your website pas
 
 ## How does it work?
 
-The details of how Master Password works [are available here](http://masterpasswordapp.com/algorithm.html).
+The details of how Master Password works [are available here](https://masterpassword.app/masterpassword-algorithm.pdf).
 
 In short:
 
@@ -129,14 +122,14 @@ The `master-password` on the other hand, is only a simple phrase, which means it
 
  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).
+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 GitLab issues](https://gitlab.com/MasterPassword/MasterPassword/issues/).
 
 
 
 
 # Source Code
 
-Master Password's algorithm is [documented](http://masterpasswordapp.com/algorithm.html) and its implementation is Free Software (GPLv3).
+Master Password's algorithm is [documented](https://masterpassword.app/masterpassword-algorithm.pdf) and its implementation is [Free Software (GPLv3)](LICENSE).
 
 
 
@@ -194,7 +187,7 @@ Note that in order to build the Android application, you will need to have the A
 
 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).
+For detailed instructions, see [the native CLI instructions](platform-independent/c/README.md).
 
 
 ## Support

core/java/algorithm/build.gradle

@@ -1,16 +0,0 @@
-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

@@ -1,49 +0,0 @@
-<?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

@@ -1,99 +0,0 @@
-//==============================================================================
-// 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

@@ -1,248 +0,0 @@
-//==============================================================================
-// 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

@@ -1,62 +0,0 @@
-//==============================================================================
-// 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

@@ -1,74 +0,0 @@
-//==============================================================================
-// 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

@@ -1,67 +0,0 @@
-//==============================================================================
-// 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/MPMasterKey.java

@@ -1,246 +0,0 @@
-//==============================================================================
-// 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/MPUtils.java

@@ -1,53 +0,0 @@
-//==============================================================================
-// 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/model/build.gradle

@@ -1,18 +0,0 @@
-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

@@ -1,55 +0,0 @@
-<?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

@@ -1,205 +0,0 @@
-//==============================================================================
-// 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

@@ -1,172 +0,0 @@
-//==============================================================================
-// 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

@@ -1,139 +0,0 @@
-//==============================================================================
-// 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/MPFlatUnmarshaller.java

@@ -1,139 +0,0 @@
-//==============================================================================
-// 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/MPSite.java

@@ -1,81 +0,0 @@
-//==============================================================================
-// 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/MPUser.java

@@ -1,86 +0,0 @@
-//==============================================================================
-// 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

@@ -1,58 +0,0 @@
-//==============================================================================
-// 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/tests/build.gradle

@@ -1,13 +0,0 @@
-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

@@ -1,43 +0,0 @@
-<?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/resources/mpw_tests.xml

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

gradle/.idea/codeStyleSettings.xml

@@ -1,9 +0,0 @@
-<?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

@@ -1,7 +0,0 @@
-<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

@@ -1,13 +0,0 @@
-<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

@@ -1,9 +0,0 @@
-<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

@@ -1,12 +1,5 @@
 <?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" />
@@ -31,10 +24,10 @@
       </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 name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
-  <component name="ThriftCompiler">
-    <compilers />
+  <component name="ProjectType">
+    <option name="id" value="Android" />
   </component>
 </project>

gradle/.idea/runConfigurations/Android.xml

@@ -1,28 +0,0 @@
-<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

@@ -1,16 +0,0 @@
-<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

@@ -1,29 +0,0 @@
-<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

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

gradle/README.md

@@ -0,0 +1,15 @@
+To build a release distribution:
+
+Desktop:
+
+    STORE_PW=$(mpw masterpassword.keystore) KEY_PW_DESKTOP=$(mpw masterpassword-desktop) gradle clean masterpassword-gui:shadowJar
+
+Android:
+
+    STORE_PW=$(mpw masterpassword.keystore) KEY_PW_ANDROID=$(mpw masterpassword-android) gradle 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).

gradle/build.gradle

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

gradle/gradle.properties

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

gradle/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Mar 26 09:11:08 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

gradle/gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

gradle/homebrew-mpw.rb

@@ -1,31 +1,40 @@
 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"
+  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"
 
-  depends_on "automake" => :build
-  depends_on "autoconf" => :build
-  depends_on "openssl"
-
-  resource "libscrypt" do
-    url "http://masterpasswordapp.com/libscrypt-b12b554.tar.gz"
-    sha1 "ee871e0f93a786c4e3622561f34565337cfdb815"
+  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
-    resource("libscrypt").stage buildpath/"lib/scrypt"
-    touch "lib/scrypt/.unpacked"
+    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"
 
-    ENV["targets"] = "mpw mpw-tests"
     system "./build"
-    system "./mpw-tests"
-
+    system "./mpw-cli-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
+      shell_output("#{bin}/mpw -q -Fnone -u 'Robert Lee Mitchell' -M 'banana colored duckling' -tlong -c1 -a3 'masterpasswordapp.com'").strip
   end
 end

gradle/pom.xml

@@ -1,60 +0,0 @@
-<?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

@@ -1,26 +1,27 @@
 rootProject.name = 'masterpassword'
 
-def local = new Properties();
-try {
-    local.load(file('local.properties').newDataInputStream())
-} catch (FileNotFoundException ignored) {
-}
+def local = new Properties()
+def localFile = file( 'local.properties' )
+localFile.exists() && local.load( localFile.newDataInputStream() )
+
+include 'masterpassword-core'
+project( ':masterpassword-core' ).projectDir = new File( '../platform-independent/c/core' )
 
 include 'masterpassword-algorithm'
-project(':masterpassword-algorithm').projectDir = new File( '../core/java/algorithm' )
+project( ':masterpassword-algorithm' ).projectDir = new File( '../platform-independent/java/algorithm' )
 
 include 'masterpassword-model'
-project(':masterpassword-model').projectDir = new File( '../core/java/model' )
+project( ':masterpassword-model' ).projectDir = new File( '../platform-independent/java/model' )
 
 include 'masterpassword-tests'
-project(':masterpassword-tests').projectDir = new File( '../core/java/tests' )
+project( ':masterpassword-tests' ).projectDir = new File( '../platform-independent/java/tests' )
 
 include 'masterpassword-gui'
-project(':masterpassword-gui').projectDir = new File( '../platform-independent/gui-java' )
+project( ':masterpassword-gui' ).projectDir = new File( '../platform-independent/java/gui' )
 
-if (local.containsKey('sdk.dir')) {
+if (local.containsKey( 'sdk.dir' ) && file( local.getProperty( 'sdk.dir' ) ).exists()) {
     include 'masterpassword-android'
-    project(':masterpassword-android').projectDir = new File( '../platform-android' )
+    project( ':masterpassword-android' ).projectDir = new File( '../platform-android' )
 } else {
     logger.warn( "Skipping masterpassword-android since sdk.dir is not defined in local.properties." )
 }

lib/bin/build_lib

@@ -0,0 +1,379 @@
+#!/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)
+#     - prepare
+#         - clean
+#         - 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" && 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 if the user wants a clean slate.
+initialize() { _initialize "$@"; }
+_initialize() {
+    initialize_needs "$@"
+}
+
+# initialize_needs <prefix> <platform>
+#
+# Check if all tools needed for the default implementations are available.
+#
+# By default, this will check for `libtool` (for libtoolize), `automake` (for aclocal), `autoconf` (for autoreconf) and make.
+initialize_needs() { _initialize_needs "$@"; }
+_initialize_needs() {
+    if [[ $platform = windows ]]; then
+        needs cmd
+        export VSINSTALLDIR="${VSINSTALLDIR:-$(cd "$(cygpath -F 0x002a)/Microsoft Visual Studio"/*/*/Common7/.. && pwd)}"
+        [[ -e "$VSINSTALLDIR/Common7/Tools/VsMSBuildCmd.bat" ]] || { echo >&2 "Missing: msbuild.  Please install 'Build Tools for Visual Studio'."; 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 wipe the prefix, run `make distclean` and `git clean -fdx`.
+clean() { _clean "$@"; }
+_clean() {
+    if [[ $platform = windows ]]; then
+        printf '"%%VSINSTALLDIR%%\Common7\Tools\VsMSBuildCmd.bat" && msbuild /t:Clean' > .clean.bat
+        cmd //c .clean.bat
+        rm -f .clean.bat
+    elif [[ -e Makefile ]] && make -s distclean; then :
+    elif [[ -e .git ]] && git clean -fdx; then :
+    fi
+
+    rm -rf "$prefix"
+}
+
+# prepare <prefix> <platform> [ <arch> ... ]
+#
+# Configure the library for building the <arch>s on this machine.
+# The build script invokes this once prior to building each of its targets.
+# The <prefix> has been newly created.
+#
+# By default, this will run `autoreconf`.
+prepare() { _prepare "$@"; }
+_prepare() {
+    prepare_clean "$@"
+    prepare_config "$@"
+}
+
+# prepare_clean <prefix> <platform> [ <arch> ... ]
+#
+# Perform any necessary clean-up of the library code prior to building.
+#
+# By default, this will wipe and re-create the prefix.
+prepare_clean() { _prepare_clean "$@"; }
+_prepare_clean() {
+    local prefix=$1 platform=$2; shift 2
+
+    rm -rf "$prefix"
+    install -d "$prefix/out"
+}
+
+# prepare_config <prefix> <platform> [ <arch> ... ]
+#
+# Configure the library for building the <arch>s on this machine.
+#
+# By default, this will 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 --verbose --install --force 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /')
+    fi
+
+    touch "$prefix/out/.prepared"
+}
+
+# target <prefix> <platform> <arch>
+#
+# Build the library for the given <arch> and <platform> into the given <prefix>.
+# The build script invokes this function when it's ready to build the library's code.
+# Generic platform-specific environment setup has been done.
+target() { _target "$@"; }
+_target() {
+    target_prepare "$@"
+    target_configure "$@"
+    target_build "$@"
+}
+
+# target_prepare <prefix> <platform> <arch>
+#
+# Prepare the library configuration for building the target.
+#
+# By default, this will run `make clean` if a Makefile is found.
+target_prepare() { _target_prepare "$@"; }
+_target_prepare() {
+    local prefix=$1 platform=$2 arch=$3; shift 3
+
+    if [[ $platform = windows ]]; then :
+    else
+        [[ ! -e Makefile ]] || make -s clean
+    fi
+}
+
+# target_configure <prefix> <platform> <arch> [ <args> ... ]
+#
+# Configure the library for building the target.
+#
+# By default, this will run `./configure --host=<host> --prefix=<prefix>/<arch> <args>`.
+# By default, some platform-specific arguments will be passed in as well as
+# --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; shift 3
+
+    case "$platform" in
+        'windows')
+            return
+        ;;
+        'android')
+            host=( "$SDKROOT"/*-android* ) host=${host##*/}
+
+            set -- --with-sysroot="$SDKROOT/sysroot" "$@"
+        ;;
+        'ios')
+            [[ $arch = *arm* ]] && host=arm || host=$arch
+            host+=-apple
+
+            set -- --disable-shared "$@"
+        ;;
+    esac
+
+    ./configure ${host:+--host="$host"} --enable-pic --disable-pie --prefix="$prefix/$arch" "$@"
+}
+
+# target_build <prefix> <platform> <arch>
+#
+# Build the library code for the target.
+#
+# By default, this will run `make check install`.
+target_build() { _target_build "$@"; }
+_target_build() {
+    local prefix=$1 platform=$2 arch=$3; shift 3
+
+    if [[ $platform = windows ]]; then
+        # I cannot for the life of me figure out how to pass this command directly into cmd.
+        printf '"%%VSINSTALLDIR%%\Common7\Tools\VsMSBuildCmd.bat" && msbuild /t:Rebuild /p:Configuration=ReleaseDLL;Platform=%s;OutDir=%s' "$arch" "$(cygpath -w "${prefix##$PWD/}/$arch/")" > .build.bat
+        cmd //c .build.bat
+        rm -f .build.bat
+    else
+        local cores=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null ||:)
+        make -j"${cores:-3}" 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" ]] && mv -f -- "$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 lib in "$prefix/$archs/lib/"*; do
+                if lipo -info "$lib" >/dev/null 2>&1; then
+                    local lib=("${lib##*/}") libs=("${archs[@]/#/$prefix/}") libs=("${libs[@]/%//lib/$lib}")
+                    lipo -create "${libs[@]}" -output "$prefix/out/lib/$lib"
+                fi
+            done
+        ;;
+        '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() {
+    [[ ! -e Makefile ]] || make -s clean
+}
+
+# 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=( 'i386' 'x86_64' 'armv7' 'armv7s' 'arm64' ) ;;
+            'android') archs=( 'arm' 'arm64' 'x86' 'x86_64' ) ;;
+            'windows') archs=( 'Win32' 'x64' ) ;;
+            *) archs=( 'i386' 'x86_64' ) ;;
+        esac
+    fi
+
+    local prefix="$PWD/build-$platform~"
+    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 (
+
+        # Set up a base environment for the platform.
+        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 CFLAGS="-arch $arch -flto -O2 -g -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} $CFLAGS"
+                export LDFLAGS="-arch $arch -flto -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} $LDFLAGS"
+                export CPPFLAGS="$CFLAGS $CPPFLAGS"
+            ;;
+            '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 CFLAGS="-arch $arch -mthumb -fembed-bitcode -flto -O2 -g -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $CFLAGS"
+                        export LDFLAGS="-arch $arch -mthumb -fembed-bitcode -flto -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
+                        export CPPFLAGS="$CFLAGS $CPPFLAGS"
+                    ;;
+                    *)
+                        SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"
+                        export PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH"
+                        export CFLAGS="-arch $arch -flto -O2 -g -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $CFLAGS"
+                        export LDFLAGS="-arch $arch -flto -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
+                        export CPPFLAGS="$CFLAGS $CPPFLAGS"
+                    ;;
+                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 CFLAGS="-O2 -g $CFLAGS"
+                export LDFLAGS="-avoid-version $LDFLAGS"
+                export CC='clang'
+
+                # For GCC:
+                # arm    CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb" LDFLAGS="-Wl,--fix-cortex-a8"
+                # arm64  CFLAGS="-march=armv8-a"
+                # x86    CFLAGS="-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32"
+                # x86_64 CFLAGS="-march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel"
+            ;;
+        esac
+
+        target "$prefix" "$platform" "$arch"
+    ); done
+
+    finalize "$prefix" "$platform" "${archs[@]}"
+}

lib/bin/build_libjson-c-android

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

lib/bin/build_libjson-c-ios

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

lib/bin/build_libjson-c-linux

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

lib/bin/build_libjson-c-macos

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

lib/bin/build_libjson-c-windows

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

lib/bin/build_libsodium-android

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

lib/bin/build_libsodium-ios

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

lib/bin/build_libsodium-linux

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

lib/bin/build_libsodium-macos

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

lib/bin/build_libsodium-windows

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

platform-android/CMakeLists.txt

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

platform-android/README

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

platform-android/build.gradle

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

platform-android/pom.xml

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <!-- PROJECT METADATA -->
-    <parent>
-        <groupId>com.lyndir.masterpassword</groupId>
-        <artifactId>masterpassword</artifactId>
-        <version>GIT-SNAPSHOT</version>
-    </parent>
-
-    <name>Master Password Android</name>
-    <description>An Android application to the Master Password algorithm</description>
-
-    <artifactId>masterpassword-android</artifactId>
-    <packaging>apk</packaging>
-
-    <!-- BUILD CONFIGURATION -->
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-
-                <configuration>
-                    <zipalign>
-                        <verbose>true</verbose>
-                        <skip>false</skip>
-                    </zipalign>
-                    <sdk>
-                        <platform>21</platform>
-                    </sdk>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                        <artifactId>android-maven-plugin</artifactId>
-
-                        <configuration>
-                            <sign>
-                                <debug>false</debug>
-                            </sign>
-                        </configuration>
-
-                        <executions>
-                            <execution>
-                                <id>manifest-update</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>manifest-update</goal>
-                                </goals>
-                                <configuration>
-                                    <manifestVersionCodeUpdateFromVersion>true</manifestVersionCodeUpdateFromVersion>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jarsigner-plugin</artifactId>
-                        <version>1.4</version>
-                        <executions>
-                            <execution>
-                                <id>signing</id>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                                <phase>package</phase>
-                                <inherited>true</inherited>
-                                <configuration>
-                                    <archiveDirectory />
-                                    <includes>
-                                        <include>target/*.apk</include>
-                                    </includes>
-                                    <keystore>release.jks</keystore>
-                                    <storepass>${env.PASSWORD}</storepass>
-                                    <keypass>${env.PASSWORD}</keypass>
-                                    <alias>masterpassword-android</alias>
-                                    <arguments>
-                                      <argument>-sigalg</argument><argument>MD5withRSA</argument>
-                                      <argument>-digestalg</argument><argument>SHA1</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <!-- DEPENDENCY MANAGEMENT -->
-    <dependencies>
-
-        <!-- PROJECT REFERENCES -->
-        <dependency>
-            <groupId>com.lyndir.masterpassword</groupId>
-            <artifactId>masterpassword-algorithm</artifactId>
-            <version>GIT-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.lyndir.masterpassword</groupId>
-            <artifactId>masterpassword-tests</artifactId>
-            <version>GIT-SNAPSHOT</version>
-        </dependency>
-
-        <!-- EXTERNAL DEPENDENCIES -->
-        <dependency>
-            <groupId>com.jakewharton</groupId>
-            <artifactId>butterknife</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-android</artifactId>
-            <version>1.7.13-underscore</version>
-        </dependency>
-
-        <dependency>
-            <groupId>android</groupId>
-            <artifactId>android</artifactId>
-            <version>5.0.1_r2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.lambdaworks</groupId>
-            <artifactId>scrypt</artifactId>
-            <version>1.4.0-android</version>
-            <type>jar</type>
-            <classifier>native</classifier>
-        </dependency>
-
-    </dependencies>
-
-</project>

platform-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java

@@ -18,7 +18,7 @@
 
 package com.lyndir.masterpassword;
 
-import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
+import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
 
 import android.app.*;
 import android.content.*;
@@ -35,11 +35,12 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.UnsignedInteger;
-import com.google.common.util.concurrent.*;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.lyndir.lhunath.opal.system.logging.Logger;
 import java.text.MessageFormat;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.Executors;
 import javax.annotation.Nullable;
 
 
@@ -49,13 +50,16 @@ public class EmergencyActivity extends Activity {
     private static final Logger   logger                = Logger.get( EmergencyActivity.class );
     private static final ClipData EMPTY_CLIP            = new ClipData( new ClipDescription( "", new String[0] ), new ClipData.Item( "" ) );
     private static final int      PASSWORD_NOTIFICATION = 0;
-    public static final int CLIPBOARD_CLEAR_DELAY = 20 /* s */ * MPConstant.MS_PER_S;
+    private static final int      CLIPBOARD_CLEAR_DELAY = 20 /* s */ * MPConstants.MS_PER_S;
 
     private final Preferences                        preferences    = Preferences.get( this );
-    private final ListeningExecutorService           executor       = MoreExecutors.listeningDecorator( Executors.newSingleThreadExecutor() );
-    private final ImmutableList<MPResultType>        allResultTypes = ImmutableList.copyOf( MPResultType.forClass( MPResultTypeClass.Template ) );
-    private final ImmutableList<MPMasterKey.Version> allVersions    = ImmutableList.copyOf( MPMasterKey.Version.values() );
+    private final ListeningExecutorService           executor       = MoreExecutors.listeningDecorator(
+            Executors.newSingleThreadExecutor() );
+    private final ImmutableList<MPResultType>        allResultTypes = ImmutableList.copyOf(
+            MPResultType.forClass( MPResultTypeClass.Template ) );
+    private final ImmutableList<MPAlgorithm.Version> allVersions    = ImmutableList.copyOf( MPAlgorithm.Version.values() );
 
+    @Nullable
     private MPMasterKey masterKey;
 
     @BindView(R.id.progressView)
@@ -96,6 +100,7 @@ public class EmergencyActivity extends Activity {
 
     private int    id_userName;
     private int    id_masterPassword;
+    @Nullable
     private String sitePassword;
 
     public static void start(final Context context) {
@@ -125,7 +130,7 @@ public class EmergencyActivity extends Activity {
         siteNameField.addTextChangedListener( new ValueChangedListener() {
             @Override
             void update() {
-                siteCounterButton.setText( MessageFormat.format( "{0}", 1 ) );
+                siteCounterButton.setText( MessageFormat.format( "{0}", UnsignedInteger.ONE ) );
                 updateSitePassword();
             }
         } );
@@ -150,11 +155,22 @@ public class EmergencyActivity extends Activity {
                 updateSitePassword();
             }
         } );
+        siteCounterButton.setOnLongClickListener( new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(final View v) {
+                if (UnsignedInteger.valueOf( siteCounterButton.getText().toString() ).equals( UnsignedInteger.ONE ))
+                    return false;
+
+                siteCounterButton.setText( MessageFormat.format( "{0}", UnsignedInteger.ONE ) );
+                updateSitePassword();
+                return true;
+            }
+        } );
         siteVersionButton.setOnClickListener( new View.OnClickListener() {
             @Override
             public void onClick(final View v) {
                 @SuppressWarnings("SuspiciousMethodCalls")
-                MPMasterKey.Version siteVersion =
+                MPAlgorithm.Version siteVersion =
                         allVersions.get( (allVersions.indexOf( siteVersionButton.getTag() ) + 1) % allVersions.size() );
                 preferences.setDefaultVersion( siteVersion );
                 siteVersionButton.setTag( siteVersion );
@@ -173,13 +189,13 @@ public class EmergencyActivity extends Activity {
             }
         } );
 
-        fullNameField.setTypeface( Res.get( this ).exo_Thin );
+        fullNameField.setTypeface( Res.get( this ).exo_Thin() );
         fullNameField.setPaintFlags( fullNameField.getPaintFlags() | Paint.SUBPIXEL_TEXT_FLAG );
-        masterPasswordField.setTypeface( Res.get( this ).sourceCodePro_ExtraLight );
+        masterPasswordField.setTypeface( Res.get( this ).sourceCodePro_ExtraLight() );
         masterPasswordField.setPaintFlags( masterPasswordField.getPaintFlags() | Paint.SUBPIXEL_TEXT_FLAG );
-        siteNameField.setTypeface( Res.get( this ).exo_Regular );
+        siteNameField.setTypeface( Res.get( this ).exo_Regular() );
         siteNameField.setPaintFlags( siteNameField.getPaintFlags() | Paint.SUBPIXEL_TEXT_FLAG );
-        sitePasswordField.setTypeface( Res.get( this ).sourceCodePro_Black );
+        sitePasswordField.setTypeface( Res.get( this ).sourceCodePro_Black() );
         sitePasswordField.setPaintFlags( sitePasswordField.getPaintFlags() | Paint.SUBPIXEL_TEXT_FLAG );
 
         rememberFullNameField.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
@@ -211,7 +227,7 @@ public class EmergencyActivity extends Activity {
     protected void onResume() {
         super.onResume();
 
-// FIXME:       MasterKey.setAllowNativeByDefault( preferences.isAllowNativeKDF() );
+        // FIXME:       MasterKey.setAllowNativeByDefault( preferences.isAllowNativeKDF() );
 
         fullNameField.setText( preferences.getFullName() );
         rememberFullNameField.setChecked( preferences.isRememberFullName() );
@@ -221,10 +237,10 @@ public class EmergencyActivity extends Activity {
         MPResultType defaultResultType = preferences.getDefaultResultType();
         resultTypeButton.setTag( defaultResultType );
         resultTypeButton.setText( defaultResultType.getShortName() );
-        MPMasterKey.Version defaultVersion = preferences.getDefaultVersion();
+        MPAlgorithm.Version defaultVersion = preferences.getDefaultVersion();
         siteVersionButton.setTag( defaultVersion );
         siteVersionButton.setText( defaultVersion.name() );
-        siteCounterButton.setText( MessageFormat.format( "{0}", 1 ) );
+        siteCounterButton.setText( MessageFormat.format( "{0}", UnsignedInteger.ONE ) );
 
         if (TextUtils.isEmpty( fullNameField.getText() ))
             fullNameField.requestFocus();
@@ -254,8 +270,8 @@ public class EmergencyActivity extends Activity {
     }
 
     private synchronized void updateMasterKey() {
-        final String fullName = fullNameField.getText().toString();
-        final char[] masterPassword = masterPasswordField.getText().toString().toCharArray();
+        String fullName       = fullNameField.getText().toString();
+        char[] masterPassword = masterPasswordField.getText().toString().toCharArray();
         if ((id_userName == fullName.hashCode())
             && (id_masterPassword == Arrays.hashCode( masterPassword )))
             if (masterKey != null)
@@ -283,7 +299,7 @@ public class EmergencyActivity extends Activity {
         final String              siteName = siteNameField.getText().toString();
         final MPResultType        type     = (MPResultType) resultTypeButton.getTag();
         final UnsignedInteger     counter  = UnsignedInteger.valueOf( siteCounterButton.getText().toString() );
-        final MPMasterKey.Version version  = (MPMasterKey.Version) siteVersionButton.getTag();
+        final MPAlgorithm.Version version  = (MPAlgorithm.Version) siteVersionButton.getTag();
 
         if ((masterKey == null) || siteName.isEmpty() || (type == null)) {
             sitePasswordField.setText( "" );
@@ -300,7 +316,8 @@ public class EmergencyActivity extends Activity {
             @Override
             public void run() {
                 try {
-                    sitePassword = masterKey.siteResult( siteName, counter, MPKeyPurpose.Authentication, null, type, null, version );
+                    sitePassword = masterKey.siteResult( siteName, version.getAlgorithm(), counter,
+                                                         MPKeyPurpose.Authentication, null, type, null );
 
                     runOnUiThread( new Runnable() {
                         @Override
@@ -310,59 +327,59 @@ public class EmergencyActivity extends Activity {
                         }
                     } );
                 }
-                catch (final MPInvalidatedException ignored) {
+                catch (final MPKeyUnavailableException ignored) {
                     sitePasswordField.setText( "" );
                     progressView.setVisibility( View.INVISIBLE );
                 }
-                catch (final RuntimeException e) {
+                catch (final MPAlgorithmException e) {
                     sitePasswordField.setText( "" );
                     progressView.setVisibility( View.INVISIBLE );
                     logger.err( e, "While generating site password." );
-                    throw e;
                 }
             }
         } );
     }
 
-    public void integrityTests(final View view) {
-        if (masterKey != null)
-            masterKey = null;
-
-        TestActivity.startNoSkip( this );
-    }
-
     public void copySitePassword(final View view) {
         final String currentSitePassword = sitePassword;
         if (TextUtils.isEmpty( currentSitePassword ))
             return;
 
-        final ClipboardManager clipboardManager = (ClipboardManager) getSystemService( CLIPBOARD_SERVICE );
+        final ClipboardManager    clipboardManager    = (ClipboardManager) getSystemService( CLIPBOARD_SERVICE );
         final NotificationManager notificationManager = (NotificationManager) getSystemService( Context.NOTIFICATION_SERVICE );
+        if (clipboardManager == null)
+            return;
 
-        String title = strf( "Password for %s", siteNameField.getText() );
+        String          title       = strf( "Password for %s", siteNameField.getText() );
         ClipDescription description = new ClipDescription( title, new String[]{ ClipDescription.MIMETYPE_TEXT_PLAIN } );
         clipboardManager.setPrimaryClip( new ClipData( description, new ClipData.Item( currentSitePassword ) ) );
 
-        Notification.Builder notificationBuilder = new Notification.Builder( this ).setContentTitle( title )
-                                                                                   .setContentText( "Paste the password into your app." )
-                                                                                   .setSmallIcon( R.drawable.icon )
-                                                                                   .setAutoCancel( true );
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-            notificationBuilder.setVisibility( Notification.VISIBILITY_SECRET )
-                               .setCategory( Notification.CATEGORY_RECOMMENDATION )
-                               .setLocalOnly( true );
-        notificationManager.notify( PASSWORD_NOTIFICATION, notificationBuilder.build() );
+        if (notificationManager != null) {
+            Notification.Builder notificationBuilder = new Notification.Builder( this ).setContentTitle( title )
+                                                                                       .setContentText(
+                                                                                               "Paste the password into your app." )
+                                                                                       .setSmallIcon( R.drawable.icon )
+                                                                                       .setAutoCancel( true );
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+                notificationBuilder.setVisibility( Notification.VISIBILITY_SECRET )
+                                   .setCategory( Notification.CATEGORY_RECOMMENDATION )
+                                   .setLocalOnly( true );
+            notificationManager.notify( PASSWORD_NOTIFICATION, notificationBuilder.build() );
+        }
+
         final Timer timer = new Timer();
         timer.schedule( new TimerTask() {
             @Override
             public void run() {
                 ClipData clip = clipboardManager.getPrimaryClip();
                 for (int i = 0; i < clip.getItemCount(); ++i)
-                    if (currentSitePassword.equals( clip.getItemAt( i ).coerceToText( EmergencyActivity.this ) )) {
+                    if (currentSitePassword.contentEquals( clip.getItemAt( i ).coerceToText( EmergencyActivity.this ) )) {
                         clipboardManager.setPrimaryClip( EMPTY_CLIP );
                         break;
                     }
-                notificationManager.cancel( PASSWORD_NOTIFICATION );
+
+                if (notificationManager != null)
+                    notificationManager.cancel( PASSWORD_NOTIFICATION );
                 timer.cancel();
             }
         }, CLIPBOARD_CLEAR_DELAY );

platform-android/src/main/java/com/lyndir/masterpassword/MPConstants.java

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

platform-android/src/main/java/com/lyndir/masterpassword/MainThreadExecutor.java

@@ -22,8 +22,10 @@ import android.os.Handler;
 import android.os.Looper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
-import java.util.*;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.*;
+import javax.annotation.Nonnull;
 
 
 /**
@@ -33,7 +35,7 @@ public class MainThreadExecutor extends AbstractExecutorService {
 
     private final Handler       mHandler = new Handler( Looper.getMainLooper() );
     private final Set<Runnable> commands = Sets.newLinkedHashSet();
-    private boolean shutdown;
+    private       boolean       shutdown;
 
     @Override
     public void execute(final Runnable command) {
@@ -63,6 +65,7 @@ public class MainThreadExecutor extends AbstractExecutorService {
         shutdown = true;
     }
 
+    @Nonnull
     @Override
     public List<Runnable> shutdownNow() {
         shutdown = true;

platform-android/src/main/java/com/lyndir/masterpassword/Preferences.java

@@ -32,15 +32,15 @@ import javax.annotation.Nullable;
  */
 public final class Preferences {
 
-    private static final String PREF_TESTS_PASSED       = "integrityTestsPassed";
-    private static final String PREF_NATIVE_KDF         = "nativeKDF";
-    private static final String PREF_REMEMBER_FULL_NAME = "rememberFullName";
-    private static final String PREF_FORGET_PASSWORD    = "forgetPassword";
-    private static final String PREF_MASK_PASSWORD      = "maskPassword";
-    private static final String PREF_FULL_NAME          = "fullName";
-    private static final String PREF_RESULT_TYPE        = "resultType";
-    private static final String PREF_ALGORITHM_VERSION  = "algorithmVersion";
-    private static Preferences instance;
+    private static final String      PREF_TESTS_PASSED       = "integrityTestsPassed";
+    private static final String      PREF_NATIVE_KDF         = "nativeKDF";
+    private static final String      PREF_REMEMBER_FULL_NAME = "rememberFullName";
+    private static final String      PREF_FORGET_PASSWORD    = "forgetPassword";
+    private static final String      PREF_MASK_PASSWORD      = "maskPassword";
+    private static final String      PREF_FULL_NAME          = "fullName";
+    private static final String      PREF_RESULT_TYPE        = "resultType";
+    private static final String      PREF_ALGORITHM_VERSION  = "algorithmVersion";
+    private static       Preferences instance;
 
     private Context           context;
     @Nullable
@@ -86,7 +86,7 @@ public final class Preferences {
     }
 
     public Set<String> getTestsPassed() {
-        return prefs().getStringSet( PREF_TESTS_PASSED, ImmutableSet.<String>of() );
+        return prefs().getStringSet( PREF_TESTS_PASSED, ImmutableSet.of() );
     }
 
     public boolean setRememberFullName(final boolean enabled) {
@@ -148,10 +148,11 @@ public final class Preferences {
 
     @Nonnull
     public MPResultType getDefaultResultType() {
-        return MPResultType.values()[prefs().getInt( PREF_RESULT_TYPE, MPResultType.DEFAULT.ordinal() )];
+        return MPResultType.values()[
+                prefs().getInt( PREF_RESULT_TYPE, getDefaultVersion().getAlgorithm().mpw_default_result_type().ordinal() )];
     }
 
-    public boolean setDefaultVersion(final MPMasterKey.Version value) {
+    public boolean setDefaultVersion(final MPAlgorithm.Version value) {
         if (getDefaultVersion() == value)
             return false;
 
@@ -160,7 +161,8 @@ public final class Preferences {
     }
 
     @Nonnull
-    public MPMasterKey.Version getDefaultVersion() {
-        return MPMasterKey.Version.values()[prefs().getInt( PREF_ALGORITHM_VERSION, MPMasterKey.Version.CURRENT.ordinal() )];
+    public MPAlgorithm.Version getDefaultVersion() {
+        return MPAlgorithm.Version.values()[
+                prefs().getInt( PREF_ALGORITHM_VERSION, MPAlgorithm.Version.CURRENT.ordinal() )];
     }
 }

platform-android/src/main/java/com/lyndir/masterpassword/Res.java

@@ -19,21 +19,21 @@
 package com.lyndir.masterpassword;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Typeface;
 
 
 /**
  * @author lhunath, 2014-08-25
  */
+@SuppressWarnings("NewMethodNamingConvention")
 public final class Res {
 
-    public final Typeface sourceCodePro_Black;
-    public final Typeface sourceCodePro_ExtraLight;
-    public final Typeface exo_Bold;
-    public final Typeface exo_ExtraBold;
-    public final Typeface exo_Regular;
-    public final Typeface exo_Thin;
+    private final Typeface sourceCodePro_Black;
+    private final Typeface sourceCodePro_ExtraLight;
+    private final Typeface exo_Bold;
+    private final Typeface exo_ExtraBold;
+    private final Typeface exo_Regular;
+    private final Typeface exo_Thin;
 
     private static Res res;
 
@@ -54,4 +54,28 @@ public final class Res {
         exo_Regular = Typeface.createFromAsset( context.getResources().getAssets(), "Exo2.0-Regular.otf" );
         exo_Thin = Typeface.createFromAsset( context.getResources().getAssets(), "Exo2.0-Thin.otf" );
     }
+
+    public Typeface sourceCodePro_Black() {
+        return sourceCodePro_Black;
+    }
+
+    public Typeface sourceCodePro_ExtraLight() {
+        return sourceCodePro_ExtraLight;
+    }
+
+    public Typeface exo_Bold() {
+        return exo_Bold;
+    }
+
+    public Typeface exo_ExtraBold() {
+        return exo_ExtraBold;
+    }
+
+    public Typeface exo_Regular() {
+        return exo_Regular;
+    }
+
+    public Typeface exo_Thin() {
+        return exo_Thin;
+    }
 }

platform-android/src/main/java/com/lyndir/masterpassword/TestActivity.java

@@ -1,194 +0,0 @@
-//==============================================================================
-// This file is part of Master Password.
-// Copyright (c) 2011-2017, Maarten Billemont.
-//
-// Master Password is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Master Password is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You can find a copy of the GNU General Public License in the
-// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
-//==============================================================================
-
-package com.lyndir.masterpassword;
-
-import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
-
-import android.app.*;
-import android.content.Context;
-import android.content.Intent;
-import android.os.*;
-import android.view.View;
-import android.widget.*;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import com.google.common.base.*;
-import com.google.common.collect.*;
-import com.google.common.util.concurrent.*;
-import com.lyndir.lhunath.opal.system.logging.Logger;
-import java.util.concurrent.*;
-import javax.annotation.Nullable;
-
-
-public class TestActivity extends Activity implements MPTestSuite.Listener {
-
-    @SuppressWarnings("UnusedDeclaration")
-    private static final Logger logger = Logger.get( TestActivity.class );
-
-    private final Preferences              preferences        = Preferences.get( this );
-    private final ListeningExecutorService backgroundExecutor = MoreExecutors.listeningDecorator( Executors.newSingleThreadExecutor() );
-    private final ListeningExecutorService mainExecutor       = MoreExecutors.listeningDecorator( new MainThreadExecutor() );
-
-    @BindView(R.id.progressView)
-    ProgressBar progressView;
-
-    @BindView(R.id.statusView)
-    TextView statusView;
-
-    @BindView(R.id.logView)
-    TextView logView;
-
-    @BindView(R.id.actionButton)
-    Button actionButton;
-
-    @BindView(R.id.nativeKDFField)
-    CheckBox nativeKDFField;
-
-    private MPTestSuite               testSuite;
-    private ListenableFuture<Boolean> testFuture;
-    private Runnable                  action;
-    private ImmutableSet<String>      testNames;
-
-    public static void startNoSkip(final Context context) {
-        context.startActivity( new Intent( context, TestActivity.class ) );
-    }
-
-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate( savedInstanceState );
-
-        setContentView( R.layout.activity_test );
-        ButterKnife.bind( this );
-
-        nativeKDFField.setOnCheckedChangeListener( new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(final CompoundButton buttonView, final boolean isChecked) {
-                preferences.setNativeKDFEnabled( isChecked );
-                // TODO: MasterKey.setAllowNativeByDefault( isChecked );
-            }
-        } );
-
-        try {
-            setStatus( 0, 0, null );
-            testSuite = new MPTestSuite();
-            testSuite.setListener( this );
-            testNames = FluentIterable.from( testSuite.getTests().getCases() ).transform(
-                    new Function<MPTests.Case, String>() {
-                        @Nullable
-                        @Override
-                        public String apply(@Nullable final MPTests.Case input) {
-                            return (input == null)? null: input.identifier;
-                        }
-                    } ).filter( Predicates.notNull() ).toSet();
-        }
-        catch (final MPTestSuite.UnavailableException e) {
-            logger.err( e, "While loading test suite" );
-            setStatus( R.string.tests_unavailable, R.string.tests_btn_unavailable, new Runnable() {
-                @Override
-                public void run() {
-                    finish();
-                }
-            } );
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        nativeKDFField.setChecked( preferences.isAllowNativeKDF() );
-
-        if (testFuture == null)
-            startTestSuite();
-    }
-
-    private void startTestSuite() {
-        if (testFuture != null)
-            testFuture.cancel( true );
-
-        // TODO: MasterKey.setAllowNativeByDefault( preferences.isAllowNativeKDF() );
-
-        setStatus( R.string.tests_testing, R.string.tests_btn_testing, null );
-        Futures.addCallback( testFuture = backgroundExecutor.submit( testSuite ), new FutureCallback<Boolean>() {
-            @Override
-            public void onSuccess(@Nullable final Boolean result) {
-                if ((result != null) && result)
-                    setStatus( R.string.tests_passed, R.string.tests_btn_passed, new Runnable() {
-                        @Override
-                        public void run() {
-                            preferences.setTestsPassed( testNames );
-                            finish();
-                        }
-                    } );
-                else
-                    setStatus( R.string.tests_failed, R.string.tests_btn_failed, new Runnable() {
-                        @Override
-                        public void run() {
-                            startTestSuite();
-                        }
-                    } );
-            }
-
-            @Override
-            public void onFailure(final Throwable t) {
-                logger.err( t, "While running test suite" );
-                setStatus( R.string.tests_failed, R.string.tests_btn_failed, new Runnable() {
-                    @Override
-                    public void run() {
-                        finish();
-                    }
-                } );
-            }
-        }, mainExecutor );
-    }
-
-    public void onAction(final View v) {
-        if (action != null)
-            action.run();
-    }
-
-    private void setStatus(final int statusId, final int buttonId, @Nullable final Runnable action) {
-        this.action = action;
-
-        if (statusId == 0)
-            statusView.setText( null );
-        else
-            statusView.setText( statusId );
-
-        if (buttonId == 0)
-            actionButton.setText( null );
-        else
-            actionButton.setText( buttonId );
-        actionButton.setEnabled( action != null );
-    }
-
-    @Override
-    public void progress(final int current, final int max, final String messageFormat, final Object... args) {
-        runOnUiThread( new Runnable() {
-            @Override
-            public void run() {
-                logView.append( strf( "%n" + messageFormat, args ) );
-
-                progressView.setMax( max );
-                progressView.setProgress( current );
-            }
-        } );
-    }
-}
-

platform-android/src/main/res/layout/activity_emergency.xml

@@ -253,15 +253,6 @@
             </LinearLayout>
         </LinearLayout>
 
-        <Button
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textSize="16sp"
-                android:text="@string/btn_tests"
-                android:onClick="integrityTests"
-                android:background="@android:color/transparent" />
-
         <View
                 android:layout_width="1dp"
                 android:layout_height="0dp"

platform-android/src/main/res/layout/activity_test.xml

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:tools="http://schemas.android.com/tools"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fillViewport="true">
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="20dp"
-            android:orientation="vertical"
-            android:gravity="center">
-
-        <View
-                android:layout_width="1dp"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-
-        <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:importantForAccessibility="no"
-                android:src="@drawable/img_stats" />
-
-        <ProgressBar
-                android:id="@+id/progressView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="8dp"
-                tools:max="100"
-                tools:progress="80"
-                style="?android:progressBarStyleHorizontal" />
-
-        <TextView
-                android:id="@+id/statusView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:labelFor="@id/sitePasswordField"
-                android:gravity="center"
-                android:background="@android:color/transparent"
-                android:textSize="12sp"
-                android:textColor="@android:color/tertiary_text_dark"
-                android:text="@string/tests_testing" />
-
-        <TextView
-                android:id="@+id/logView"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_marginTop="20dp"
-                android:gravity="bottom"
-                android:background="@android:color/transparent"
-                android:textIsSelectable="true"
-                android:textSize="9sp"
-                android:textColor="@android:color/tertiary_text_dark" />
-
-        <Button
-                android:id="@+id/actionButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:enabled="false"
-                android:text="@string/tests_btn_testing"
-                android:onClick="onAction" />
-
-        <CheckBox
-                android:id="@+id/nativeKDFField"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="12sp"
-                android:textColor="@android:color/tertiary_text_dark"
-                android:text="@string/nativeKDF" />
-    </LinearLayout>
-
-</ScrollView>

platform-darwin/MasterPassword-JNI.xcodeproj/project.pbxproj

@@ -0,0 +1,184 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXFileReference section */
+		DA1554DE20B3928E00EA92C5 /* aes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aes.c; sourceTree = "<group>"; };
+		DA1554DF20B3928E00EA92C5 /* mpw-algorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-algorithm.h"; sourceTree = "<group>"; };
+		DA1554E020B3928E00EA92C5 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base64.h; sourceTree = "<group>"; };
+		DA1554E120B3928E00EA92C5 /* mpw-marshal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-marshal.c"; sourceTree = "<group>"; };
+		DA1554E220B3928E00EA92C5 /* mpw-algorithm_v2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v2.c"; sourceTree = "<group>"; };
+		DA1554E320B3928E00EA92C5 /* mpw-types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-types.c"; sourceTree = "<group>"; };
+		DA1554E420B3928E00EA92C5 /* mpw-marshal-util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-marshal-util.c"; sourceTree = "<group>"; };
+		DA1554E520B3928E00EA92C5 /* mpw-util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-util.c"; sourceTree = "<group>"; };
+		DA1554E620B3928E00EA92C5 /* mpw-algorithm_v1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v1.c"; sourceTree = "<group>"; };
+		DA1554E720B3928E00EA92C5 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = "<group>"; };
+		DA1554E820B3928E00EA92C5 /* mpw-marshal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-marshal.h"; sourceTree = "<group>"; };
+		DA1554E920B3928E00EA92C5 /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base64.c; sourceTree = "<group>"; };
+		DA1554EA20B3928E00EA92C5 /* mpw-algorithm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm.c"; sourceTree = "<group>"; };
+		DA1554EB20B3928E00EA92C5 /* mpw-algorithm_v0.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v0.c"; sourceTree = "<group>"; };
+		DA1554EC20B3928E00EA92C5 /* mpw-types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-types.h"; sourceTree = "<group>"; };
+		DA1554ED20B3928E00EA92C5 /* mpw-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-util.h"; sourceTree = "<group>"; };
+		DA1554EE20B3928E00EA92C5 /* mpw-marshal-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-marshal-util.h"; sourceTree = "<group>"; };
+		DA1554EF20B3928E00EA92C5 /* mpw-algorithm_v3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v3.c"; sourceTree = "<group>"; };
+		DA1F44B020BCF0C200957B45 /* mpw-jni.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-jni.h"; sourceTree = "<group>"; };
+		DA1F44B120BCF0C200957B45 /* mpw-jni.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-jni.c"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXGroup section */
+		DA1554D220B3924000EA92C5 = {
+			isa = PBXGroup;
+			children = (
+				DA1554DD20B3928E00EA92C5 /* core */,
+			);
+			sourceTree = "<group>";
+		};
+		DA1554DD20B3928E00EA92C5 /* core */ = {
+			isa = PBXGroup;
+			children = (
+				DA1554DE20B3928E00EA92C5 /* aes.c */,
+				DA1554E720B3928E00EA92C5 /* aes.h */,
+				DA1554E920B3928E00EA92C5 /* base64.c */,
+				DA1554E020B3928E00EA92C5 /* base64.h */,
+				DA1554EB20B3928E00EA92C5 /* mpw-algorithm_v0.c */,
+				DA1554E620B3928E00EA92C5 /* mpw-algorithm_v1.c */,
+				DA1554E220B3928E00EA92C5 /* mpw-algorithm_v2.c */,
+				DA1554EF20B3928E00EA92C5 /* mpw-algorithm_v3.c */,
+				DA1554EA20B3928E00EA92C5 /* mpw-algorithm.c */,
+				DA1554DF20B3928E00EA92C5 /* mpw-algorithm.h */,
+				DA1F44B120BCF0C200957B45 /* mpw-jni.c */,
+				DA1F44B020BCF0C200957B45 /* mpw-jni.h */,
+				DA1554E420B3928E00EA92C5 /* mpw-marshal-util.c */,
+				DA1554EE20B3928E00EA92C5 /* mpw-marshal-util.h */,
+				DA1554E120B3928E00EA92C5 /* mpw-marshal.c */,
+				DA1554E820B3928E00EA92C5 /* mpw-marshal.h */,
+				DA1554E320B3928E00EA92C5 /* mpw-types.c */,
+				DA1554EC20B3928E00EA92C5 /* mpw-types.h */,
+				DA1554E520B3928E00EA92C5 /* mpw-util.c */,
+				DA1554ED20B3928E00EA92C5 /* mpw-util.h */,
+			);
+			name = core;
+			path = "../platform-independent/c/core/src";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXLegacyTarget section */
+		DA1554D720B3924000EA92C5 /* MasterPassword-JNI */ = {
+			isa = PBXLegacyTarget;
+			buildArgumentsString = ":masterpassword-algorithm:nativeGenHeaders";
+			buildConfigurationList = DA1554DA20B3924000EA92C5 /* Build configuration list for PBXLegacyTarget "MasterPassword-JNI" */;
+			buildPhases = (
+			);
+			buildToolPath = gradle;
+			buildWorkingDirectory = /Users/lhunath/Documents/workspace/lyndir/MasterPassword/gradle;
+			dependencies = (
+			);
+			name = "MasterPassword-JNI";
+			passBuildSettingsInEnvironment = 1;
+			productName = "MasterPassword-JNI";
+		};
+/* End PBXLegacyTarget section */
+
+/* Begin PBXProject section */
+		DA1554D320B3924000EA92C5 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0930;
+				ORGANIZATIONNAME = "Maarten Billemont";
+				TargetAttributes = {
+					DA1554D720B3924000EA92C5 = {
+						CreatedOnToolsVersion = 9.3.1;
+					};
+				};
+			};
+			buildConfigurationList = DA1554D620B3924000EA92C5 /* Build configuration list for PBXProject "MasterPassword-JNI" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = DA1554D220B3924000EA92C5;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				DA1554D720B3924000EA92C5 /* MasterPassword-JNI */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin XCBuildConfiguration section */
+		DA1554D820B3924000EA92C5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		DA1554D920B3924000EA92C5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		DA1554DB20B3924000EA92C5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/include\"",
+				);
+				JAVA_HOME = /Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home;
+				OTHER_CFLAGS = (
+					"-DMPW_SODIUM=1",
+					"-DMPW_CPERCIVA=0",
+				);
+			};
+			name = Debug;
+		};
+		DA1554DC20B3924000EA92C5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/include\"",
+				);
+				JAVA_HOME = /Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home;
+				OTHER_CFLAGS = (
+					"-DMPW_SODIUM=1",
+					"-DMPW_CPERCIVA=0",
+				);
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		DA1554D620B3924000EA92C5 /* Build configuration list for PBXProject "MasterPassword-JNI" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DA1554D820B3924000EA92C5 /* Debug */,
+				DA1554D920B3924000EA92C5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		DA1554DA20B3924000EA92C5 /* Build configuration list for PBXLegacyTarget "MasterPassword-JNI" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DA1554DB20B3924000EA92C5 /* Debug */,
+				DA1554DC20B3924000EA92C5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = DA1554D320B3924000EA92C5 /* Project object */;
+}

platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj

@@ -69,7 +69,6 @@
 		DA071BF3190187FE00179766 /* empty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF1190187FE00179766 /* empty@2x.png */; };
 		DA071BF4190187FE00179766 /* empty.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF2190187FE00179766 /* empty.png */; };
 		DA095E75172F4CD8001C948B /* MPLogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3979190DACEBD1F6AE9F4 /* MPLogsViewController.m */; };
-		DA0979171E9A81EE00F0BFE8 /* libsodium.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA0979161E9A81EE00F0BFE8 /* libsodium.a */; };
 		DA0CC5291EAB99BA009A8ED9 /* IASKAppSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5071EAB99BA009A8ED9 /* IASKAppSettingsViewController.m */; };
 		DA0CC52A1EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5091EAB99BA009A8ED9 /* IASKAppSettingsWebViewController.m */; };
 		DA0CC52B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC50B1EAB99BA009A8ED9 /* IASKMultipleValueSelection.m */; };
@@ -241,6 +240,7 @@
 		DAA1765319D8B82B0044227B /* choose_type@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA1763D19D8B82B0044227B /* choose_type@2x.png */; };
 		DAA1765419D8B82B0044227B /* choose_type.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA1763E19D8B82B0044227B /* choose_type.png */; };
 		DAA449D21EEC4B5800E7BDD5 /* mpw-marshal.c in Sources */ = {isa = PBXBuildFile; fileRef = DAA449D01EEC4B5800E7BDD5 /* mpw-marshal.c */; };
+		DAA7BC2720C4C27100101DC7 /* libsodium.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAA7BB8A20C4C10F00101DC7 /* libsodium.a */; };
 		DAADBFE01A68763B00F7A756 /* mpw-algorithm.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D3969393A3A46BD27D7078 /* mpw-algorithm.c */; };
 		DAB07C9D1F7725C500CC6D43 /* aes.c in Sources */ = {isa = PBXBuildFile; fileRef = DAB07C9B1F7725C500CC6D43 /* aes.c */; };
 		DAB4FBC4202FDDDD002768FB /* NSInvocation+Pearl.h in Headers */ = {isa = PBXBuildFile; fileRef = DAB4FBC2202FDDDC002768FB /* NSInvocation+Pearl.h */; };
@@ -587,65 +587,6 @@
 		DA04E33D14B1E70400ECA4F3 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		DA071BF1190187FE00179766 /* empty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "empty@2x.png"; sourceTree = "<group>"; };
 		DA071BF2190187FE00179766 /* empty.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = empty.png; sourceTree = "<group>"; };
-		DA0978DB1E9A81EE00F0BFE8 /* core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = core.h; sourceTree = "<group>"; };
-		DA0978DC1E9A81EE00F0BFE8 /* crypto_aead_aes256gcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_aes256gcm.h; sourceTree = "<group>"; };
-		DA0978DD1E9A81EE00F0BFE8 /* crypto_aead_chacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_chacha20poly1305.h; sourceTree = "<group>"; };
-		DA0978DE1E9A81EE00F0BFE8 /* crypto_aead_xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_xchacha20poly1305.h; sourceTree = "<group>"; };
-		DA0978DF1E9A81EE00F0BFE8 /* crypto_auth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth.h; sourceTree = "<group>"; };
-		DA0978E01E9A81EE00F0BFE8 /* crypto_auth_hmacsha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha256.h; sourceTree = "<group>"; };
-		DA0978E11E9A81EE00F0BFE8 /* crypto_auth_hmacsha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha512.h; sourceTree = "<group>"; };
-		DA0978E21E9A81EE00F0BFE8 /* crypto_auth_hmacsha512256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha512256.h; sourceTree = "<group>"; };
-		DA0978E31E9A81EE00F0BFE8 /* crypto_box.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box.h; sourceTree = "<group>"; };
-		DA0978E41E9A81EE00F0BFE8 /* crypto_box_curve25519xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box_curve25519xchacha20poly1305.h; sourceTree = "<group>"; };
-		DA0978E51E9A81EE00F0BFE8 /* crypto_box_curve25519xsalsa20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box_curve25519xsalsa20poly1305.h; sourceTree = "<group>"; };
-		DA0978E61E9A81EE00F0BFE8 /* crypto_core_hchacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_hchacha20.h; sourceTree = "<group>"; };
-		DA0978E71E9A81EE00F0BFE8 /* crypto_core_hsalsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_hsalsa20.h; sourceTree = "<group>"; };
-		DA0978E81E9A81EE00F0BFE8 /* crypto_core_salsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa20.h; sourceTree = "<group>"; };
-		DA0978E91E9A81EE00F0BFE8 /* crypto_core_salsa2012.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa2012.h; sourceTree = "<group>"; };
-		DA0978EA1E9A81EE00F0BFE8 /* crypto_core_salsa208.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa208.h; sourceTree = "<group>"; };
-		DA0978EB1E9A81EE00F0BFE8 /* crypto_generichash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_generichash.h; sourceTree = "<group>"; };
-		DA0978EC1E9A81EE00F0BFE8 /* crypto_generichash_blake2b.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_generichash_blake2b.h; sourceTree = "<group>"; };
-		DA0978ED1E9A81EE00F0BFE8 /* crypto_hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash.h; sourceTree = "<group>"; };
-		DA0978EE1E9A81EE00F0BFE8 /* crypto_hash_sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash_sha256.h; sourceTree = "<group>"; };
-		DA0978EF1E9A81EE00F0BFE8 /* crypto_hash_sha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash_sha512.h; sourceTree = "<group>"; };
-		DA0978F01E9A81EE00F0BFE8 /* crypto_kdf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kdf.h; sourceTree = "<group>"; };
-		DA0978F11E9A81EE00F0BFE8 /* crypto_kdf_blake2b.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kdf_blake2b.h; sourceTree = "<group>"; };
-		DA0978F21E9A81EE00F0BFE8 /* crypto_kx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kx.h; sourceTree = "<group>"; };
-		DA0978F31E9A81EE00F0BFE8 /* crypto_onetimeauth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_onetimeauth.h; sourceTree = "<group>"; };
-		DA0978F41E9A81EE00F0BFE8 /* crypto_onetimeauth_poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_onetimeauth_poly1305.h; sourceTree = "<group>"; };
-		DA0978F51E9A81EE00F0BFE8 /* crypto_pwhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash.h; sourceTree = "<group>"; };
-		DA0978F61E9A81EE00F0BFE8 /* crypto_pwhash_argon2i.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash_argon2i.h; sourceTree = "<group>"; };
-		DA0978F71E9A81EE00F0BFE8 /* crypto_pwhash_scryptsalsa208sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash_scryptsalsa208sha256.h; sourceTree = "<group>"; };
-		DA0978F81E9A81EE00F0BFE8 /* crypto_scalarmult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult.h; sourceTree = "<group>"; };
-		DA0978F91E9A81EE00F0BFE8 /* crypto_scalarmult_curve25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult_curve25519.h; sourceTree = "<group>"; };
-		DA0978FA1E9A81EE00F0BFE8 /* crypto_secretbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox.h; sourceTree = "<group>"; };
-		DA0978FB1E9A81EE00F0BFE8 /* crypto_secretbox_xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox_xchacha20poly1305.h; sourceTree = "<group>"; };
-		DA0978FC1E9A81EE00F0BFE8 /* crypto_secretbox_xsalsa20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox_xsalsa20poly1305.h; sourceTree = "<group>"; };
-		DA0978FD1E9A81EE00F0BFE8 /* crypto_shorthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_shorthash.h; sourceTree = "<group>"; };
-		DA0978FE1E9A81EE00F0BFE8 /* crypto_shorthash_siphash24.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_shorthash_siphash24.h; sourceTree = "<group>"; };
-		DA0978FF1E9A81EE00F0BFE8 /* crypto_sign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign.h; sourceTree = "<group>"; };
-		DA0979001E9A81EE00F0BFE8 /* crypto_sign_ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign_ed25519.h; sourceTree = "<group>"; };
-		DA0979011E9A81EE00F0BFE8 /* crypto_sign_edwards25519sha512batch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign_edwards25519sha512batch.h; sourceTree = "<group>"; };
-		DA0979021E9A81EE00F0BFE8 /* crypto_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream.h; sourceTree = "<group>"; };
-		DA0979031E9A81EE00F0BFE8 /* crypto_stream_aes128ctr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_aes128ctr.h; sourceTree = "<group>"; };
-		DA0979041E9A81EE00F0BFE8 /* crypto_stream_chacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_chacha20.h; sourceTree = "<group>"; };
-		DA0979051E9A81EE00F0BFE8 /* crypto_stream_salsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa20.h; sourceTree = "<group>"; };
-		DA0979061E9A81EE00F0BFE8 /* crypto_stream_salsa2012.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa2012.h; sourceTree = "<group>"; };
-		DA0979071E9A81EE00F0BFE8 /* crypto_stream_salsa208.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa208.h; sourceTree = "<group>"; };
-		DA0979081E9A81EE00F0BFE8 /* crypto_stream_xchacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_xchacha20.h; sourceTree = "<group>"; };
-		DA0979091E9A81EE00F0BFE8 /* crypto_stream_xsalsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_xsalsa20.h; sourceTree = "<group>"; };
-		DA09790A1E9A81EE00F0BFE8 /* crypto_verify_16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_16.h; sourceTree = "<group>"; };
-		DA09790B1E9A81EE00F0BFE8 /* crypto_verify_32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_32.h; sourceTree = "<group>"; };
-		DA09790C1E9A81EE00F0BFE8 /* crypto_verify_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_64.h; sourceTree = "<group>"; };
-		DA09790D1E9A81EE00F0BFE8 /* export.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = export.h; sourceTree = "<group>"; };
-		DA09790E1E9A81EE00F0BFE8 /* randombytes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes.h; sourceTree = "<group>"; };
-		DA09790F1E9A81EE00F0BFE8 /* randombytes_salsa20_random.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes_salsa20_random.h; sourceTree = "<group>"; };
-		DA0979101E9A81EE00F0BFE8 /* randombytes_sysrandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes_sysrandom.h; sourceTree = "<group>"; };
-		DA0979111E9A81EE00F0BFE8 /* runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = runtime.h; sourceTree = "<group>"; };
-		DA0979121E9A81EE00F0BFE8 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
-		DA0979131E9A81EE00F0BFE8 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
-		DA0979141E9A81EE00F0BFE8 /* sodium.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sodium.h; sourceTree = "<group>"; };
-		DA0979161E9A81EE00F0BFE8 /* libsodium.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libsodium.a; sourceTree = "<group>"; };
 		DA0CC4F61EAB99BA009A8ED9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/IASKLocalizable.strings; sourceTree = "<group>"; };
 		DA0CC4F71EAB99BA009A8ED9 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/IASKLocalizable.strings; sourceTree = "<group>"; };
 		DA0CC4F81EAB99BA009A8ED9 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/IASKLocalizable.strings; sourceTree = "<group>"; };
@@ -871,6 +812,90 @@
 		DAA1763E19D8B82B0044227B /* choose_type.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = choose_type.png; sourceTree = "<group>"; };
 		DAA449D01EEC4B5800E7BDD5 /* mpw-marshal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-marshal.c"; sourceTree = "<group>"; };
 		DAA449D11EEC4B5800E7BDD5 /* mpw-marshal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-marshal.h"; sourceTree = "<group>"; };
+		DAA7BB7020C4C0C400101DC7 /* printbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printbuf.h; sourceTree = "<group>"; };
+		DAA7BB7120C4C0C400101DC7 /* math_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = math_compat.h; sourceTree = "<group>"; };
+		DAA7BB7220C4C0C400101DC7 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
+		DAA7BB7320C4C0C400101DC7 /* vasprintf_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vasprintf_compat.h; sourceTree = "<group>"; };
+		DAA7BB7420C4C0C400101DC7 /* json_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_util.h; sourceTree = "<group>"; };
+		DAA7BB7520C4C0C400101DC7 /* json_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_config.h; sourceTree = "<group>"; };
+		DAA7BB7620C4C0C400101DC7 /* json_pointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_pointer.h; sourceTree = "<group>"; };
+		DAA7BB7720C4C0C400101DC7 /* json_visit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_visit.h; sourceTree = "<group>"; };
+		DAA7BB7820C4C0C400101DC7 /* random_seed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = random_seed.h; sourceTree = "<group>"; };
+		DAA7BB7920C4C0C400101DC7 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json.h; sourceTree = "<group>"; };
+		DAA7BB7A20C4C0C400101DC7 /* json_c_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_c_version.h; sourceTree = "<group>"; };
+		DAA7BB7B20C4C0C400101DC7 /* json_object_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object_private.h; sourceTree = "<group>"; };
+		DAA7BB7C20C4C0C400101DC7 /* strerror_override.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strerror_override.h; sourceTree = "<group>"; };
+		DAA7BB7D20C4C0C400101DC7 /* arraylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = arraylist.h; sourceTree = "<group>"; };
+		DAA7BB7E20C4C0C400101DC7 /* linkhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linkhash.h; sourceTree = "<group>"; };
+		DAA7BB7F20C4C0C400101DC7 /* json_tokener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_tokener.h; sourceTree = "<group>"; };
+		DAA7BB8020C4C0C400101DC7 /* json_object_iterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object_iterator.h; sourceTree = "<group>"; };
+		DAA7BB8120C4C0C400101DC7 /* json_inttypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_inttypes.h; sourceTree = "<group>"; };
+		DAA7BB8220C4C0C400101DC7 /* bits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bits.h; sourceTree = "<group>"; };
+		DAA7BB8320C4C0C400101DC7 /* strdup_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strdup_compat.h; sourceTree = "<group>"; };
+		DAA7BB8420C4C0C400101DC7 /* json_object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object.h; sourceTree = "<group>"; };
+		DAA7BB8620C4C0C400101DC7 /* libjson-c.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libjson-c.a"; sourceTree = "<group>"; };
+		DAA7BB8A20C4C10F00101DC7 /* libsodium.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libsodium.a; sourceTree = "<group>"; };
+		DAA7BB8C20C4C10F00101DC7 /* crypto_stream_salsa2012.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa2012.h; sourceTree = "<group>"; };
+		DAA7BB8D20C4C10F00101DC7 /* crypto_auth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth.h; sourceTree = "<group>"; };
+		DAA7BB8E20C4C10F00101DC7 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
+		DAA7BB8F20C4C10F00101DC7 /* crypto_core_hchacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_hchacha20.h; sourceTree = "<group>"; };
+		DAA7BB9020C4C10F00101DC7 /* crypto_hash_sha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash_sha512.h; sourceTree = "<group>"; };
+		DAA7BB9120C4C10F00101DC7 /* core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = core.h; sourceTree = "<group>"; };
+		DAA7BB9220C4C10F00101DC7 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
+		DAA7BB9320C4C10F00101DC7 /* export.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = export.h; sourceTree = "<group>"; };
+		DAA7BB9420C4C10F00101DC7 /* randombytes_salsa20_random.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes_salsa20_random.h; sourceTree = "<group>"; };
+		DAA7BB9520C4C10F00101DC7 /* crypto_core_salsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa20.h; sourceTree = "<group>"; };
+		DAA7BB9620C4C10F00101DC7 /* crypto_shorthash_siphash24.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_shorthash_siphash24.h; sourceTree = "<group>"; };
+		DAA7BB9720C4C10F00101DC7 /* randombytes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes.h; sourceTree = "<group>"; };
+		DAA7BB9820C4C10F00101DC7 /* crypto_hash_sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash_sha256.h; sourceTree = "<group>"; };
+		DAA7BB9920C4C10F00101DC7 /* crypto_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream.h; sourceTree = "<group>"; };
+		DAA7BB9A20C4C10F00101DC7 /* crypto_auth_hmacsha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha512.h; sourceTree = "<group>"; };
+		DAA7BB9B20C4C10F00101DC7 /* crypto_aead_xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_xchacha20poly1305.h; sourceTree = "<group>"; };
+		DAA7BB9C20C4C10F00101DC7 /* crypto_stream_salsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa20.h; sourceTree = "<group>"; };
+		DAA7BB9D20C4C10F00101DC7 /* crypto_onetimeauth_poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_onetimeauth_poly1305.h; sourceTree = "<group>"; };
+		DAA7BB9E20C4C10F00101DC7 /* crypto_kx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kx.h; sourceTree = "<group>"; };
+		DAA7BB9F20C4C10F00101DC7 /* crypto_hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash.h; sourceTree = "<group>"; };
+		DAA7BBA020C4C10F00101DC7 /* crypto_sign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign.h; sourceTree = "<group>"; };
+		DAA7BBA120C4C10F00101DC7 /* crypto_kdf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kdf.h; sourceTree = "<group>"; };
+		DAA7BBA220C4C10F00101DC7 /* crypto_auth_hmacsha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha256.h; sourceTree = "<group>"; };
+		DAA7BBA320C4C10F00101DC7 /* crypto_box.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box.h; sourceTree = "<group>"; };
+		DAA7BBA420C4C10F00101DC7 /* crypto_verify_32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_32.h; sourceTree = "<group>"; };
+		DAA7BBA520C4C10F00101DC7 /* crypto_stream_xchacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_xchacha20.h; sourceTree = "<group>"; };
+		DAA7BBA620C4C10F00101DC7 /* crypto_core_salsa208.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa208.h; sourceTree = "<group>"; };
+		DAA7BBA720C4C10F00101DC7 /* crypto_auth_hmacsha512256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha512256.h; sourceTree = "<group>"; };
+		DAA7BBA820C4C10F00101DC7 /* crypto_aead_chacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_chacha20poly1305.h; sourceTree = "<group>"; };
+		DAA7BBA920C4C10F00101DC7 /* randombytes_sysrandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes_sysrandom.h; sourceTree = "<group>"; };
+		DAA7BBAA20C4C10F00101DC7 /* runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = runtime.h; sourceTree = "<group>"; };
+		DAA7BBAB20C4C10F00101DC7 /* crypto_stream_salsa208.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa208.h; sourceTree = "<group>"; };
+		DAA7BBAC20C4C10F00101DC7 /* crypto_aead_aes256gcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_aes256gcm.h; sourceTree = "<group>"; };
+		DAA7BBAD20C4C10F00101DC7 /* crypto_core_salsa2012.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa2012.h; sourceTree = "<group>"; };
+		DAA7BBAE20C4C10F00101DC7 /* crypto_secretbox_xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox_xchacha20poly1305.h; sourceTree = "<group>"; };
+		DAA7BBAF20C4C10F00101DC7 /* crypto_scalarmult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult.h; sourceTree = "<group>"; };
+		DAA7BBB020C4C10F00101DC7 /* crypto_pwhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash.h; sourceTree = "<group>"; };
+		DAA7BBB120C4C10F00101DC7 /* crypto_verify_16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_16.h; sourceTree = "<group>"; };
+		DAA7BBB220C4C10F00101DC7 /* crypto_stream_chacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_chacha20.h; sourceTree = "<group>"; };
+		DAA7BBB320C4C10F00101DC7 /* crypto_stream_xsalsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_xsalsa20.h; sourceTree = "<group>"; };
+		DAA7BBB420C4C10F00101DC7 /* crypto_core_hsalsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_hsalsa20.h; sourceTree = "<group>"; };
+		DAA7BBB520C4C10F00101DC7 /* crypto_kdf_blake2b.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kdf_blake2b.h; sourceTree = "<group>"; };
+		DAA7BBB620C4C10F00101DC7 /* crypto_scalarmult_curve25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult_curve25519.h; sourceTree = "<group>"; };
+		DAA7BBB720C4C10F00101DC7 /* crypto_shorthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_shorthash.h; sourceTree = "<group>"; };
+		DAA7BBB820C4C10F00101DC7 /* crypto_pwhash_argon2id.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash_argon2id.h; sourceTree = "<group>"; };
+		DAA7BBB920C4C10F00101DC7 /* crypto_secretstream_xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretstream_xchacha20poly1305.h; sourceTree = "<group>"; };
+		DAA7BBBA20C4C10F00101DC7 /* crypto_pwhash_scryptsalsa208sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash_scryptsalsa208sha256.h; sourceTree = "<group>"; };
+		DAA7BBBB20C4C10F00101DC7 /* crypto_sign_ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign_ed25519.h; sourceTree = "<group>"; };
+		DAA7BBBC20C4C10F00101DC7 /* crypto_onetimeauth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_onetimeauth.h; sourceTree = "<group>"; };
+		DAA7BBBD20C4C10F00101DC7 /* crypto_verify_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_64.h; sourceTree = "<group>"; };
+		DAA7BBBE20C4C10F00101DC7 /* crypto_box_curve25519xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box_curve25519xchacha20poly1305.h; sourceTree = "<group>"; };
+		DAA7BBBF20C4C10F00101DC7 /* crypto_core_ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_ed25519.h; sourceTree = "<group>"; };
+		DAA7BBC020C4C10F00101DC7 /* crypto_pwhash_argon2i.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash_argon2i.h; sourceTree = "<group>"; };
+		DAA7BBC120C4C10F00101DC7 /* crypto_generichash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_generichash.h; sourceTree = "<group>"; };
+		DAA7BBC220C4C10F00101DC7 /* crypto_secretbox_xsalsa20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox_xsalsa20poly1305.h; sourceTree = "<group>"; };
+		DAA7BBC320C4C10F00101DC7 /* crypto_secretbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox.h; sourceTree = "<group>"; };
+		DAA7BBC420C4C10F00101DC7 /* crypto_scalarmult_ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult_ed25519.h; sourceTree = "<group>"; };
+		DAA7BBC520C4C10F00101DC7 /* crypto_box_curve25519xsalsa20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box_curve25519xsalsa20poly1305.h; sourceTree = "<group>"; };
+		DAA7BBC620C4C10F00101DC7 /* crypto_generichash_blake2b.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_generichash_blake2b.h; sourceTree = "<group>"; };
+		DAA7BBC720C4C10F00101DC7 /* crypto_sign_edwards25519sha512batch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign_edwards25519sha512batch.h; sourceTree = "<group>"; };
+		DAA7BBC820C4C10F00101DC7 /* sodium.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sodium.h; sourceTree = "<group>"; };
 		DAAC35DD156BD77D00C5FD93 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
 		DAB07C9B1F7725C500CC6D43 /* aes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aes.c; sourceTree = "<group>"; };
 		DAB07C9C1F7725C500CC6D43 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = "<group>"; };
@@ -886,27 +911,6 @@
 		DAB4FBD2202FDE48002768FB /* WTFViews.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WTFViews.m; sourceTree = "<group>"; };
 		DAB4FBDB202FDE5E002768FB /* Pearl-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Pearl-Prefix.pch"; sourceTree = "<group>"; };
 		DAB7AE5C1F3D752900C856B1 /* libjson-c.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libjson-c.a"; path = "External/libjson-c/libjson-c-ios/lib/libjson-c.a"; sourceTree = "<group>"; };
-		DAB7AE611F3D755B00C856B1 /* arraylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = arraylist.h; sourceTree = "<group>"; };
-		DAB7AE621F3D755B00C856B1 /* bits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bits.h; sourceTree = "<group>"; };
-		DAB7AE631F3D755B00C856B1 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DAB7AE641F3D755B00C856B1 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json.h; sourceTree = "<group>"; };
-		DAB7AE651F3D755B00C856B1 /* json_c_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_c_version.h; sourceTree = "<group>"; };
-		DAB7AE661F3D755B00C856B1 /* json_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_config.h; sourceTree = "<group>"; };
-		DAB7AE671F3D755B00C856B1 /* json_inttypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_inttypes.h; sourceTree = "<group>"; };
-		DAB7AE681F3D755B00C856B1 /* json_object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object.h; sourceTree = "<group>"; };
-		DAB7AE691F3D755B00C856B1 /* json_object_iterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object_iterator.h; sourceTree = "<group>"; };
-		DAB7AE6A1F3D755B00C856B1 /* json_object_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object_private.h; sourceTree = "<group>"; };
-		DAB7AE6B1F3D755B00C856B1 /* json_pointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_pointer.h; sourceTree = "<group>"; };
-		DAB7AE6C1F3D755B00C856B1 /* json_tokener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_tokener.h; sourceTree = "<group>"; };
-		DAB7AE6D1F3D755B00C856B1 /* json_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_util.h; sourceTree = "<group>"; };
-		DAB7AE6E1F3D755B00C856B1 /* json_visit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_visit.h; sourceTree = "<group>"; };
-		DAB7AE6F1F3D755B00C856B1 /* linkhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linkhash.h; sourceTree = "<group>"; };
-		DAB7AE701F3D755B00C856B1 /* math_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = math_compat.h; sourceTree = "<group>"; };
-		DAB7AE711F3D755B00C856B1 /* printbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printbuf.h; sourceTree = "<group>"; };
-		DAB7AE721F3D755B00C856B1 /* random_seed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = random_seed.h; sourceTree = "<group>"; };
-		DAB7AE731F3D755B00C856B1 /* strdup_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strdup_compat.h; sourceTree = "<group>"; };
-		DAB7AE741F3D755B00C856B1 /* vasprintf_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vasprintf_compat.h; sourceTree = "<group>"; };
-		DAB7AE761F3D755B00C856B1 /* libjson-c.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libjson-c.a"; sourceTree = "<group>"; };
 		DAB7AE971F3DDEE000C856B1 /* mpw-marshal-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-marshal-util.h"; sourceTree = "<group>"; };
 		DAB7AE981F3DDEE000C856B1 /* mpw-marshal-util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-marshal-util.c"; sourceTree = "<group>"; };
 		DABB981515100B4000B05417 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
@@ -1685,6 +1689,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DAA7BC2720C4C27100101DC7 /* libsodium.a in Frameworks */,
 				DAB7AE5D1F3D752900C856B1 /* libjson-c.a in Frameworks */,
 				DA95B50C1C476B6A0067F5EF /* LocalAuthentication.framework in Frameworks */,
 				DA2C3D651BD9612F001137B3 /* libz.tbd in Frameworks */,
@@ -1704,7 +1709,6 @@
 				DA95D5F214DF0B2C008D1B94 /* MessageUI.framework in Frameworks */,
 				DAC632891486D9690075AEA5 /* Security.framework in Frameworks */,
 				DA5BFA49147E415C00F98B1E /* UIKit.framework in Frameworks */,
-				DA0979171E9A81EE00F0BFE8 /* libsodium.a in Frameworks */,
 				DA5BFA4B147E415C00F98B1E /* Foundation.framework in Frameworks */,
 				DA5BFA4D147E415C00F98B1E /* CoreGraphics.framework in Frameworks */,
 				DA5BFA4F147E415C00F98B1E /* CoreData.framework in Frameworks */,
@@ -1756,7 +1760,7 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		93D39A2239FFFE6BEC83E191 /* C */ = {
+		93D39A2239FFFE6BEC83E191 /* core */ = {
 			isa = PBXGroup;
 			children = (
 				DAB07C9B1F7725C500CC6D43 /* aes.c */,
@@ -1778,99 +1782,8 @@
 				93D396C311C3725870343EE0 /* mpw-util.c */,
 				93D39CF7DB942C69D1C5D6BE /* mpw-util.h */,
 			);
-			name = C;
-			path = ../core/c;
-			sourceTree = "<group>";
-		};
-		DA0978D81E9A81EE00F0BFE8 /* libsodium-ios */ = {
-			isa = PBXGroup;
-			children = (
-				DA0978D91E9A81EE00F0BFE8 /* include */,
-				DA0979151E9A81EE00F0BFE8 /* lib */,
-			);
-			name = "libsodium-ios";
-			path = "libsodium/libsodium-ios";
-			sourceTree = "<group>";
-		};
-		DA0978D91E9A81EE00F0BFE8 /* include */ = {
-			isa = PBXGroup;
-			children = (
-				DA0978DA1E9A81EE00F0BFE8 /* sodium */,
-				DA0979141E9A81EE00F0BFE8 /* sodium.h */,
-			);
-			path = include;
-			sourceTree = "<group>";
-		};
-		DA0978DA1E9A81EE00F0BFE8 /* sodium */ = {
-			isa = PBXGroup;
-			children = (
-				DA0978DB1E9A81EE00F0BFE8 /* core.h */,
-				DA0978DC1E9A81EE00F0BFE8 /* crypto_aead_aes256gcm.h */,
-				DA0978DD1E9A81EE00F0BFE8 /* crypto_aead_chacha20poly1305.h */,
-				DA0978DE1E9A81EE00F0BFE8 /* crypto_aead_xchacha20poly1305.h */,
-				DA0978DF1E9A81EE00F0BFE8 /* crypto_auth.h */,
-				DA0978E01E9A81EE00F0BFE8 /* crypto_auth_hmacsha256.h */,
-				DA0978E11E9A81EE00F0BFE8 /* crypto_auth_hmacsha512.h */,
-				DA0978E21E9A81EE00F0BFE8 /* crypto_auth_hmacsha512256.h */,
-				DA0978E31E9A81EE00F0BFE8 /* crypto_box.h */,
-				DA0978E41E9A81EE00F0BFE8 /* crypto_box_curve25519xchacha20poly1305.h */,
-				DA0978E51E9A81EE00F0BFE8 /* crypto_box_curve25519xsalsa20poly1305.h */,
-				DA0978E61E9A81EE00F0BFE8 /* crypto_core_hchacha20.h */,
-				DA0978E71E9A81EE00F0BFE8 /* crypto_core_hsalsa20.h */,
-				DA0978E81E9A81EE00F0BFE8 /* crypto_core_salsa20.h */,
-				DA0978E91E9A81EE00F0BFE8 /* crypto_core_salsa2012.h */,
-				DA0978EA1E9A81EE00F0BFE8 /* crypto_core_salsa208.h */,
-				DA0978EB1E9A81EE00F0BFE8 /* crypto_generichash.h */,
-				DA0978EC1E9A81EE00F0BFE8 /* crypto_generichash_blake2b.h */,
-				DA0978ED1E9A81EE00F0BFE8 /* crypto_hash.h */,
-				DA0978EE1E9A81EE00F0BFE8 /* crypto_hash_sha256.h */,
-				DA0978EF1E9A81EE00F0BFE8 /* crypto_hash_sha512.h */,
-				DA0978F01E9A81EE00F0BFE8 /* crypto_kdf.h */,
-				DA0978F11E9A81EE00F0BFE8 /* crypto_kdf_blake2b.h */,
-				DA0978F21E9A81EE00F0BFE8 /* crypto_kx.h */,
-				DA0978F31E9A81EE00F0BFE8 /* crypto_onetimeauth.h */,
-				DA0978F41E9A81EE00F0BFE8 /* crypto_onetimeauth_poly1305.h */,
-				DA0978F51E9A81EE00F0BFE8 /* crypto_pwhash.h */,
-				DA0978F61E9A81EE00F0BFE8 /* crypto_pwhash_argon2i.h */,
-				DA0978F71E9A81EE00F0BFE8 /* crypto_pwhash_scryptsalsa208sha256.h */,
-				DA0978F81E9A81EE00F0BFE8 /* crypto_scalarmult.h */,
-				DA0978F91E9A81EE00F0BFE8 /* crypto_scalarmult_curve25519.h */,
-				DA0978FA1E9A81EE00F0BFE8 /* crypto_secretbox.h */,
-				DA0978FB1E9A81EE00F0BFE8 /* crypto_secretbox_xchacha20poly1305.h */,
-				DA0978FC1E9A81EE00F0BFE8 /* crypto_secretbox_xsalsa20poly1305.h */,
-				DA0978FD1E9A81EE00F0BFE8 /* crypto_shorthash.h */,
-				DA0978FE1E9A81EE00F0BFE8 /* crypto_shorthash_siphash24.h */,
-				DA0978FF1E9A81EE00F0BFE8 /* crypto_sign.h */,
-				DA0979001E9A81EE00F0BFE8 /* crypto_sign_ed25519.h */,
-				DA0979011E9A81EE00F0BFE8 /* crypto_sign_edwards25519sha512batch.h */,
-				DA0979021E9A81EE00F0BFE8 /* crypto_stream.h */,
-				DA0979031E9A81EE00F0BFE8 /* crypto_stream_aes128ctr.h */,
-				DA0979041E9A81EE00F0BFE8 /* crypto_stream_chacha20.h */,
-				DA0979051E9A81EE00F0BFE8 /* crypto_stream_salsa20.h */,
-				DA0979061E9A81EE00F0BFE8 /* crypto_stream_salsa2012.h */,
-				DA0979071E9A81EE00F0BFE8 /* crypto_stream_salsa208.h */,
-				DA0979081E9A81EE00F0BFE8 /* crypto_stream_xchacha20.h */,
-				DA0979091E9A81EE00F0BFE8 /* crypto_stream_xsalsa20.h */,
-				DA09790A1E9A81EE00F0BFE8 /* crypto_verify_16.h */,
-				DA09790B1E9A81EE00F0BFE8 /* crypto_verify_32.h */,
-				DA09790C1E9A81EE00F0BFE8 /* crypto_verify_64.h */,
-				DA09790D1E9A81EE00F0BFE8 /* export.h */,
-				DA09790E1E9A81EE00F0BFE8 /* randombytes.h */,
-				DA09790F1E9A81EE00F0BFE8 /* randombytes_salsa20_random.h */,
-				DA0979101E9A81EE00F0BFE8 /* randombytes_sysrandom.h */,
-				DA0979111E9A81EE00F0BFE8 /* runtime.h */,
-				DA0979121E9A81EE00F0BFE8 /* utils.h */,
-				DA0979131E9A81EE00F0BFE8 /* version.h */,
-			);
-			path = sodium;
-			sourceTree = "<group>";
-		};
-		DA0979151E9A81EE00F0BFE8 /* lib */ = {
-			isa = PBXGroup;
-			children = (
-				DA0979161E9A81EE00F0BFE8 /* libsodium.a */,
-			);
-			path = lib;
+			name = core;
+			path = "../platform-independent/c/core/src";
 			sourceTree = "<group>";
 		};
 		DA0CC4F41EAB99BA009A8ED9 /* Resources */ = {
@@ -2033,7 +1946,7 @@
 		DA5BFA39147E415C00F98B1E = {
 			isa = PBXGroup;
 			children = (
-				93D39A2239FFFE6BEC83E191 /* C */,
+				93D39A2239FFFE6BEC83E191 /* core */,
 				DABD3B9F1711E2DB00CF925C /* Source */,
 				DACA23B41705DF7D002C6C22 /* Resources */,
 				DACA22121705DDC5002C6C22 /* External */,
@@ -2121,59 +2034,138 @@
 			path = AttributedMarkdown;
 			sourceTree = "<group>";
 		};
-		DAB7AE5E1F3D755B00C856B1 /* libjson-c-ios */ = {
+		DAA7BB6D20C4C0C400101DC7 /* libjson-c-ios */ = {
 			isa = PBXGroup;
 			children = (
-				DAB7AE5F1F3D755B00C856B1 /* include */,
-				DAB7AE751F3D755B00C856B1 /* lib */,
+				DAA7BB6F20C4C0C400101DC7 /* json-c */,
+				DAA7BB8520C4C0C400101DC7 /* lib */,
 			);
 			name = "libjson-c-ios";
-			path = "libjson-c/libjson-c-ios";
+			path = "../../lib/libjson-c/build-ios~/out";
 			sourceTree = "<group>";
 		};
-		DAB7AE5F1F3D755B00C856B1 /* include */ = {
+		DAA7BB6F20C4C0C400101DC7 /* json-c */ = {
 			isa = PBXGroup;
 			children = (
-				DAB7AE601F3D755B00C856B1 /* json-c */,
-			);
-			path = include;
-			sourceTree = "<group>";
-		};
-		DAB7AE601F3D755B00C856B1 /* json-c */ = {
-			isa = PBXGroup;
-			children = (
-				DAB7AE611F3D755B00C856B1 /* arraylist.h */,
-				DAB7AE621F3D755B00C856B1 /* bits.h */,
-				DAB7AE631F3D755B00C856B1 /* debug.h */,
-				DAB7AE641F3D755B00C856B1 /* json.h */,
-				DAB7AE651F3D755B00C856B1 /* json_c_version.h */,
-				DAB7AE661F3D755B00C856B1 /* json_config.h */,
-				DAB7AE671F3D755B00C856B1 /* json_inttypes.h */,
-				DAB7AE681F3D755B00C856B1 /* json_object.h */,
-				DAB7AE691F3D755B00C856B1 /* json_object_iterator.h */,
-				DAB7AE6A1F3D755B00C856B1 /* json_object_private.h */,
-				DAB7AE6B1F3D755B00C856B1 /* json_pointer.h */,
-				DAB7AE6C1F3D755B00C856B1 /* json_tokener.h */,
-				DAB7AE6D1F3D755B00C856B1 /* json_util.h */,
-				DAB7AE6E1F3D755B00C856B1 /* json_visit.h */,
-				DAB7AE6F1F3D755B00C856B1 /* linkhash.h */,
-				DAB7AE701F3D755B00C856B1 /* math_compat.h */,
-				DAB7AE711F3D755B00C856B1 /* printbuf.h */,
-				DAB7AE721F3D755B00C856B1 /* random_seed.h */,
-				DAB7AE731F3D755B00C856B1 /* strdup_compat.h */,
-				DAB7AE741F3D755B00C856B1 /* vasprintf_compat.h */,
+				DAA7BB7020C4C0C400101DC7 /* printbuf.h */,
+				DAA7BB7120C4C0C400101DC7 /* math_compat.h */,
+				DAA7BB7220C4C0C400101DC7 /* debug.h */,
+				DAA7BB7320C4C0C400101DC7 /* vasprintf_compat.h */,
+				DAA7BB7420C4C0C400101DC7 /* json_util.h */,
+				DAA7BB7520C4C0C400101DC7 /* json_config.h */,
+				DAA7BB7620C4C0C400101DC7 /* json_pointer.h */,
+				DAA7BB7720C4C0C400101DC7 /* json_visit.h */,
+				DAA7BB7820C4C0C400101DC7 /* random_seed.h */,
+				DAA7BB7920C4C0C400101DC7 /* json.h */,
+				DAA7BB7A20C4C0C400101DC7 /* json_c_version.h */,
+				DAA7BB7B20C4C0C400101DC7 /* json_object_private.h */,
+				DAA7BB7C20C4C0C400101DC7 /* strerror_override.h */,
+				DAA7BB7D20C4C0C400101DC7 /* arraylist.h */,
+				DAA7BB7E20C4C0C400101DC7 /* linkhash.h */,
+				DAA7BB7F20C4C0C400101DC7 /* json_tokener.h */,
+				DAA7BB8020C4C0C400101DC7 /* json_object_iterator.h */,
+				DAA7BB8120C4C0C400101DC7 /* json_inttypes.h */,
+				DAA7BB8220C4C0C400101DC7 /* bits.h */,
+				DAA7BB8320C4C0C400101DC7 /* strdup_compat.h */,
+				DAA7BB8420C4C0C400101DC7 /* json_object.h */,
 			);
 			path = "json-c";
 			sourceTree = "<group>";
 		};
-		DAB7AE751F3D755B00C856B1 /* lib */ = {
+		DAA7BB8520C4C0C400101DC7 /* lib */ = {
 			isa = PBXGroup;
 			children = (
-				DAB7AE761F3D755B00C856B1 /* libjson-c.a */,
+				DAA7BB8620C4C0C400101DC7 /* libjson-c.a */,
 			);
 			path = lib;
 			sourceTree = "<group>";
 		};
+		DAA7BB8720C4C10F00101DC7 /* libsodium-ios */ = {
+			isa = PBXGroup;
+			children = (
+				DAA7BB8920C4C10F00101DC7 /* lib */,
+				DAA7BB8B20C4C10F00101DC7 /* sodium */,
+				DAA7BBC820C4C10F00101DC7 /* sodium.h */,
+			);
+			name = "libsodium-ios";
+			path = "../../lib/libsodium/build-ios~/out";
+			sourceTree = "<group>";
+		};
+		DAA7BB8920C4C10F00101DC7 /* lib */ = {
+			isa = PBXGroup;
+			children = (
+				DAA7BB8A20C4C10F00101DC7 /* libsodium.a */,
+			);
+			path = lib;
+			sourceTree = "<group>";
+		};
+		DAA7BB8B20C4C10F00101DC7 /* sodium */ = {
+			isa = PBXGroup;
+			children = (
+				DAA7BB8C20C4C10F00101DC7 /* crypto_stream_salsa2012.h */,
+				DAA7BB8D20C4C10F00101DC7 /* crypto_auth.h */,
+				DAA7BB8E20C4C10F00101DC7 /* utils.h */,
+				DAA7BB8F20C4C10F00101DC7 /* crypto_core_hchacha20.h */,
+				DAA7BB9020C4C10F00101DC7 /* crypto_hash_sha512.h */,
+				DAA7BB9120C4C10F00101DC7 /* core.h */,
+				DAA7BB9220C4C10F00101DC7 /* version.h */,
+				DAA7BB9320C4C10F00101DC7 /* export.h */,
+				DAA7BB9420C4C10F00101DC7 /* randombytes_salsa20_random.h */,
+				DAA7BB9520C4C10F00101DC7 /* crypto_core_salsa20.h */,
+				DAA7BB9620C4C10F00101DC7 /* crypto_shorthash_siphash24.h */,
+				DAA7BB9720C4C10F00101DC7 /* randombytes.h */,
+				DAA7BB9820C4C10F00101DC7 /* crypto_hash_sha256.h */,
+				DAA7BB9920C4C10F00101DC7 /* crypto_stream.h */,
+				DAA7BB9A20C4C10F00101DC7 /* crypto_auth_hmacsha512.h */,
+				DAA7BB9B20C4C10F00101DC7 /* crypto_aead_xchacha20poly1305.h */,
+				DAA7BB9C20C4C10F00101DC7 /* crypto_stream_salsa20.h */,
+				DAA7BB9D20C4C10F00101DC7 /* crypto_onetimeauth_poly1305.h */,
+				DAA7BB9E20C4C10F00101DC7 /* crypto_kx.h */,
+				DAA7BB9F20C4C10F00101DC7 /* crypto_hash.h */,
+				DAA7BBA020C4C10F00101DC7 /* crypto_sign.h */,
+				DAA7BBA120C4C10F00101DC7 /* crypto_kdf.h */,
+				DAA7BBA220C4C10F00101DC7 /* crypto_auth_hmacsha256.h */,
+				DAA7BBA320C4C10F00101DC7 /* crypto_box.h */,
+				DAA7BBA420C4C10F00101DC7 /* crypto_verify_32.h */,
+				DAA7BBA520C4C10F00101DC7 /* crypto_stream_xchacha20.h */,
+				DAA7BBA620C4C10F00101DC7 /* crypto_core_salsa208.h */,
+				DAA7BBA720C4C10F00101DC7 /* crypto_auth_hmacsha512256.h */,
+				DAA7BBA820C4C10F00101DC7 /* crypto_aead_chacha20poly1305.h */,
+				DAA7BBA920C4C10F00101DC7 /* randombytes_sysrandom.h */,
+				DAA7BBAA20C4C10F00101DC7 /* runtime.h */,
+				DAA7BBAB20C4C10F00101DC7 /* crypto_stream_salsa208.h */,
+				DAA7BBAC20C4C10F00101DC7 /* crypto_aead_aes256gcm.h */,
+				DAA7BBAD20C4C10F00101DC7 /* crypto_core_salsa2012.h */,
+				DAA7BBAE20C4C10F00101DC7 /* crypto_secretbox_xchacha20poly1305.h */,
+				DAA7BBAF20C4C10F00101DC7 /* crypto_scalarmult.h */,
+				DAA7BBB020C4C10F00101DC7 /* crypto_pwhash.h */,
+				DAA7BBB120C4C10F00101DC7 /* crypto_verify_16.h */,
+				DAA7BBB220C4C10F00101DC7 /* crypto_stream_chacha20.h */,
+				DAA7BBB320C4C10F00101DC7 /* crypto_stream_xsalsa20.h */,
+				DAA7BBB420C4C10F00101DC7 /* crypto_core_hsalsa20.h */,
+				DAA7BBB520C4C10F00101DC7 /* crypto_kdf_blake2b.h */,
+				DAA7BBB620C4C10F00101DC7 /* crypto_scalarmult_curve25519.h */,
+				DAA7BBB720C4C10F00101DC7 /* crypto_shorthash.h */,
+				DAA7BBB820C4C10F00101DC7 /* crypto_pwhash_argon2id.h */,
+				DAA7BBB920C4C10F00101DC7 /* crypto_secretstream_xchacha20poly1305.h */,
+				DAA7BBBA20C4C10F00101DC7 /* crypto_pwhash_scryptsalsa208sha256.h */,
+				DAA7BBBB20C4C10F00101DC7 /* crypto_sign_ed25519.h */,
+				DAA7BBBC20C4C10F00101DC7 /* crypto_onetimeauth.h */,
+				DAA7BBBD20C4C10F00101DC7 /* crypto_verify_64.h */,
+				DAA7BBBE20C4C10F00101DC7 /* crypto_box_curve25519xchacha20poly1305.h */,
+				DAA7BBBF20C4C10F00101DC7 /* crypto_core_ed25519.h */,
+				DAA7BBC020C4C10F00101DC7 /* crypto_pwhash_argon2i.h */,
+				DAA7BBC120C4C10F00101DC7 /* crypto_generichash.h */,
+				DAA7BBC220C4C10F00101DC7 /* crypto_secretbox_xsalsa20poly1305.h */,
+				DAA7BBC320C4C10F00101DC7 /* crypto_secretbox.h */,
+				DAA7BBC420C4C10F00101DC7 /* crypto_scalarmult_ed25519.h */,
+				DAA7BBC520C4C10F00101DC7 /* crypto_box_curve25519xsalsa20poly1305.h */,
+				DAA7BBC620C4C10F00101DC7 /* crypto_generichash_blake2b.h */,
+				DAA7BBC720C4C10F00101DC7 /* crypto_sign_edwards25519sha512batch.h */,
+			);
+			path = sodium;
+			sourceTree = "<group>";
+		};
 		DABD360D1711E29400CF925C /* Media */ = {
 			isa = PBXGroup;
 			children = (
@@ -3021,8 +3013,8 @@
 		DACA22121705DDC5002C6C22 /* External */ = {
 			isa = PBXGroup;
 			children = (
-				DAB7AE5E1F3D755B00C856B1 /* libjson-c-ios */,
-				DA0978D81E9A81EE00F0BFE8 /* libsodium-ios */,
+				DAA7BB6D20C4C0C400101DC7 /* libjson-c-ios */,
+				DAA7BB8720C4C10F00101DC7 /* libsodium-ios */,
 				DAA1759319D86C610044227B /* AttributedMarkdown */,
 				DAFC5662172C57EC00CB5CC5 /* InAppSettingsKit */,
 				DAA141181922FED80032B392 /* iOS */,
@@ -3389,7 +3381,7 @@
 			buildConfigurationList = DAB7AE411F3D464A00C856B1 /* Build configuration list for PBXLegacyTarget "libjson-c-ios" */;
 			buildPhases = (
 			);
-			buildToolPath = "Scripts/build_libjson-c-ios";
+			buildToolPath = "../lib/bin/build_libjson-c-ios";
 			buildWorkingDirectory = "";
 			dependencies = (
 			);
@@ -3403,7 +3395,8 @@
 			buildConfigurationList = DAB7AE481F3D468300C856B1 /* Build configuration list for PBXLegacyTarget "libsodium-ios" */;
 			buildPhases = (
 			);
-			buildToolPath = "Scripts/build_libsodium-ios";
+			buildToolPath = "../lib/bin/build_libsodium-ios";
+			buildWorkingDirectory = "";
 			dependencies = (
 			);
 			name = "libsodium-ios";
@@ -4316,12 +4309,6 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"\"$(PROJECT_DIR)/External/libsodium/libsodium-ios/include\"",
-					"\"$(PROJECT_DIR)/External/libjson-c/libjson-c-ios/include\"",
-					"$(inherited)",
-				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";
@@ -4355,13 +4342,18 @@
 				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/include\"",
+				);
 				INFOPLIST_FILE = "Source/iOS/MasterPassword-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-ios/lib",
-					"$(PROJECT_DIR)/External/libjson-c/libjson-c-ios/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -4531,12 +4523,6 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"\"$(PROJECT_DIR)/External/libsodium/libsodium-ios/include\"",
-					"\"$(PROJECT_DIR)/External/libjson-c/libjson-c-ios/include\"",
-					"$(inherited)",
-				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -4642,12 +4628,6 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"\"$(PROJECT_DIR)/External/libsodium/libsodium-ios/include\"",
-					"\"$(PROJECT_DIR)/External/libjson-c/libjson-c-ios/include\"",
-					"$(inherited)",
-				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";
@@ -4680,13 +4660,18 @@
 				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/include\"",
+				);
 				INFOPLIST_FILE = "Source/iOS/MasterPassword-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-ios/lib",
-					"$(PROJECT_DIR)/External/libjson-c/libjson-c-ios/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -4719,13 +4704,18 @@
 				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/include\"",
+				);
 				INFOPLIST_FILE = "Source/iOS/MasterPassword-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-ios/lib",
-					"$(PROJECT_DIR)/External/libjson-c/libjson-c-ios/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-ios~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-ios~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",

platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj

@@ -24,7 +24,6 @@
 		DA0933CC1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = DA0933CB1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png */; };
 		DA0933D01747B91B00DE1CEF /* appstore.png in Resources */ = {isa = PBXBuildFile; fileRef = DA0933CF1747B91B00DE1CEF /* appstore.png */; };
 		DA09745E1E99586600F0BFE8 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA09745D1E99586600F0BFE8 /* libxml2.tbd */; };
-		DA0979681E9A834C00F0BFE8 /* libsodium.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA0979571E9A824700F0BFE8 /* libsodium.a */; };
 		DA0CC53E1EB57B69009A8ED9 /* Fabric.plist in Resources */ = {isa = PBXBuildFile; fileRef = DA0CC53D1EB57B69009A8ED9 /* Fabric.plist */; };
 		DA0CC5591EB6AE45009A8ED9 /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC54F1EB6AE45009A8ED9 /* MasterPassword.xcdatamodeld */; };
 		DA16B341170661DB000A0EAB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B340170661DB000A0EAB /* Carbon.framework */; };
@@ -35,13 +34,11 @@
 		DA1C7AAB1F1A8F24009A3551 /* mpw-types.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773C21A4746AF004F356A /* mpw-types.c */; };
 		DA1C7AAC1F1A8F24009A3551 /* mpw-util.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773C51A4746AF004F356A /* mpw-util.c */; };
 		DA1C7AAD1F1A8F24009A3551 /* mpw-algorithm.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773BB1A4746AF004F356A /* mpw-algorithm.c */; };
-		DA1C7AAF1F1A8F24009A3551 /* libsodium.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA0979571E9A824700F0BFE8 /* libsodium.a */; };
 		DA1C7AB01F1A8F24009A3551 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA09745D1E99586600F0BFE8 /* libxml2.tbd */; };
 		DA1C7AC31F1A8FBA009A3551 /* mpw-cli.c in Sources */ = {isa = PBXBuildFile; fileRef = DA1C7AB91F1A8F6E009A3551 /* mpw-cli.c */; };
 		DA1C7ACA1F1A8FD8009A3551 /* mpw-types.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773C21A4746AF004F356A /* mpw-types.c */; };
 		DA1C7ACB1F1A8FD8009A3551 /* mpw-util.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773C51A4746AF004F356A /* mpw-util.c */; };
 		DA1C7ACD1F1A8FD8009A3551 /* mpw-algorithm.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773BB1A4746AF004F356A /* mpw-algorithm.c */; };
-		DA1C7ACF1F1A8FD8009A3551 /* libsodium.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA0979571E9A824700F0BFE8 /* libsodium.a */; };
 		DA1C7AD01F1A8FD8009A3551 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA09745D1E99586600F0BFE8 /* libxml2.tbd */; };
 		DA1C7AD71F1A8FE6009A3551 /* mpw-bench.c in Sources */ = {isa = PBXBuildFile; fileRef = DA1C7AB81F1A8F6E009A3551 /* mpw-bench.c */; };
 		DA1C7AD81F1A8FF4009A3551 /* mpw-tests-util.c in Sources */ = {isa = PBXBuildFile; fileRef = DA1C7ABA1F1A8F6E009A3551 /* mpw-tests-util.c */; };
@@ -119,6 +116,7 @@
 		DA9261541BE1A88900369DE5 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261531BE1A88900369DE5 /* libc++.tbd */; };
 		DA9261561BE1A89600369DE5 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261551BE1A89600369DE5 /* libz.tbd */; };
 		DAA449D51EEC4B6B00E7BDD5 /* mpw-marshal.c in Sources */ = {isa = PBXBuildFile; fileRef = DAA449D31EEC4B6B00E7BDD5 /* mpw-marshal.c */; };
+		DAA7BC2820C4C29400101DC7 /* libsodium.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAA7BBCE20C4C17300101DC7 /* libsodium.a */; };
 		DAAA81B0195A8D1300FA30D9 /* gradient.png in Resources */ = {isa = PBXBuildFile; fileRef = DAAA81AF195A8D1300FA30D9 /* gradient.png */; };
 		DAADCC4719FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */; };
 		DAADCC4819FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */; };
@@ -143,7 +141,6 @@
 		DAB4FBEC202FF979002768FB /* PearlCryptUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = DA45711E1F572F3200D54152 /* PearlCryptUtils.m */; };
 		DAB7AE5A1F3D74E700C856B1 /* libjson-c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAB7AE591F3D74E700C856B1 /* libjson-c.a */; };
 		DAB7AE5B1F3D750B00C856B1 /* libjson-c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAB7AE591F3D74E700C856B1 /* libjson-c.a */; };
-		DAB7AE941F3D757B00C856B1 /* libjson-c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAB7AE901F3D757B00C856B1 /* libjson-c.a */; };
 		DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DACA26FE1705DF81002C6C22 /* logo-bare.png in Resources */ = {isa = PBXBuildFile; fileRef = DACA241C1705DF7D002C6C22 /* logo-bare.png */; };
@@ -193,7 +190,6 @@
 		DACA299A1705E2BD002C6C22 /* JRSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA298C1705E2BD002C6C22 /* JRSwizzle.m */; };
 		DAD9B5F01762CAA4001835F9 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAD9B5EF1762CAA4001835F9 /* ServiceManagement.framework */; };
 		DAD9B5F11762CAB9001835F9 /* MasterPassword-Mac-LoginHelper.app in Copy LoginHelper */ = {isa = PBXBuildFile; fileRef = DAD9B5E6176299BA001835F9 /* MasterPassword-Mac-LoginHelper.app */; };
-		DADD5DFA1EA173B0005E7D96 /* libsodium.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA0979571E9A824700F0BFE8 /* libsodium.a */; };
 		DAEB942E18B47FB3000490CC /* MPInitialWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA0933C91747A56A00DE1CEF /* MPInitialWindow.xib */; };
 		DAF4EF56190A828100023C90 /* Exo2.0-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = DAF4EF52190A828100023C90 /* Exo2.0-Thin.otf */; };
 		DAF4EF57190A828100023C90 /* Exo2.0-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = DAF4EF53190A828100023C90 /* Exo2.0-Regular.otf */; };
@@ -381,65 +377,6 @@
 		DA0933CF1747B91B00DE1CEF /* appstore.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = appstore.png; sourceTree = "<group>"; };
 		DA09745D1E99586600F0BFE8 /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = usr/lib/libxml2.tbd; sourceTree = SDKROOT; };
 		DA09745F1E995EB500F0BFE8 /* mpw_tests.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = mpw_tests.xml; path = ../../core/java/tests/src/main/resources/mpw_tests.xml; sourceTree = "<group>"; };
-		DA09791B1E9A824700F0BFE8 /* core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = core.h; sourceTree = "<group>"; };
-		DA09791C1E9A824700F0BFE8 /* crypto_aead_aes256gcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_aes256gcm.h; sourceTree = "<group>"; };
-		DA09791D1E9A824700F0BFE8 /* crypto_aead_chacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_chacha20poly1305.h; sourceTree = "<group>"; };
-		DA09791E1E9A824700F0BFE8 /* crypto_aead_xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_xchacha20poly1305.h; sourceTree = "<group>"; };
-		DA09791F1E9A824700F0BFE8 /* crypto_auth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth.h; sourceTree = "<group>"; };
-		DA0979201E9A824700F0BFE8 /* crypto_auth_hmacsha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha256.h; sourceTree = "<group>"; };
-		DA0979211E9A824700F0BFE8 /* crypto_auth_hmacsha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha512.h; sourceTree = "<group>"; };
-		DA0979221E9A824700F0BFE8 /* crypto_auth_hmacsha512256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha512256.h; sourceTree = "<group>"; };
-		DA0979231E9A824700F0BFE8 /* crypto_box.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box.h; sourceTree = "<group>"; };
-		DA0979241E9A824700F0BFE8 /* crypto_box_curve25519xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box_curve25519xchacha20poly1305.h; sourceTree = "<group>"; };
-		DA0979251E9A824700F0BFE8 /* crypto_box_curve25519xsalsa20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box_curve25519xsalsa20poly1305.h; sourceTree = "<group>"; };
-		DA0979261E9A824700F0BFE8 /* crypto_core_hchacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_hchacha20.h; sourceTree = "<group>"; };
-		DA0979271E9A824700F0BFE8 /* crypto_core_hsalsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_hsalsa20.h; sourceTree = "<group>"; };
-		DA0979281E9A824700F0BFE8 /* crypto_core_salsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa20.h; sourceTree = "<group>"; };
-		DA0979291E9A824700F0BFE8 /* crypto_core_salsa2012.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa2012.h; sourceTree = "<group>"; };
-		DA09792A1E9A824700F0BFE8 /* crypto_core_salsa208.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa208.h; sourceTree = "<group>"; };
-		DA09792B1E9A824700F0BFE8 /* crypto_generichash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_generichash.h; sourceTree = "<group>"; };
-		DA09792C1E9A824700F0BFE8 /* crypto_generichash_blake2b.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_generichash_blake2b.h; sourceTree = "<group>"; };
-		DA09792D1E9A824700F0BFE8 /* crypto_hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash.h; sourceTree = "<group>"; };
-		DA09792E1E9A824700F0BFE8 /* crypto_hash_sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash_sha256.h; sourceTree = "<group>"; };
-		DA09792F1E9A824700F0BFE8 /* crypto_hash_sha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash_sha512.h; sourceTree = "<group>"; };
-		DA0979301E9A824700F0BFE8 /* crypto_kdf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kdf.h; sourceTree = "<group>"; };
-		DA0979311E9A824700F0BFE8 /* crypto_kdf_blake2b.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kdf_blake2b.h; sourceTree = "<group>"; };
-		DA0979321E9A824700F0BFE8 /* crypto_kx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kx.h; sourceTree = "<group>"; };
-		DA0979331E9A824700F0BFE8 /* crypto_onetimeauth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_onetimeauth.h; sourceTree = "<group>"; };
-		DA0979341E9A824700F0BFE8 /* crypto_onetimeauth_poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_onetimeauth_poly1305.h; sourceTree = "<group>"; };
-		DA0979351E9A824700F0BFE8 /* crypto_pwhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash.h; sourceTree = "<group>"; };
-		DA0979361E9A824700F0BFE8 /* crypto_pwhash_argon2i.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash_argon2i.h; sourceTree = "<group>"; };
-		DA0979371E9A824700F0BFE8 /* crypto_pwhash_scryptsalsa208sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash_scryptsalsa208sha256.h; sourceTree = "<group>"; };
-		DA0979381E9A824700F0BFE8 /* crypto_scalarmult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult.h; sourceTree = "<group>"; };
-		DA0979391E9A824700F0BFE8 /* crypto_scalarmult_curve25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult_curve25519.h; sourceTree = "<group>"; };
-		DA09793A1E9A824700F0BFE8 /* crypto_secretbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox.h; sourceTree = "<group>"; };
-		DA09793B1E9A824700F0BFE8 /* crypto_secretbox_xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox_xchacha20poly1305.h; sourceTree = "<group>"; };
-		DA09793C1E9A824700F0BFE8 /* crypto_secretbox_xsalsa20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox_xsalsa20poly1305.h; sourceTree = "<group>"; };
-		DA09793D1E9A824700F0BFE8 /* crypto_shorthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_shorthash.h; sourceTree = "<group>"; };
-		DA09793E1E9A824700F0BFE8 /* crypto_shorthash_siphash24.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_shorthash_siphash24.h; sourceTree = "<group>"; };
-		DA09793F1E9A824700F0BFE8 /* crypto_sign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign.h; sourceTree = "<group>"; };
-		DA0979401E9A824700F0BFE8 /* crypto_sign_ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign_ed25519.h; sourceTree = "<group>"; };
-		DA0979411E9A824700F0BFE8 /* crypto_sign_edwards25519sha512batch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign_edwards25519sha512batch.h; sourceTree = "<group>"; };
-		DA0979421E9A824700F0BFE8 /* crypto_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream.h; sourceTree = "<group>"; };
-		DA0979431E9A824700F0BFE8 /* crypto_stream_aes128ctr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_aes128ctr.h; sourceTree = "<group>"; };
-		DA0979441E9A824700F0BFE8 /* crypto_stream_chacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_chacha20.h; sourceTree = "<group>"; };
-		DA0979451E9A824700F0BFE8 /* crypto_stream_salsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa20.h; sourceTree = "<group>"; };
-		DA0979461E9A824700F0BFE8 /* crypto_stream_salsa2012.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa2012.h; sourceTree = "<group>"; };
-		DA0979471E9A824700F0BFE8 /* crypto_stream_salsa208.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa208.h; sourceTree = "<group>"; };
-		DA0979481E9A824700F0BFE8 /* crypto_stream_xchacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_xchacha20.h; sourceTree = "<group>"; };
-		DA0979491E9A824700F0BFE8 /* crypto_stream_xsalsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_xsalsa20.h; sourceTree = "<group>"; };
-		DA09794A1E9A824700F0BFE8 /* crypto_verify_16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_16.h; sourceTree = "<group>"; };
-		DA09794B1E9A824700F0BFE8 /* crypto_verify_32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_32.h; sourceTree = "<group>"; };
-		DA09794C1E9A824700F0BFE8 /* crypto_verify_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_64.h; sourceTree = "<group>"; };
-		DA09794D1E9A824700F0BFE8 /* export.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = export.h; sourceTree = "<group>"; };
-		DA09794E1E9A824700F0BFE8 /* randombytes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes.h; sourceTree = "<group>"; };
-		DA09794F1E9A824700F0BFE8 /* randombytes_salsa20_random.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes_salsa20_random.h; sourceTree = "<group>"; };
-		DA0979501E9A824700F0BFE8 /* randombytes_sysrandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes_sysrandom.h; sourceTree = "<group>"; };
-		DA0979511E9A824700F0BFE8 /* runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = runtime.h; sourceTree = "<group>"; };
-		DA0979521E9A824700F0BFE8 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
-		DA0979531E9A824700F0BFE8 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
-		DA0979541E9A824700F0BFE8 /* sodium.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sodium.h; sourceTree = "<group>"; };
-		DA0979571E9A824700F0BFE8 /* libsodium.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libsodium.a; sourceTree = "<group>"; };
 		DA0CC53D1EB57B69009A8ED9 /* Fabric.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Fabric.plist; sourceTree = "<group>"; };
 		DA0CC5501EB6AE45009A8ED9 /* MasterPassword 1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 1.xcdatamodel"; sourceTree = "<group>"; };
 		DA0CC5511EB6AE45009A8ED9 /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = "<group>"; };
@@ -975,6 +912,92 @@
 		DA9261551BE1A89600369DE5 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		DAA449D31EEC4B6B00E7BDD5 /* mpw-marshal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-marshal.c"; sourceTree = "<group>"; };
 		DAA449D41EEC4B6B00E7BDD5 /* mpw-marshal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-marshal.h"; sourceTree = "<group>"; };
+		DAA7BBCC20C4C17300101DC7 /* libsodium.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libsodium.dylib; sourceTree = "<group>"; };
+		DAA7BBCD20C4C17300101DC7 /* libsodium.23.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libsodium.23.dylib; sourceTree = "<group>"; };
+		DAA7BBCE20C4C17300101DC7 /* libsodium.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libsodium.a; sourceTree = "<group>"; };
+		DAA7BBD020C4C17300101DC7 /* crypto_stream_salsa2012.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa2012.h; sourceTree = "<group>"; };
+		DAA7BBD120C4C17300101DC7 /* crypto_auth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth.h; sourceTree = "<group>"; };
+		DAA7BBD220C4C17300101DC7 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
+		DAA7BBD320C4C17300101DC7 /* crypto_core_hchacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_hchacha20.h; sourceTree = "<group>"; };
+		DAA7BBD420C4C17300101DC7 /* crypto_hash_sha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash_sha512.h; sourceTree = "<group>"; };
+		DAA7BBD520C4C17300101DC7 /* core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = core.h; sourceTree = "<group>"; };
+		DAA7BBD620C4C17300101DC7 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
+		DAA7BBD720C4C17300101DC7 /* export.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = export.h; sourceTree = "<group>"; };
+		DAA7BBD820C4C17300101DC7 /* randombytes_salsa20_random.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes_salsa20_random.h; sourceTree = "<group>"; };
+		DAA7BBD920C4C17300101DC7 /* crypto_core_salsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa20.h; sourceTree = "<group>"; };
+		DAA7BBDA20C4C17300101DC7 /* crypto_shorthash_siphash24.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_shorthash_siphash24.h; sourceTree = "<group>"; };
+		DAA7BBDB20C4C17300101DC7 /* randombytes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes.h; sourceTree = "<group>"; };
+		DAA7BBDC20C4C17300101DC7 /* crypto_hash_sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash_sha256.h; sourceTree = "<group>"; };
+		DAA7BBDD20C4C17300101DC7 /* crypto_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream.h; sourceTree = "<group>"; };
+		DAA7BBDE20C4C17300101DC7 /* crypto_auth_hmacsha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha512.h; sourceTree = "<group>"; };
+		DAA7BBDF20C4C17300101DC7 /* crypto_aead_xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_xchacha20poly1305.h; sourceTree = "<group>"; };
+		DAA7BBE020C4C17300101DC7 /* crypto_stream_salsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa20.h; sourceTree = "<group>"; };
+		DAA7BBE120C4C17300101DC7 /* crypto_onetimeauth_poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_onetimeauth_poly1305.h; sourceTree = "<group>"; };
+		DAA7BBE220C4C17300101DC7 /* crypto_kx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kx.h; sourceTree = "<group>"; };
+		DAA7BBE320C4C17300101DC7 /* crypto_hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash.h; sourceTree = "<group>"; };
+		DAA7BBE420C4C17300101DC7 /* crypto_sign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign.h; sourceTree = "<group>"; };
+		DAA7BBE520C4C17300101DC7 /* crypto_kdf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kdf.h; sourceTree = "<group>"; };
+		DAA7BBE620C4C17300101DC7 /* crypto_auth_hmacsha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha256.h; sourceTree = "<group>"; };
+		DAA7BBE720C4C17300101DC7 /* crypto_box.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box.h; sourceTree = "<group>"; };
+		DAA7BBE820C4C17300101DC7 /* crypto_verify_32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_32.h; sourceTree = "<group>"; };
+		DAA7BBE920C4C17300101DC7 /* crypto_stream_xchacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_xchacha20.h; sourceTree = "<group>"; };
+		DAA7BBEA20C4C17300101DC7 /* crypto_core_salsa208.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa208.h; sourceTree = "<group>"; };
+		DAA7BBEB20C4C17300101DC7 /* crypto_auth_hmacsha512256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha512256.h; sourceTree = "<group>"; };
+		DAA7BBEC20C4C17300101DC7 /* crypto_aead_chacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_chacha20poly1305.h; sourceTree = "<group>"; };
+		DAA7BBED20C4C17300101DC7 /* randombytes_sysrandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes_sysrandom.h; sourceTree = "<group>"; };
+		DAA7BBEE20C4C17300101DC7 /* runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = runtime.h; sourceTree = "<group>"; };
+		DAA7BBEF20C4C17300101DC7 /* crypto_stream_salsa208.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa208.h; sourceTree = "<group>"; };
+		DAA7BBF020C4C17300101DC7 /* crypto_aead_aes256gcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aead_aes256gcm.h; sourceTree = "<group>"; };
+		DAA7BBF120C4C17300101DC7 /* crypto_core_salsa2012.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa2012.h; sourceTree = "<group>"; };
+		DAA7BBF220C4C17300101DC7 /* crypto_secretbox_xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox_xchacha20poly1305.h; sourceTree = "<group>"; };
+		DAA7BBF320C4C17300101DC7 /* crypto_scalarmult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult.h; sourceTree = "<group>"; };
+		DAA7BBF420C4C17300101DC7 /* crypto_pwhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash.h; sourceTree = "<group>"; };
+		DAA7BBF520C4C17300101DC7 /* crypto_verify_16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_16.h; sourceTree = "<group>"; };
+		DAA7BBF620C4C17300101DC7 /* crypto_stream_chacha20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_chacha20.h; sourceTree = "<group>"; };
+		DAA7BBF720C4C17300101DC7 /* crypto_stream_xsalsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_xsalsa20.h; sourceTree = "<group>"; };
+		DAA7BBF820C4C17300101DC7 /* crypto_core_hsalsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_hsalsa20.h; sourceTree = "<group>"; };
+		DAA7BBF920C4C17300101DC7 /* crypto_kdf_blake2b.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_kdf_blake2b.h; sourceTree = "<group>"; };
+		DAA7BBFA20C4C17300101DC7 /* crypto_scalarmult_curve25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult_curve25519.h; sourceTree = "<group>"; };
+		DAA7BBFB20C4C17300101DC7 /* crypto_shorthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_shorthash.h; sourceTree = "<group>"; };
+		DAA7BBFC20C4C17300101DC7 /* crypto_pwhash_argon2id.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash_argon2id.h; sourceTree = "<group>"; };
+		DAA7BBFD20C4C17300101DC7 /* crypto_secretstream_xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretstream_xchacha20poly1305.h; sourceTree = "<group>"; };
+		DAA7BBFE20C4C17300101DC7 /* crypto_pwhash_scryptsalsa208sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash_scryptsalsa208sha256.h; sourceTree = "<group>"; };
+		DAA7BBFF20C4C17300101DC7 /* crypto_sign_ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign_ed25519.h; sourceTree = "<group>"; };
+		DAA7BC0020C4C17300101DC7 /* crypto_onetimeauth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_onetimeauth.h; sourceTree = "<group>"; };
+		DAA7BC0120C4C17300101DC7 /* crypto_verify_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_64.h; sourceTree = "<group>"; };
+		DAA7BC0220C4C17300101DC7 /* crypto_box_curve25519xchacha20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box_curve25519xchacha20poly1305.h; sourceTree = "<group>"; };
+		DAA7BC0320C4C17300101DC7 /* crypto_core_ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_ed25519.h; sourceTree = "<group>"; };
+		DAA7BC0420C4C17300101DC7 /* crypto_pwhash_argon2i.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_pwhash_argon2i.h; sourceTree = "<group>"; };
+		DAA7BC0520C4C17300101DC7 /* crypto_generichash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_generichash.h; sourceTree = "<group>"; };
+		DAA7BC0620C4C17300101DC7 /* crypto_secretbox_xsalsa20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox_xsalsa20poly1305.h; sourceTree = "<group>"; };
+		DAA7BC0720C4C17300101DC7 /* crypto_secretbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox.h; sourceTree = "<group>"; };
+		DAA7BC0820C4C17300101DC7 /* crypto_scalarmult_ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult_ed25519.h; sourceTree = "<group>"; };
+		DAA7BC0920C4C17300101DC7 /* crypto_box_curve25519xsalsa20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box_curve25519xsalsa20poly1305.h; sourceTree = "<group>"; };
+		DAA7BC0A20C4C17300101DC7 /* crypto_generichash_blake2b.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_generichash_blake2b.h; sourceTree = "<group>"; };
+		DAA7BC0B20C4C17300101DC7 /* crypto_sign_edwards25519sha512batch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign_edwards25519sha512batch.h; sourceTree = "<group>"; };
+		DAA7BC0C20C4C17300101DC7 /* sodium.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sodium.h; sourceTree = "<group>"; };
+		DAA7BC1020C4C1B500101DC7 /* printbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printbuf.h; sourceTree = "<group>"; };
+		DAA7BC1120C4C1B500101DC7 /* math_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = math_compat.h; sourceTree = "<group>"; };
+		DAA7BC1220C4C1B500101DC7 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
+		DAA7BC1320C4C1B500101DC7 /* vasprintf_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vasprintf_compat.h; sourceTree = "<group>"; };
+		DAA7BC1420C4C1B500101DC7 /* json_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_util.h; sourceTree = "<group>"; };
+		DAA7BC1520C4C1B500101DC7 /* json_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_config.h; sourceTree = "<group>"; };
+		DAA7BC1620C4C1B500101DC7 /* json_pointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_pointer.h; sourceTree = "<group>"; };
+		DAA7BC1720C4C1B500101DC7 /* json_visit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_visit.h; sourceTree = "<group>"; };
+		DAA7BC1820C4C1B500101DC7 /* random_seed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = random_seed.h; sourceTree = "<group>"; };
+		DAA7BC1920C4C1B500101DC7 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json.h; sourceTree = "<group>"; };
+		DAA7BC1A20C4C1B500101DC7 /* json_c_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_c_version.h; sourceTree = "<group>"; };
+		DAA7BC1B20C4C1B500101DC7 /* json_object_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object_private.h; sourceTree = "<group>"; };
+		DAA7BC1C20C4C1B500101DC7 /* strerror_override.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strerror_override.h; sourceTree = "<group>"; };
+		DAA7BC1D20C4C1B500101DC7 /* arraylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = arraylist.h; sourceTree = "<group>"; };
+		DAA7BC1E20C4C1B500101DC7 /* linkhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linkhash.h; sourceTree = "<group>"; };
+		DAA7BC1F20C4C1B500101DC7 /* json_tokener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_tokener.h; sourceTree = "<group>"; };
+		DAA7BC2020C4C1B500101DC7 /* json_object_iterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object_iterator.h; sourceTree = "<group>"; };
+		DAA7BC2120C4C1B500101DC7 /* json_inttypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_inttypes.h; sourceTree = "<group>"; };
+		DAA7BC2220C4C1B500101DC7 /* bits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bits.h; sourceTree = "<group>"; };
+		DAA7BC2320C4C1B500101DC7 /* strdup_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strdup_compat.h; sourceTree = "<group>"; };
+		DAA7BC2420C4C1B500101DC7 /* json_object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object.h; sourceTree = "<group>"; };
+		DAA7BC2620C4C1B500101DC7 /* libjson-c.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libjson-c.a"; sourceTree = "<group>"; };
 		DAAA81AF195A8D1300FA30D9 /* gradient.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gradient.png; sourceTree = "<group>"; };
 		DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+PearlEasyCleanup.h"; sourceTree = "<group>"; };
 		DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPersistentStore+PearlMigration.h"; sourceTree = "<group>"; };
@@ -994,27 +1017,6 @@
 		DAB4FBE1202FF93D002768FB /* NSOrderedSetOrArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSOrderedSetOrArray.h; sourceTree = "<group>"; };
 		DAB4FBE2202FF93D002768FB /* NSOrderedSetOrArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSOrderedSetOrArray.m; sourceTree = "<group>"; };
 		DAB7AE591F3D74E700C856B1 /* libjson-c.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libjson-c.a"; path = "External/libjson-c/libjson-c-osx/lib/libjson-c.a"; sourceTree = "<group>"; };
-		DAB7AE7B1F3D757B00C856B1 /* arraylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = arraylist.h; sourceTree = "<group>"; };
-		DAB7AE7C1F3D757B00C856B1 /* bits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bits.h; sourceTree = "<group>"; };
-		DAB7AE7D1F3D757B00C856B1 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		DAB7AE7E1F3D757B00C856B1 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json.h; sourceTree = "<group>"; };
-		DAB7AE7F1F3D757B00C856B1 /* json_c_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_c_version.h; sourceTree = "<group>"; };
-		DAB7AE801F3D757B00C856B1 /* json_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_config.h; sourceTree = "<group>"; };
-		DAB7AE811F3D757B00C856B1 /* json_inttypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_inttypes.h; sourceTree = "<group>"; };
-		DAB7AE821F3D757B00C856B1 /* json_object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object.h; sourceTree = "<group>"; };
-		DAB7AE831F3D757B00C856B1 /* json_object_iterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object_iterator.h; sourceTree = "<group>"; };
-		DAB7AE841F3D757B00C856B1 /* json_object_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_object_private.h; sourceTree = "<group>"; };
-		DAB7AE851F3D757B00C856B1 /* json_pointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_pointer.h; sourceTree = "<group>"; };
-		DAB7AE861F3D757B00C856B1 /* json_tokener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_tokener.h; sourceTree = "<group>"; };
-		DAB7AE871F3D757B00C856B1 /* json_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_util.h; sourceTree = "<group>"; };
-		DAB7AE881F3D757B00C856B1 /* json_visit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_visit.h; sourceTree = "<group>"; };
-		DAB7AE891F3D757B00C856B1 /* linkhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linkhash.h; sourceTree = "<group>"; };
-		DAB7AE8A1F3D757B00C856B1 /* math_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = math_compat.h; sourceTree = "<group>"; };
-		DAB7AE8B1F3D757B00C856B1 /* printbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printbuf.h; sourceTree = "<group>"; };
-		DAB7AE8C1F3D757B00C856B1 /* random_seed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = random_seed.h; sourceTree = "<group>"; };
-		DAB7AE8D1F3D757B00C856B1 /* strdup_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strdup_compat.h; sourceTree = "<group>"; };
-		DAB7AE8E1F3D757B00C856B1 /* vasprintf_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vasprintf_compat.h; sourceTree = "<group>"; };
-		DAB7AE901F3D757B00C856B1 /* libjson-c.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libjson-c.a"; sourceTree = "<group>"; };
 		DABB981515100B4000B05417 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		DAC6326C148680650075AEA5 /* libjrswizzle.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjrswizzle.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DAC632871486D95D0075AEA5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
@@ -1130,7 +1132,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				DAB7AE5A1F3D74E700C856B1 /* libjson-c.a in Frameworks */,
-				DA1C7AAF1F1A8F24009A3551 /* libsodium.a in Frameworks */,
 				DA1C7AB01F1A8F24009A3551 /* libxml2.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1139,7 +1140,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DA1C7ACF1F1A8FD8009A3551 /* libsodium.a in Frameworks */,
 				DA1C7AD01F1A8FD8009A3551 /* libxml2.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1148,12 +1148,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DAA7BC2820C4C29400101DC7 /* libsodium.a in Frameworks */,
 				DAB7AE5B1F3D750B00C856B1 /* libjson-c.a in Frameworks */,
 				DA9261561BE1A89600369DE5 /* libz.tbd in Frameworks */,
 				DA9261541BE1A88900369DE5 /* libc++.tbd in Frameworks */,
 				DAADCC6A19FB00B500987B1D /* libKCOrderedAccessorFix.a in Frameworks */,
-				DAB7AE941F3D757B00C856B1 /* libjson-c.a in Frameworks */,
-				DADD5DFA1EA173B0005E7D96 /* libsodium.a in Frameworks */,
 				DA9261521BE1A86700369DE5 /* Fabric.framework in Frameworks */,
 				DA9261511BE1A86700369DE5 /* SystemConfiguration.framework in Frameworks */,
 				DA250925195148E200AC23F1 /* QuartzCore.framework in Frameworks */,
@@ -1170,7 +1169,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DA0979681E9A834C00F0BFE8 /* libsodium.a in Frameworks */,
 				DA09745E1E99586600F0BFE8 /* libxml2.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1203,97 +1201,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		DA0979181E9A824700F0BFE8 /* libsodium-osx */ = {
-			isa = PBXGroup;
-			children = (
-				DA0979191E9A824700F0BFE8 /* include */,
-				DA0979551E9A824700F0BFE8 /* lib */,
-			);
-			name = "libsodium-osx";
-			path = "libsodium/libsodium-osx";
-			sourceTree = "<group>";
-		};
-		DA0979191E9A824700F0BFE8 /* include */ = {
-			isa = PBXGroup;
-			children = (
-				DA09791A1E9A824700F0BFE8 /* sodium */,
-				DA0979541E9A824700F0BFE8 /* sodium.h */,
-			);
-			path = include;
-			sourceTree = "<group>";
-		};
-		DA09791A1E9A824700F0BFE8 /* sodium */ = {
-			isa = PBXGroup;
-			children = (
-				DA09791B1E9A824700F0BFE8 /* core.h */,
-				DA09791C1E9A824700F0BFE8 /* crypto_aead_aes256gcm.h */,
-				DA09791D1E9A824700F0BFE8 /* crypto_aead_chacha20poly1305.h */,
-				DA09791E1E9A824700F0BFE8 /* crypto_aead_xchacha20poly1305.h */,
-				DA09791F1E9A824700F0BFE8 /* crypto_auth.h */,
-				DA0979201E9A824700F0BFE8 /* crypto_auth_hmacsha256.h */,
-				DA0979211E9A824700F0BFE8 /* crypto_auth_hmacsha512.h */,
-				DA0979221E9A824700F0BFE8 /* crypto_auth_hmacsha512256.h */,
-				DA0979231E9A824700F0BFE8 /* crypto_box.h */,
-				DA0979241E9A824700F0BFE8 /* crypto_box_curve25519xchacha20poly1305.h */,
-				DA0979251E9A824700F0BFE8 /* crypto_box_curve25519xsalsa20poly1305.h */,
-				DA0979261E9A824700F0BFE8 /* crypto_core_hchacha20.h */,
-				DA0979271E9A824700F0BFE8 /* crypto_core_hsalsa20.h */,
-				DA0979281E9A824700F0BFE8 /* crypto_core_salsa20.h */,
-				DA0979291E9A824700F0BFE8 /* crypto_core_salsa2012.h */,
-				DA09792A1E9A824700F0BFE8 /* crypto_core_salsa208.h */,
-				DA09792B1E9A824700F0BFE8 /* crypto_generichash.h */,
-				DA09792C1E9A824700F0BFE8 /* crypto_generichash_blake2b.h */,
-				DA09792D1E9A824700F0BFE8 /* crypto_hash.h */,
-				DA09792E1E9A824700F0BFE8 /* crypto_hash_sha256.h */,
-				DA09792F1E9A824700F0BFE8 /* crypto_hash_sha512.h */,
-				DA0979301E9A824700F0BFE8 /* crypto_kdf.h */,
-				DA0979311E9A824700F0BFE8 /* crypto_kdf_blake2b.h */,
-				DA0979321E9A824700F0BFE8 /* crypto_kx.h */,
-				DA0979331E9A824700F0BFE8 /* crypto_onetimeauth.h */,
-				DA0979341E9A824700F0BFE8 /* crypto_onetimeauth_poly1305.h */,
-				DA0979351E9A824700F0BFE8 /* crypto_pwhash.h */,
-				DA0979361E9A824700F0BFE8 /* crypto_pwhash_argon2i.h */,
-				DA0979371E9A824700F0BFE8 /* crypto_pwhash_scryptsalsa208sha256.h */,
-				DA0979381E9A824700F0BFE8 /* crypto_scalarmult.h */,
-				DA0979391E9A824700F0BFE8 /* crypto_scalarmult_curve25519.h */,
-				DA09793A1E9A824700F0BFE8 /* crypto_secretbox.h */,
-				DA09793B1E9A824700F0BFE8 /* crypto_secretbox_xchacha20poly1305.h */,
-				DA09793C1E9A824700F0BFE8 /* crypto_secretbox_xsalsa20poly1305.h */,
-				DA09793D1E9A824700F0BFE8 /* crypto_shorthash.h */,
-				DA09793E1E9A824700F0BFE8 /* crypto_shorthash_siphash24.h */,
-				DA09793F1E9A824700F0BFE8 /* crypto_sign.h */,
-				DA0979401E9A824700F0BFE8 /* crypto_sign_ed25519.h */,
-				DA0979411E9A824700F0BFE8 /* crypto_sign_edwards25519sha512batch.h */,
-				DA0979421E9A824700F0BFE8 /* crypto_stream.h */,
-				DA0979431E9A824700F0BFE8 /* crypto_stream_aes128ctr.h */,
-				DA0979441E9A824700F0BFE8 /* crypto_stream_chacha20.h */,
-				DA0979451E9A824700F0BFE8 /* crypto_stream_salsa20.h */,
-				DA0979461E9A824700F0BFE8 /* crypto_stream_salsa2012.h */,
-				DA0979471E9A824700F0BFE8 /* crypto_stream_salsa208.h */,
-				DA0979481E9A824700F0BFE8 /* crypto_stream_xchacha20.h */,
-				DA0979491E9A824700F0BFE8 /* crypto_stream_xsalsa20.h */,
-				DA09794A1E9A824700F0BFE8 /* crypto_verify_16.h */,
-				DA09794B1E9A824700F0BFE8 /* crypto_verify_32.h */,
-				DA09794C1E9A824700F0BFE8 /* crypto_verify_64.h */,
-				DA09794D1E9A824700F0BFE8 /* export.h */,
-				DA09794E1E9A824700F0BFE8 /* randombytes.h */,
-				DA09794F1E9A824700F0BFE8 /* randombytes_salsa20_random.h */,
-				DA0979501E9A824700F0BFE8 /* randombytes_sysrandom.h */,
-				DA0979511E9A824700F0BFE8 /* runtime.h */,
-				DA0979521E9A824700F0BFE8 /* utils.h */,
-				DA0979531E9A824700F0BFE8 /* version.h */,
-			);
-			path = sodium;
-			sourceTree = "<group>";
-		};
-		DA0979551E9A824700F0BFE8 /* lib */ = {
-			isa = PBXGroup;
-			children = (
-				DA0979571E9A824700F0BFE8 /* libsodium.a */,
-			);
-			path = lib;
-			sourceTree = "<group>";
-		};
 		DA0CC53C1EB57B69009A8ED9 /* Fabric */ = {
 			isa = PBXGroup;
 			children = (
@@ -1317,7 +1224,7 @@
 				DA1C7ABC1F1A8F6E009A3551 /* mpw-tests.c */,
 			);
 			name = cli;
-			path = "../../platform-independent/cli-c/cli";
+			path = ../../cli/src;
 			sourceTree = "<group>";
 		};
 		DA2508F819513C1400AC23F1 /* Other Frameworks */ = {
@@ -1343,7 +1250,7 @@
 		DA5BFA39147E415C00F98B1E = {
 			isa = PBXGroup;
 			children = (
-				DA6773291A4746AF004F356A /* C */,
+				DA6773291A4746AF004F356A /* core */,
 				DA5E5C961724A667003798D8 /* Source */,
 				DACA23B41705DF7D002C6C22 /* Resources */,
 				DACA22121705DDC5002C6C22 /* External */,
@@ -1889,7 +1796,7 @@
 			path = Insignia;
 			sourceTree = "<group>";
 		};
-		DA6773291A4746AF004F356A /* C */ = {
+		DA6773291A4746AF004F356A /* core */ = {
 			isa = PBXGroup;
 			children = (
 				DAB07C9E1F7725D400CC6D43 /* aes.c */,
@@ -1912,8 +1819,8 @@
 				DA6773C51A4746AF004F356A /* mpw-util.c */,
 				DA6773C61A4746AF004F356A /* mpw-util.h */,
 			);
-			name = C;
-			path = ../core/c;
+			name = core;
+			path = "../platform-independent/c/core/src";
 			sourceTree = "<group>";
 		};
 		DA89D4E51A51E53100AC64D7 /* Pearl-Cocoa */ = {
@@ -1935,6 +1842,148 @@
 			path = include;
 			sourceTree = "<group>";
 		};
+		DAA7BBC920C4C17300101DC7 /* libsodium-macos */ = {
+			isa = PBXGroup;
+			children = (
+				DAA7BBCB20C4C17300101DC7 /* lib */,
+				DAA7BBCF20C4C17300101DC7 /* sodium */,
+				DAA7BC0C20C4C17300101DC7 /* sodium.h */,
+			);
+			name = "libsodium-macos";
+			path = "../../lib/libsodium/build-macos~/out";
+			sourceTree = "<group>";
+		};
+		DAA7BBCB20C4C17300101DC7 /* lib */ = {
+			isa = PBXGroup;
+			children = (
+				DAA7BBCC20C4C17300101DC7 /* libsodium.dylib */,
+				DAA7BBCD20C4C17300101DC7 /* libsodium.23.dylib */,
+				DAA7BBCE20C4C17300101DC7 /* libsodium.a */,
+			);
+			path = lib;
+			sourceTree = "<group>";
+		};
+		DAA7BBCF20C4C17300101DC7 /* sodium */ = {
+			isa = PBXGroup;
+			children = (
+				DAA7BBD020C4C17300101DC7 /* crypto_stream_salsa2012.h */,
+				DAA7BBD120C4C17300101DC7 /* crypto_auth.h */,
+				DAA7BBD220C4C17300101DC7 /* utils.h */,
+				DAA7BBD320C4C17300101DC7 /* crypto_core_hchacha20.h */,
+				DAA7BBD420C4C17300101DC7 /* crypto_hash_sha512.h */,
+				DAA7BBD520C4C17300101DC7 /* core.h */,
+				DAA7BBD620C4C17300101DC7 /* version.h */,
+				DAA7BBD720C4C17300101DC7 /* export.h */,
+				DAA7BBD820C4C17300101DC7 /* randombytes_salsa20_random.h */,
+				DAA7BBD920C4C17300101DC7 /* crypto_core_salsa20.h */,
+				DAA7BBDA20C4C17300101DC7 /* crypto_shorthash_siphash24.h */,
+				DAA7BBDB20C4C17300101DC7 /* randombytes.h */,
+				DAA7BBDC20C4C17300101DC7 /* crypto_hash_sha256.h */,
+				DAA7BBDD20C4C17300101DC7 /* crypto_stream.h */,
+				DAA7BBDE20C4C17300101DC7 /* crypto_auth_hmacsha512.h */,
+				DAA7BBDF20C4C17300101DC7 /* crypto_aead_xchacha20poly1305.h */,
+				DAA7BBE020C4C17300101DC7 /* crypto_stream_salsa20.h */,
+				DAA7BBE120C4C17300101DC7 /* crypto_onetimeauth_poly1305.h */,
+				DAA7BBE220C4C17300101DC7 /* crypto_kx.h */,
+				DAA7BBE320C4C17300101DC7 /* crypto_hash.h */,
+				DAA7BBE420C4C17300101DC7 /* crypto_sign.h */,
+				DAA7BBE520C4C17300101DC7 /* crypto_kdf.h */,
+				DAA7BBE620C4C17300101DC7 /* crypto_auth_hmacsha256.h */,
+				DAA7BBE720C4C17300101DC7 /* crypto_box.h */,
+				DAA7BBE820C4C17300101DC7 /* crypto_verify_32.h */,
+				DAA7BBE920C4C17300101DC7 /* crypto_stream_xchacha20.h */,
+				DAA7BBEA20C4C17300101DC7 /* crypto_core_salsa208.h */,
+				DAA7BBEB20C4C17300101DC7 /* crypto_auth_hmacsha512256.h */,
+				DAA7BBEC20C4C17300101DC7 /* crypto_aead_chacha20poly1305.h */,
+				DAA7BBED20C4C17300101DC7 /* randombytes_sysrandom.h */,
+				DAA7BBEE20C4C17300101DC7 /* runtime.h */,
+				DAA7BBEF20C4C17300101DC7 /* crypto_stream_salsa208.h */,
+				DAA7BBF020C4C17300101DC7 /* crypto_aead_aes256gcm.h */,
+				DAA7BBF120C4C17300101DC7 /* crypto_core_salsa2012.h */,
+				DAA7BBF220C4C17300101DC7 /* crypto_secretbox_xchacha20poly1305.h */,
+				DAA7BBF320C4C17300101DC7 /* crypto_scalarmult.h */,
+				DAA7BBF420C4C17300101DC7 /* crypto_pwhash.h */,
+				DAA7BBF520C4C17300101DC7 /* crypto_verify_16.h */,
+				DAA7BBF620C4C17300101DC7 /* crypto_stream_chacha20.h */,
+				DAA7BBF720C4C17300101DC7 /* crypto_stream_xsalsa20.h */,
+				DAA7BBF820C4C17300101DC7 /* crypto_core_hsalsa20.h */,
+				DAA7BBF920C4C17300101DC7 /* crypto_kdf_blake2b.h */,
+				DAA7BBFA20C4C17300101DC7 /* crypto_scalarmult_curve25519.h */,
+				DAA7BBFB20C4C17300101DC7 /* crypto_shorthash.h */,
+				DAA7BBFC20C4C17300101DC7 /* crypto_pwhash_argon2id.h */,
+				DAA7BBFD20C4C17300101DC7 /* crypto_secretstream_xchacha20poly1305.h */,
+				DAA7BBFE20C4C17300101DC7 /* crypto_pwhash_scryptsalsa208sha256.h */,
+				DAA7BBFF20C4C17300101DC7 /* crypto_sign_ed25519.h */,
+				DAA7BC0020C4C17300101DC7 /* crypto_onetimeauth.h */,
+				DAA7BC0120C4C17300101DC7 /* crypto_verify_64.h */,
+				DAA7BC0220C4C17300101DC7 /* crypto_box_curve25519xchacha20poly1305.h */,
+				DAA7BC0320C4C17300101DC7 /* crypto_core_ed25519.h */,
+				DAA7BC0420C4C17300101DC7 /* crypto_pwhash_argon2i.h */,
+				DAA7BC0520C4C17300101DC7 /* crypto_generichash.h */,
+				DAA7BC0620C4C17300101DC7 /* crypto_secretbox_xsalsa20poly1305.h */,
+				DAA7BC0720C4C17300101DC7 /* crypto_secretbox.h */,
+				DAA7BC0820C4C17300101DC7 /* crypto_scalarmult_ed25519.h */,
+				DAA7BC0920C4C17300101DC7 /* crypto_box_curve25519xsalsa20poly1305.h */,
+				DAA7BC0A20C4C17300101DC7 /* crypto_generichash_blake2b.h */,
+				DAA7BC0B20C4C17300101DC7 /* crypto_sign_edwards25519sha512batch.h */,
+			);
+			path = sodium;
+			sourceTree = "<group>";
+		};
+		DAA7BC0D20C4C1B500101DC7 /* libjson-c-macos */ = {
+			isa = PBXGroup;
+			children = (
+				DAA7BC0E20C4C1B500101DC7 /* include */,
+				DAA7BC2520C4C1B500101DC7 /* lib */,
+			);
+			name = "libjson-c-macos";
+			path = "../../lib/libjson-c/build-macos~/out";
+			sourceTree = "<group>";
+		};
+		DAA7BC0E20C4C1B500101DC7 /* include */ = {
+			isa = PBXGroup;
+			children = (
+				DAA7BC0F20C4C1B500101DC7 /* json-c */,
+			);
+			path = include;
+			sourceTree = "<group>";
+		};
+		DAA7BC0F20C4C1B500101DC7 /* json-c */ = {
+			isa = PBXGroup;
+			children = (
+				DAA7BC1020C4C1B500101DC7 /* printbuf.h */,
+				DAA7BC1120C4C1B500101DC7 /* math_compat.h */,
+				DAA7BC1220C4C1B500101DC7 /* debug.h */,
+				DAA7BC1320C4C1B500101DC7 /* vasprintf_compat.h */,
+				DAA7BC1420C4C1B500101DC7 /* json_util.h */,
+				DAA7BC1520C4C1B500101DC7 /* json_config.h */,
+				DAA7BC1620C4C1B500101DC7 /* json_pointer.h */,
+				DAA7BC1720C4C1B500101DC7 /* json_visit.h */,
+				DAA7BC1820C4C1B500101DC7 /* random_seed.h */,
+				DAA7BC1920C4C1B500101DC7 /* json.h */,
+				DAA7BC1A20C4C1B500101DC7 /* json_c_version.h */,
+				DAA7BC1B20C4C1B500101DC7 /* json_object_private.h */,
+				DAA7BC1C20C4C1B500101DC7 /* strerror_override.h */,
+				DAA7BC1D20C4C1B500101DC7 /* arraylist.h */,
+				DAA7BC1E20C4C1B500101DC7 /* linkhash.h */,
+				DAA7BC1F20C4C1B500101DC7 /* json_tokener.h */,
+				DAA7BC2020C4C1B500101DC7 /* json_object_iterator.h */,
+				DAA7BC2120C4C1B500101DC7 /* json_inttypes.h */,
+				DAA7BC2220C4C1B500101DC7 /* bits.h */,
+				DAA7BC2320C4C1B500101DC7 /* strdup_compat.h */,
+				DAA7BC2420C4C1B500101DC7 /* json_object.h */,
+			);
+			path = "json-c";
+			sourceTree = "<group>";
+		};
+		DAA7BC2520C4C1B500101DC7 /* lib */ = {
+			isa = PBXGroup;
+			children = (
+				DAA7BC2620C4C1B500101DC7 /* libjson-c.a */,
+			);
+			path = lib;
+			sourceTree = "<group>";
+		};
 		DAADCC6819FB007F00987B1D /* KCOrderedAccessorFix */ = {
 			isa = PBXGroup;
 			children = (
@@ -1944,59 +1993,6 @@
 			path = KCOrderedAccessorFix;
 			sourceTree = "<group>";
 		};
-		DAB7AE781F3D757B00C856B1 /* libjson-c-osx */ = {
-			isa = PBXGroup;
-			children = (
-				DAB7AE791F3D757B00C856B1 /* include */,
-				DAB7AE8F1F3D757B00C856B1 /* lib */,
-			);
-			name = "libjson-c-osx";
-			path = "libjson-c/libjson-c-osx";
-			sourceTree = "<group>";
-		};
-		DAB7AE791F3D757B00C856B1 /* include */ = {
-			isa = PBXGroup;
-			children = (
-				DAB7AE7A1F3D757B00C856B1 /* json-c */,
-			);
-			path = include;
-			sourceTree = "<group>";
-		};
-		DAB7AE7A1F3D757B00C856B1 /* json-c */ = {
-			isa = PBXGroup;
-			children = (
-				DAB7AE7B1F3D757B00C856B1 /* arraylist.h */,
-				DAB7AE7C1F3D757B00C856B1 /* bits.h */,
-				DAB7AE7D1F3D757B00C856B1 /* debug.h */,
-				DAB7AE7E1F3D757B00C856B1 /* json.h */,
-				DAB7AE7F1F3D757B00C856B1 /* json_c_version.h */,
-				DAB7AE801F3D757B00C856B1 /* json_config.h */,
-				DAB7AE811F3D757B00C856B1 /* json_inttypes.h */,
-				DAB7AE821F3D757B00C856B1 /* json_object.h */,
-				DAB7AE831F3D757B00C856B1 /* json_object_iterator.h */,
-				DAB7AE841F3D757B00C856B1 /* json_object_private.h */,
-				DAB7AE851F3D757B00C856B1 /* json_pointer.h */,
-				DAB7AE861F3D757B00C856B1 /* json_tokener.h */,
-				DAB7AE871F3D757B00C856B1 /* json_util.h */,
-				DAB7AE881F3D757B00C856B1 /* json_visit.h */,
-				DAB7AE891F3D757B00C856B1 /* linkhash.h */,
-				DAB7AE8A1F3D757B00C856B1 /* math_compat.h */,
-				DAB7AE8B1F3D757B00C856B1 /* printbuf.h */,
-				DAB7AE8C1F3D757B00C856B1 /* random_seed.h */,
-				DAB7AE8D1F3D757B00C856B1 /* strdup_compat.h */,
-				DAB7AE8E1F3D757B00C856B1 /* vasprintf_compat.h */,
-			);
-			path = "json-c";
-			sourceTree = "<group>";
-		};
-		DAB7AE8F1F3D757B00C856B1 /* lib */ = {
-			isa = PBXGroup;
-			children = (
-				DAB7AE901F3D757B00C856B1 /* libjson-c.a */,
-			);
-			path = lib;
-			sourceTree = "<group>";
-		};
 		DAC77CAF148291A600BCF976 /* Pearl */ = {
 			isa = PBXGroup;
 			children = (
@@ -2011,8 +2007,8 @@
 		DACA22121705DDC5002C6C22 /* External */ = {
 			isa = PBXGroup;
 			children = (
-				DAB7AE781F3D757B00C856B1 /* libjson-c-osx */,
-				DA0979181E9A824700F0BFE8 /* libsodium-osx */,
+				DAA7BC0D20C4C1B500101DC7 /* libjson-c-macos */,
+				DAA7BBC920C4C17300101DC7 /* libsodium-macos */,
 				DACA29751705E2BD002C6C22 /* jrswizzle */,
 				DAADCC6819FB007F00987B1D /* KCOrderedAccessorFix */,
 				DA3B8449190FC5A900246EEA /* Mac */,
@@ -2312,31 +2308,31 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXLegacyTarget section */
-		DA5B0B611F3D416500B663F0 /* libsodium-osx */ = {
+		DA5B0B611F3D416500B663F0 /* libsodium-macos */ = {
 			isa = PBXLegacyTarget;
 			buildArgumentsString = "$(ACTION)";
-			buildConfigurationList = DA5B0B621F3D416500B663F0 /* Build configuration list for PBXLegacyTarget "libsodium-osx" */;
+			buildConfigurationList = DA5B0B621F3D416500B663F0 /* Build configuration list for PBXLegacyTarget "libsodium-macos" */;
 			buildPhases = (
 			);
-			buildToolPath = "Scripts/build_libsodium-osx";
+			buildToolPath = "../lib/bin/build_libsodium-macos";
 			buildWorkingDirectory = "";
 			dependencies = (
 			);
-			name = "libsodium-osx";
+			name = "libsodium-macos";
 			passBuildSettingsInEnvironment = 1;
 			productName = "libsodium-osx";
 		};
-		DAB7AE421F3D466D00C856B1 /* libjson-c-osx */ = {
+		DAB7AE421F3D466D00C856B1 /* libjson-c-macos */ = {
 			isa = PBXLegacyTarget;
 			buildArgumentsString = "$(ACTION)";
-			buildConfigurationList = DAB7AE431F3D466D00C856B1 /* Build configuration list for PBXLegacyTarget "libjson-c-osx" */;
+			buildConfigurationList = DAB7AE431F3D466D00C856B1 /* Build configuration list for PBXLegacyTarget "libjson-c-macos" */;
 			buildPhases = (
 			);
-			buildToolPath = "Scripts/build_libjson-c-osx";
+			buildToolPath = "../lib/bin/build_libjson-c-macos";
 			buildWorkingDirectory = "";
 			dependencies = (
 			);
-			name = "libjson-c-osx";
+			name = "libjson-c-macos";
 			passBuildSettingsInEnvironment = 1;
 			productName = "libjson-c";
 		};
@@ -2553,8 +2549,8 @@
 				DA67743A1A474A03004F356A /* mpw-test */,
 				DA1C7AC61F1A8FD8009A3551 /* mpw-bench */,
 				DA1C7AA61F1A8F24009A3551 /* mpw-cli */,
-				DA5B0B611F3D416500B663F0 /* libsodium-osx */,
-				DAB7AE421F3D466D00C856B1 /* libjson-c-osx */,
+				DA5B0B611F3D416500B663F0 /* libsodium-macos */,
+				DAB7AE421F3D466D00C856B1 /* libjson-c-macos */,
 			);
 		};
 /* End PBXProject section */
@@ -2843,32 +2839,32 @@
 /* Begin PBXTargetDependency section */
 		DAB7AE351F3D423600C856B1 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = DA5B0B611F3D416500B663F0 /* libsodium-osx */;
+			target = DA5B0B611F3D416500B663F0 /* libsodium-macos */;
 			targetProxy = DAB7AE341F3D423600C856B1 /* PBXContainerItemProxy */;
 		};
 		DAB7AE371F3D423D00C856B1 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = DA5B0B611F3D416500B663F0 /* libsodium-osx */;
+			target = DA5B0B611F3D416500B663F0 /* libsodium-macos */;
 			targetProxy = DAB7AE361F3D423D00C856B1 /* PBXContainerItemProxy */;
 		};
 		DAB7AE391F3D424200C856B1 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = DA5B0B611F3D416500B663F0 /* libsodium-osx */;
+			target = DA5B0B611F3D416500B663F0 /* libsodium-macos */;
 			targetProxy = DAB7AE381F3D424200C856B1 /* PBXContainerItemProxy */;
 		};
 		DAB7AE3B1F3D424700C856B1 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = DA5B0B611F3D416500B663F0 /* libsodium-osx */;
+			target = DA5B0B611F3D416500B663F0 /* libsodium-macos */;
 			targetProxy = DAB7AE3A1F3D424700C856B1 /* PBXContainerItemProxy */;
 		};
 		DAB7AE521F3D649400C856B1 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = DAB7AE421F3D466D00C856B1 /* libjson-c-osx */;
+			target = DAB7AE421F3D466D00C856B1 /* libjson-c-macos */;
 			targetProxy = DAB7AE511F3D649400C856B1 /* PBXContainerItemProxy */;
 		};
 		DAB7AE581F3D64A600C856B1 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = DAB7AE421F3D466D00C856B1 /* libjson-c-osx */;
+			target = DAB7AE421F3D466D00C856B1 /* libjson-c-macos */;
 			targetProxy = DAB7AE571F3D64A600C856B1 /* PBXContainerItemProxy */;
 		};
 		DABFA072176E3FDF00E83589 /* PBXTargetDependency */ = {
@@ -2996,15 +2992,8 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"\"$(PROJECT_DIR)/External/libsodium/libsodium-osx/include\"",
-					"\"$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/include\"",
-					"$(inherited)",
-				);
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherit)";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";
@@ -3032,12 +3021,17 @@
 				);
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				INFOPLIST_FILE = "Source/Mac/MasterPassword-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
-					"$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3088,13 +3082,15 @@
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					/usr/include/libxml2,
 					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+					/usr/include/libxml2,
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3107,10 +3103,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
-					"$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3126,10 +3127,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
-					"$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3145,10 +3151,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
-					"$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3164,9 +3175,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3180,9 +3197,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3196,9 +3219,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3352,15 +3381,8 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"\"$(PROJECT_DIR)/External/libsodium/libsodium-osx/include\"",
-					"\"$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/include\"",
-					"$(inherited)",
-				);
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherit)";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3459,15 +3481,8 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					"\"$(PROJECT_DIR)/External/libsodium/libsodium-osx/include\"",
-					"\"$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/include\"",
-					"$(inherited)",
-				);
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherit)";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";
@@ -3495,12 +3510,17 @@
 				);
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				INFOPLIST_FILE = "Source/Mac/MasterPassword-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
-					"$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3527,12 +3547,17 @@
 				);
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+				);
 				INFOPLIST_FILE = "Source/Mac/MasterPassword-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
-					"$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3549,13 +3574,15 @@
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					/usr/include/libxml2,
 					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+					/usr/include/libxml2,
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3569,13 +3596,15 @@
 			buildSettings = {
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				HEADER_SEARCH_PATHS = (
-					"\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"",
-					/usr/include/libxml2,
 					"$(inherited)",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/include\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/include\"",
+					/usr/include/libxml2,
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib",
+					"\"$(PROJECT_DIR)/../lib/libsodium/build-macos~/out/lib\"",
+					"\"$(PROJECT_DIR)/../lib/libjson-c/build-macos~/out/lib\"",
 				);
 				OTHER_CFLAGS = (
 					"-DMPW_SODIUM=1",
@@ -3734,7 +3763,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Test;
 		};
-		DA5B0B621F3D416500B663F0 /* Build configuration list for PBXLegacyTarget "libsodium-osx" */ = {
+		DA5B0B621F3D416500B663F0 /* Build configuration list for PBXLegacyTarget "libsodium-macos" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				DA5B0B631F3D416500B663F0 /* Debug */,
@@ -3784,7 +3813,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Test;
 		};
-		DAB7AE431F3D466D00C856B1 /* Build configuration list for PBXLegacyTarget "libjson-c-osx" */ = {
+		DAB7AE431F3D466D00C856B1 /* Build configuration list for PBXLegacyTarget "libjson-c-macos" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				DAB7AE441F3D466D00C856B1 /* Debug */,

platform-darwin/MasterPassword.xcworkspace/contents.xcworkspacedata

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
+   <FileRef
+      location = "group:MasterPassword-JNI.xcodeproj">
+   </FileRef>
    <FileRef
       location = "group:MasterPassword-iOS.xcodeproj">
    </FileRef>

platform-darwin/MasterPassword.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

platform-darwin/Scripts/bashlib

@@ -66,12 +66,6 @@
 #     readwhile command [args]
 # Outputs the characters typed by the user into the terminal's input buffer while running the given command.
 #
-#     pushqueue element ...
-# Pushes the given arguments as elements onto the queue.
-#
-#     popqueue
-# Pops one element off the queue.
-#
 #     log [format] [arguments...]
 # Log an event at a certain importance level.
 # The event is expressed as a printf(1) format argument.
@@ -85,7 +79,7 @@
 #     reverse [-0|-d delimitor] [elements ...] [<<< elements]
 # Reverse the order of the given elements.
 #
-#     order [-0|-d char] [-[cC] isAscending|-n] [-t number] [elements ...] [<<< elements]
+#     order [-0|-d char] [-[cC] comparator|-n] [-t number] [elements ...] [<<< elements]
 # Orders the elements in ascending order.
 #
 #     mutex file
@@ -180,6 +174,9 @@ genToc() {
 # |                                          .:  GLOBAL DECLARATIONS  :. |
 # |______________________________________________________________________|
 
+# Environment
+export TMPDIR=${TMPDIR:-/tmp} TMPDIR=${TMPDIR%/} TERM=${TERM:-dumb}
+
 # Variables for convenience sequences.
 bobber=(     '.' 'o' 'O' 'o' )
 spinner=(    '-' \\  '|' '/' )
@@ -190,8 +187,8 @@ runner=(     '> >'           \
 
 # Variables for terminal requests.
 [[ -t 2 && $TERM != dumb ]] && {
-    COLUMNS=$(  tput cols   || tput co      ) # Columns in a line
-    LINES=$(    tput lines  || tput li      ) # Lines on screen
+    COLUMNS=$({ tput cols   || tput co;} 2>&3) # Columns in a line
+    LINES=$({   tput lines  || tput li;} 2>&3) # Lines on screen
     alt=$(      tput smcup  || tput ti      ) # Start alt display
     ealt=$(     tput rmcup  || tput te      ) # End   alt display
     hide=$(     tput civis  || tput vi      ) # Hide cursor
@@ -230,7 +227,7 @@ runner=(     '> >'           \
                 tput eA; tput as;
                 tput ac; tput ae;         } )   # Drawing characters
     back=$'\b'
-} ||:
+} 3>&2 2>/dev/null ||:
 
 
 
@@ -264,7 +261,10 @@ chr() {
 # Outputs the decimal ASCII value of the given character.
 #
 ord() {
-    printf '%d' "'$1"
+    local str=$1 s
+    for (( s=0; s < ${#str}; ++s )); do
+        printf '%d' "'${str:s:1}"
+    done
 } # _____________________________________________________________________
 
 
@@ -277,7 +277,10 @@ ord() {
 # Outputs the hexadecimal ASCII value of the given character.
 #
 hex() { 
-    printf '%x' "'$1"
+    local str=$1 s
+    for (( s=0; s < ${#str}; ++s )); do
+        printf '%02X' "'${str:s:1}"
+    done
 } # _____________________________________________________________________
 
 
@@ -290,7 +293,10 @@ hex() {
 # Outputs the character that has the given hexadecimal ASCII value.
 #
 unhex() {
-    printf "\\x$1"
+    local hex=$1 h
+    for (( h=0; h < ${#hex}; h+=2 )); do
+        printf "\\x${hex:h:2}"
+    done
 } # _____________________________________________________________________
 
 
@@ -329,6 +335,26 @@ min() {
 
 
 
+#  ______________________________________________________________________
+# |__ si ________________________________________________________________|
+#
+#       si number
+#
+# Output a human-readable version of the number using SI units.
+#
+si() {
+    local number=$1
+
+    if (( number >= 1000000000000000 )); then printf '%dM' "$((number / 1000000000000000))"
+    elif (( number >= 1000000000000 )); then printf '%dM' "$((number / 1000000000000))"
+    elif (( number >= 1000000000 )); then printf '%dM' "$((number / 1000000000))"
+    elif (( number >= 1000000 )); then printf '%dM' "$((number / 1000000))"
+    elif (( number >= 1000 )); then printf '%dk' "$((number / 1000))"
+    else printf '%d' "$number"; fi
+} # _____________________________________________________________________
+
+
+
 #  ______________________________________________________________________
 # |__ totime ____________________________________________________________|
 #
@@ -528,6 +554,50 @@ iterate() (
     fi
 ) # _____________________________________________________________________
 
+
+
+#  _______________________________________________________________________
+# |__ csvline ____________________________________________________________|
+#
+#       csvline [-d delimiter] [-D line-delimiter]
+#
+# Parse a CSV record from standard input, storing the fields in the CSVLINE array.
+#
+# By default, a single line of input is read and parsed into comma-delimited fields.
+# Fields can optionally contain double-quoted data, including field delimiters.
+#
+# A different field delimiter can be specified using -d.  You can use -D
+# to change the definition of a "record" (eg. to support NULL-delimited records).
+#
+csvline() {
+    CSVLINE=()
+    local line field quoted=0 delimiter=, lineDelimiter=$'\n' c
+    local OPTIND=1 arg
+    while getopts :d: arg; do
+        case $arg in
+            d) delimiter=$OPTARG ;;
+        esac
+    done
+
+    IFS= read -d "$lineDelimiter" -r line || return
+    while IFS= read -rn1 c; do
+        case $c in
+            '"')
+                (( quoted = !quoted ))
+                continue ;;
+            $delimiter)
+                if (( ! quoted )); then
+                    CSVLINE+=( "$field" ) field=
+                    continue
+                fi ;;
+        esac
+        field+=$c
+    done <<< "$line"
+    [[ $field ]] && CSVLINE+=( "$field" ) ||:
+} # _____________________________________________________________________
+
+
+
 #  ______________________________________________________________________
 # |__ Logging ___________________________________________________________|
 #
@@ -551,11 +621,11 @@ iterate() (
 # The closing statement also takes a format and arguments, which are displayed in the spinner.
 #
 log() {
-    local exitcode=$? level=${level:-inf} supported=0 end=$'\n' type=msg conMsg= logMsg= format= colorFormat= date= info= arg= args=() colorArgs=() ruler=
+    local exitcode=$? result=0 level=${level:-inf} supported=0 end=$'\n' type=msg conMsg= logMsg= format= colorFormat= date= info= arg= args=() colorArgs=() ruler=
 
     # Handle options.
     local OPTIND=1
-    while getopts :tpuPrR:d:n arg; do
+    while getopts :tpuPrR:d:nx arg; do
         case $arg in
             p)
                 end='.. '
@@ -573,13 +643,14 @@ log() {
                 end=$OPTARG ;;
             n)
                 end= ;;
-            t)
-                date=$(date +"${_logDate:-%H:%M}") ;;
+            x)
+                result=$exitcode ;;
         esac
     done
     shift "$((OPTIND-1))"
     format=$1 args=( "${@:2}" )
     (( ! ${#args[@]} )) && [[ $format ]] && { args=("$format") format=%s; local bold=; }
+    date=${_logDate+$(date +"${_logDate:-%H:%M}")}
 
     # Level-specific settings.
     local logLevelColor
@@ -600,17 +671,17 @@ log() {
                 log FTL 'Log level %s does not exist' "$level"
                 exit 1 ;;
     esac
-    (( ! supported )) && return "$exitcode"
+    (( ! supported )) && return "$result"
     local logColor=${_logColor:+$logLevelColor}
 
     # Generate the log message.
     case $type in
         msg|startProgress)
-            printf -v logMsg "[${date:+%s }%-3s] $format$end" ${date:+"$date"} "$level" "${args[@]}"
+            printf -v logMsg "${date:+%s }${_logLevel:+%-3s }$format$end" ${date:+"$date"} ${_logLevel:+"$level"} "${args[@]}"
             if (( _logColor )); then
-                colorFormat=$(sed ${reset:+-e "s/$(requote "$reset")/$reset$logColor/g"} -e "s/%[^a-z]*[a-z]/$reset$bold$logColor&$reset$logColor/g" <<< "$format")
-                colorArgs=("${args[@]//$reset/$reset$bold$logColor}")
-                printf -v conMsg "$reset[${date:+%s }$logColor$bold%-3s$reset] $logColor$colorFormat$reset$black\$$reset$end$save" ${date:+"$date"} "$level" "${colorArgs[@]}"
+                colorFormat=$(sed ${reset:+-e "s/$(requote "$reset")/$reset$_logAttributes$logColor/g"} -e "s/%[^a-z]*[a-z]/$reset$_logAttributes$bold$logColor&$reset$_logAttributes$logColor/g" <<< "$format")
+                colorArgs=("${args[@]//$reset/$reset$_logAttributes$bold$logColor}")
+                printf -v conMsg "$reset$_logAttributes${date:+%s }${_logLevel:+$logColor$bold%-3s$reset $_logAttributes}$logColor$colorFormat$reset$_logAttributes$black\$$reset$end$save" ${date:+"$date"} ${_logLevel:+"$level"} "${colorArgs[@]}"
             else
                 conMsg=$logMsg
             fi
@@ -619,15 +690,17 @@ log() {
         updateProgress)
             printf -v logMsg printf " [$format]" "${args[@]}"
             if (( _logColor )); then
-                colorFormat=$(sed ${reset:+-e "s/$(requote "$reset")/$reset$logColor/g"} -e "s/%[^a-z]*[a-z]/$reset$bold$logColor&$reset$logColor/g" <<< "$format")
-                colorArgs=("${args[@]//$reset/$reset$bold$logColor}")
-                printf -v conMsg "$load$eel$blue$bold[$reset$logColor$colorFormat$reset$blue$bold]$reset$end" "${colorArgs[@]}"
+                colorFormat=$(sed ${reset:+-e "s/$(requote "$reset")/$reset$_logAttributes$logColor/g"} -e "s/%[^a-z]*[a-z]/$reset$_logAttributes$bold$logColor&$reset$_logAttributes$logColor/g" <<< "$format")
+                colorArgs=("${args[@]//$reset/$reset$_logAttributes$bold$logColor}")
+                printf -v conMsg "$load$eel$blue$bold[$reset$_logAttributes$logColor$colorFormat$reset$_logAttributes$blue$bold]$reset$end" "${colorArgs[@]}"
             else
                 conMsg=$logMsg
             fi
         ;;
 
         stopProgress)
+            ! kill -0 "$_logSpinner" 2>/dev/null && return
+
             case $exitcode in
                 0)  printf -v logMsg "done${format:+ ($format)}.\n" "${args[@]}"
                     if (( _logColor )); then
@@ -653,15 +726,17 @@ log() {
 
     # Create the log file.
     if [[ $_logFile && ! -e $_logFile ]]; then
-        [[ $_logFile = */* ]] || $_logFile=./$logFile
+        [[ $_logFile = */* ]] || _logFile=./$_logFile
         mkdir -p "${_logFile%/*}" && touch "$_logFile"
     fi
 
     # Stop the spinner.
     if [[ $type = stopProgress && $_logSpinner ]]; then
-        kill "$_logSpinner"
-        wait "$_logSpinner" 2>/dev/null
-        unset _logSpinner
+        {
+            kill "$_logSpinner" ||:
+            wait "$_logSpinner" ||:
+            unset _logSpinner
+        } 2>/dev/null
     fi
 
     # Output the ruler.
@@ -685,9 +760,10 @@ log() {
             while printf >&2 "$eel$blue$bold[$reset%s$reset$blue$bold]$reset\b\b\b" "${spinner[s++ % ${#spinner[@]}]}" && sleep .1
             do :; done
         } & _logSpinner=$!
+        addtrap EXIT 'level=%q _logSpinner=%q golp' "$level" "$_logSpinner"
     fi
 
-    return $exitcode
+    return $result
 }
 trc() { level=TRC log "$@"; }
 dbg() { level=DBG log "$@"; }
@@ -718,6 +794,8 @@ rrep() { level=ERR golp "$@"; }
 ltfp() { level=FTL golp "$@"; }
 _logColor=${_logColor:-$([[ -t 2 ]] && echo 1)} _logVerbosity=2
 _logTrcColor=$grey _logDbgColor=$blue _logInfColor=$white _logWrnColor=$yellow _logErrColor=$red _logFtlColor=$bold$red
+#_logDate=%H:%M # Set this to enable date output in log messages.
+#_logLevel=1 # Set this to enable level output in log messages.
 # _______________________________________________________________________
 
 
@@ -794,10 +872,10 @@ ask() {
             printf '%s' "$muteChar"                                 >&$fd
         done
         REPLY=$reply
+        [[ $options && $REPLY ]] || (( silent )) && printf '\n'     >&$fd
     else
         read -u8 -e ${options:+-n1} ${silent:+-s}
     fi
-    [[ $options && $REPLY ]] || (( silent )) && printf '\n'         >&$fd
 
     # Evaluate the reply.
     while true; do
@@ -886,7 +964,7 @@ reverse() {
 #  ______________________________________________________________________
 # |__ Order _____________________________________________________________|
 #
-#       order [-0|-d char] [-[fF] isDesired] [-[cC] isAscending|-n|-r|-t] [-T number] [-a array|elements ...] [<<< elements]
+#       order [-0|-d char] [-[fF] isDesired] [-[cC] comparator|-n|-R|-t] [-r] [-T number] [-a array|elements ...] [<<< elements]
 #
 # Orders the elements in ascending order.
 # Elements are read from command arguments or standard input if no element
@@ -895,21 +973,23 @@ reverse() {
 #
 # By default, the elements will be ordered using lexicographic comparison.
 # If the -n option is given, the elements will be ordered numerically.
-# If the -r option is given, the elements will be ordered randomly.
+# If the -R option is given, the elements will be ordered randomly.
+# If the -t option is given, the elements are ordered by file mtime.
 # If the -f option is given, the command name following it will be used
 # as a filter.
 # If the -c option is given, the command name following it will be used
 # as a comparator.
 # If the -C option is given, the bash code following it will be used
 # as a comparator.
-# If the -t option is given, only the first number results are returned.
+# If the -r option is given, the ordering will be reversed.
+# If the -T option is given, only the first number results are returned.
 # If the -a option is given, the elements in array are ordered instead and
 # array is mutated to contain the result.
 # If number is 0, all results are returned.
 #
 # isDesired is a command name which will get one parameter.  The parameter
 # is an element which will only be included if the command exits successfully.
-# isAscending is a command name which will be executed for each element
+# comparator is a command name which will be executed for each element
 # comparison and will be passed two element arguments.  The command should
 # succeed if the first argument is less than the second argument for the
 # purpose of this sort.
@@ -924,59 +1004,61 @@ reverse() {
 order() {
    
     # Initialize the vars.
-    local delimitor=$'\n' i isDesired=true isAscending=string_ascends top=0 arrayName= array=
+    local _delimitor=$'\n' _i _j _isDesired=true _comparator=string_ascends _comparator_ascends=1 _top=0 _arrayName= _array=
 
     # Parse the options.
     local OPTIND=1
-    while getopts :0nrd:f:F:c:C:tT:a: opt; do
+    while getopts :0nrRd:f:F:c:C:tT:a: opt; do
         case $opt in
-            0) delimitor=$'\0' ;;
-            d) delimitor=$OPTARG ;;
-            n) isAscending=number_ascends ;;
-            r) isAscending=random_ascends ;;
-            t) isAscending=mtime_ascends ;;
-            f) isDesired=$OPTARG ;;
-            F) isDesired=bash_desired bash_desired_code=$OPTARG ;;
-            c) isAscending=$OPTARG ;;
-            C) isAscending=bash_ascends bash_ascends_code=$OPTARG ;;
-            T) top=$OPTARG ;;
-            a) arrayName=$OPTARG array=$arrayName[@] ;;
+            0) _delimitor=$'\0' ;;
+            d) _delimitor=$OPTARG ;;
+            n) _comparator=number_ascends ;;
+            R) _comparator=random_ascends ;;
+            t) _comparator=mtime_ascends ;;
+            f) _isDesired=$OPTARG ;;
+            F) _isDesired=bash_desired _bash_desired_code=$OPTARG ;;
+            c) _comparator=$OPTARG ;;
+            C) _comparator=bash_ascends _bash_ascends_code=$OPTARG ;;
+            r) _comparator_ascends=0 ;;
+            T) _top=$OPTARG ;;
+            a) _arrayName=$OPTARG _array=$_arrayName[@] ;;
         esac
     done
     shift "$((OPTIND-1))"
 
     # Get the elements.
-    local elements=() element
-    if [[ $arrayName ]]; then
-        for element in "${!array}"; do
-            "$isDesired" "$element" && elements+=("$element")
+    local _elements=() _element
+    if [[ $_arrayName ]]; then
+        for _element in "${!_array}"; do
+            "$_isDesired" "$_element" && _elements+=("$_element")
         done
     elif (( $# )); then
-        for element; do
-            "$isDesired" "$element" && elements+=("$element")
+        for _element; do
+            "$_isDesired" "$_element" && _elements+=("$_element")
         done
     else
-        while IFS= read -r -d "$delimitor" element; do
-            "$isDesired" "$element" && elements+=("$element")
+        while IFS= read -r -d "$_delimitor" _element; do
+            "$_isDesired" "$_element" && _elements+=("$_element")
         done
     fi
 
     # Iterate in reverse order.
-    for (( i = 1; i < ${#elements[@]}; ++i )); do
-        for (( j = i; j > 0; --j )); do
-            element=${elements[j]}
-            if "$isAscending" "$element" "${elements[j-1]}"; then
-                elements[j]=${elements[j-1]}
-                elements[j-1]=$element
+    for (( _i = 1; _i < ${#_elements[@]}; ++_i )); do
+        for (( _j = _i; _j > 0; --_j )); do
+            _element=${_elements[_j]}
+            if ( (( _comparator_ascends )) && "$_comparator" "$_element" "${_elements[_j-1]}" ) ||
+               ( (( ! _comparator_ascends )) && ! "$_comparator" "$_element" "${_elements[_j-1]}" ); then
+                _elements[_j]=${_elements[_j-1]}
+                _elements[_j-1]=$_element
             fi
         done
     done
 
-    (( top )) || top=${#elements[@]}
-    if [[ $array ]]; then
-        declare -ga "$array=($(printf '%q ' "${elements[@]:0:top}"))"
+    (( _top )) || _top=${#_elements[@]}
+    if [[ $_array ]]; then
+        declare -ga "$_array=($(printf '%q ' "${_elements[@]:0:_top}"))"
     else
-        printf "%s${delimitor:-\0}" "${elements[@]:0:top}"
+        printf "%s${_delimitor:-\0}" "${_elements[@]:0:_top}"
     fi
 } # _____________________________________________________________________
 string_ascends()    { [[ $1 < $2 ]]; }
@@ -987,8 +1069,28 @@ exists_desired()    { [[ -e $1 ]]; }
 line_desired()      { [[ $1 ]]; }
 code_desired()      { line_desired "$1" && ! comment_desired "$1"; }
 comment_desired()   { line_desired "$1" && [[ $1 = @(#|//|/\*)* ]]; }
-bash_desired()      { bash -c "$bash_desired_code" -- "$@"; }
-bash_ascends()      { bash -c "$bash_ascends_code" -- "$@"; }
+bash_desired()      { bash -c "$_bash_desired_code" -- "$@"; }
+bash_ascends()      { bash -c "$_bash_ascends_code" -- "$@"; }
+
+
+#  ______________________________________________________________________
+# |__ AddTrap _____________________________________________________________|
+#
+#       addtrap signal command-format [args...]
+#
+# Add a command to the current commands executed when a signal is received by the bash process.
+#
+# The command-format is a printf-style format for the command to execute.  The optional
+# args are interpolated into the command-format by bash's built-in printf.
+#
+addtrap() {
+    local signal=$1 cmd=$2; shift 2
+    printf -v cmd "$cmd" "$@"
+
+    read _ _ oldtrap <<< "$(trap -p "$signal")"
+    eval "declare oldtrap=${oldtrap% *}"
+    trap "$oldtrap${oldtrap:+; }$cmd" "$signal"
+}
 
 
 #  ______________________________________________________________________
@@ -1119,9 +1221,10 @@ options() {
     while getopts "$optstring" arg; do
         if [[ $arg = h && ! ${options[h]} ]]; then
             # Show usage message.
-            [[ -t 1 ]]; local fd=$(( $? + 1 )) optarg
+            [[ -t 1 ]] && local fd=1 || local fd=2
 
             # Print out the app usage.
+            local optarg
             printf "  Usage: $reset$bold%s$reset" "${BASH_SOURCE[1]##*/}"   >&$fd
             for optchar in "${!options[@]}"; do
                 [[ $optchar = *: ]] && optarg=" arg" || optarg=
@@ -1172,7 +1275,7 @@ showHelp() {
     (( cols = ${cols:-80} - 10 ))
 
     # Figure out what FD to use for our messages.
-    [[ -t 1 ]]; local fd=$(( $? + 1 ))
+    [[ -t 1 ]] && local fd=1 || local fd=2
 
     # Print out the help header.
     printf "$reset$bold\n"                                          >&$fd
@@ -1214,18 +1317,17 @@ showHelp() {
 shquote() {
 
     # Initialize the defaults.
-    local arg escape=0 sq="'\\''" dq='\"' quotedArgs=() type=single always=0
+    local OPTIND=1 arg escape=0 sq="'\\''" dq='\"' quotedArgs=() type=single always=0
 
     # Parse the options.
-    while [[ $1 = -* ]]; do
-        case $1 in
-            -e) type=escape  ;;
-            -d) type=double  ;;
-            -a) always=1     ;;
-            --) shift; break ;;
+    while getopts :eda arg; do
+        case $arg in
+            e) type=escape  ;;
+            d) type=double  ;;
+            a) always=1     ;;
         esac
-        shift
     done
+    shift "$((OPTIND-1))"
 
     # Print out each argument, quoting it properly.
     for arg; do
@@ -1330,6 +1432,29 @@ shorten() {
 
 
 
+#  ______________________________________________________________________
+# |__ CdSource ________________________________________________________________|
+#
+#       cdsource [file]
+#
+# Change the current directory into the directory where the file is located, resolving symlinks.
+#
+cdsource() {
+    local source=${1:-${BASH_SOURCE[1]}}
+
+    while [[ $source ]]; do
+        [[ $source = */* ]] && cd "${source%/*}"
+
+        if [[ -L ${source##*/} ]]; then
+            source=$(readlink "${source##*/}")
+        else
+            source=
+        fi
+    done
+} # _____________________________________________________________________
+
+
+
 #  ______________________________________________________________________
 # |__ Up ________________________________________________________________|
 #
@@ -1405,7 +1530,34 @@ inArray() {
 
     # Perform the search.
     for element
-    do [[ $element = $search ]] && return 0; done
+    do [[ "$element" = "$search" ]] && return 0; done
+    return 1
+} # _____________________________________________________________________
+
+
+
+#  ______________________________________________________________________
+# |__ IndexOf ___________________________________________________________|
+#
+#       indexOf element array
+#
+# Outputs the index of the given element in the given array.
+#
+#   element The element to search the array for.
+#   array   This is a list of elements to search through.
+#
+indexOf() {
+
+    # Parse the options.
+    local element index=0
+    local search=$1; shift
+
+    # Perform the search.
+    for element
+    do
+        [[ $element = $search ]] && echo "$index" && return 0
+        let ++index
+    done
     return 1
 } # _____________________________________________________________________
 

platform-darwin/Scripts/build_libjson-c-ios

@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-hash automake || { echo >&2 "Missing automake."; exit 1; }
-hash autoreconf || { echo >&2 "Missing autoconf."; exit 1; }
-hash libtool || hash glibtool || { echo >&2 "Missing libtool."; exit 1; }
-
-cd "${BASH_SOURCE%/*}/../External/libjson-c"
-[[ $1 = clean ]] && { [[ ! -e Makefile ]] || make -s distclean; exit; }
-[[ -e "${prefix=$PWD/libjson-c-ios}/lib/libjson-c.a" ]] && exit
-
-# Prepare
-autoreconf -Iautoconf-archive/m4 --verbose --install --symlink 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /')
-rm -rf "${prefix=$PWD/libjson-c-ios}"
-mkdir -p "$prefix/lib" \
-    "${prefix_i386=$prefix/tmp/i386}" \
-    "${prefix_x86_64=$prefix/tmp/x86_64}" \
-    "${prefix_armv7=$prefix/tmp/armv7}" \
-    "${prefix_armv7s=$prefix/tmp/armv7s}" \
-    "${prefix_arm64=$prefix/tmp/arm64}"
-
-# Targets
-(
-    ## ARCH: i386
-    SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH"
-    export CFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS"
-    export LDFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s clean
-    ./configure --host=i686-apple --disable-shared --prefix="$prefix_i386"
-    make -j3 install
-)
-(
-    ## ARCH: x86_64
-    SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH"
-    export CFLAGS="-arch x86_64 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS"
-    export LDFLAGS="-arch x86_64 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s clean
-    ./configure --host=x86_64-apple --disable-shared --prefix="$prefix_x86_64"
-    make -j3 install
-)
-(
-    ## ARCH: armv7
-    SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH"
-    export CFLAGS="-mthumb -arch armv7 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS"
-    export LDFLAGS="-mthumb -arch armv7 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s clean
-    ./configure --host=x86_64-apple --target=arm-apple --disable-shared --prefix="$prefix_armv7"
-    make -j3 install
-)
-(
-    ## ARCH: armv7s
-    SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH"
-    export CFLAGS="-mthumb -arch armv7s -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS"
-    export LDFLAGS="-mthumb -arch armv7s -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s clean
-    ./configure --host=x86_64-apple --target=arm-apple --disable-shared --prefix="$prefix_armv7s"
-    make -j3 install
-)
-(
-    ## ARCH: arm64
-    SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH"
-    export CFLAGS="-mthumb -arch arm64 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS"
-    export LDFLAGS="-mthumb -arch arm64 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS"
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s clean
-    ./configure --host=x86_64-apple --target=arm-apple --disable-shared --prefix="$prefix_arm64"
-    make -j3 install
-)
-
-# Merge Binaries
-mv -f -- "$prefix_arm64/include" "$prefix/"
-lipo -create \
-  "$prefix_i386/lib/libjson-c.a" \
-  "$prefix_x86_64/lib/libjson-c.a" \
-  "$prefix_armv7/lib/libjson-c.a" \
-  "$prefix_armv7s/lib/libjson-c.a" \
-  "$prefix_arm64/lib/libjson-c.a" \
-  -output "$prefix/lib/libjson-c.a"
-
-# Cleanup
-rm -rf -- "$prefix/tmp"
-make -s really-clean

platform-darwin/Scripts/build_libjson-c-osx

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-hash automake || { echo >&2 "Missing automake."; exit 1; }
-hash autoreconf || { echo >&2 "Missing autoconf."; exit 1; }
-hash libtool || hash glibtool || { echo >&2 "Missing libtool."; exit 1; }
-
-cd "${BASH_SOURCE%/*}/../External/libjson-c"
-[[ $1 = clean ]] && { [[ ! -e Makefile ]] || make -s distclean; exit; }
-[[ -e "${prefix=$PWD/libjson-c-osx}/lib/libjson-c.a" ]] && exit
-
-# Prepare
-autoreconf -Iautoconf-archive/m4 --verbose --install --symlink 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /')
-rm -rf "${prefix=$PWD/libjson-c-osx}"
-mkdir -p "$prefix"
-
-# Targets
-(
-    ## ARCH: x86_64
-    SDKROOT="$(xcrun --show-sdk-path --sdk macosx)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk macosx)/usr/bin:$PATH"
-    export CFLAGS="-arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} -O2 -g $CFLAGS" # -flto
-    export LDFLAGS="-arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} $LDFLAGS" # -flto
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s clean
-    ./configure --disable-shared --prefix="$prefix"
-    make -j3 check
-    make -j3 install
-)
-
-# Cleanup
-make -s really-clean

platform-darwin/Scripts/build_libsodium-ios

@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-hash automake || { echo >&2 "Missing automake."; exit 1; }
-hash autoreconf || { echo >&2 "Missing autoconf."; exit 1; }
-hash libtool || hash glibtool || { echo >&2 "Missing libtool."; exit 1; }
-
-cd "${BASH_SOURCE%/*}/../External/libsodium"
-[[ $1 = clean ]] && { [[ ! -e Makefile ]] || make -s distclean; exit; }
-[[ -e "${prefix=$PWD/libsodium-ios}/lib/libsodium.a" ]] && exit
-
-# Prepare
-autoreconf --verbose --install --symlink 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /')
-rm -rf "${prefix=$PWD/libsodium-ios}"
-mkdir -p "$prefix/lib" \
-    "${prefix_i386=$prefix/tmp/i386}" \
-    "${prefix_x86_64=$prefix/tmp/x86_64}" \
-    "${prefix_armv7=$prefix/tmp/armv7}" \
-    "${prefix_armv7s=$prefix/tmp/armv7s}" \
-    "${prefix_arm64=$prefix/tmp/arm64}"
-
-# Targets
-(
-    ## ARCH: i386
-    SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH"
-    export CFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS"
-    export LDFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS"
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s distclean
-    ./configure --host=i686-apple --disable-shared --enable-minimal --prefix="$prefix_i386"
-    make -j3 install
-)
-(
-    ## ARCH: x86_64
-    SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH"
-    export CFLAGS="-arch x86_64 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS"
-    export LDFLAGS="-arch x86_64 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS"
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s distclean
-    ./configure --host=x86_64-apple --disable-shared --enable-minimal --prefix="$prefix_x86_64"
-    make -j3 install
-)
-(
-    ## ARCH: armv7
-    SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH"
-    export CFLAGS="-mthumb -arch armv7 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS"
-    export LDFLAGS="-mthumb -arch armv7 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS"
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s distclean
-    ./configure --host=x86_64-apple --target=arm-apple --disable-shared --enable-minimal --prefix="$prefix_armv7"
-    make -j3 install
-)
-(
-    ## ARCH: armv7s
-    SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH"
-    export CFLAGS="-mthumb -arch armv7s -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS"
-    export LDFLAGS="-mthumb -arch armv7s -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS"
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s distclean
-    ./configure --host=x86_64-apple --target=arm-apple --disable-shared --enable-minimal --prefix="$prefix_armv7s"
-    make -j3 install
-)
-(
-    ## ARCH: arm64
-    SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH"
-    export CFLAGS="-mthumb -arch arm64 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS"
-    export LDFLAGS="-mthumb -arch arm64 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS"
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s distclean
-    ./configure --host=x86_64-apple --target=arm-apple --disable-shared --enable-minimal --prefix="$prefix_arm64"
-    make -j3 install
-)
-
-# Merge Binaries
-mv -f -- "$prefix_arm64/include" "$prefix/"
-lipo -create \
-  "$prefix_i386/lib/libsodium.a" \
-  "$prefix_x86_64/lib/libsodium.a" \
-  "$prefix_armv7/lib/libsodium.a" \
-  "$prefix_armv7s/lib/libsodium.a" \
-  "$prefix_arm64/lib/libsodium.a" \
-  -output "$prefix/lib/libsodium.a"
-
-# Cleanup
-rm -rf -- "$prefix/tmp"
-make -s distclean

platform-darwin/Scripts/build_libsodium-osx

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-hash automake || { echo >&2 "Missing automake."; exit 1; }
-hash autoreconf || { echo >&2 "Missing autoconf."; exit 1; }
-hash libtool || hash glibtool || { echo >&2 "Missing libtool."; exit 1; }
-
-cd "${BASH_SOURCE%/*}/../External/libsodium"
-[[ $1 = clean ]] && { [[ ! -e Makefile ]] || make -s distclean; exit; }
-[[ -e "${prefix=$PWD/libsodium-osx}/lib/libsodium.a" ]] && exit
-
-# Inspired by libsodium/dist-build/osx.sh
-# Prepare
-autoreconf --verbose --install --symlink 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /')
-rm -rf "${prefix=$PWD/libsodium-osx}"
-mkdir -p "$prefix"
-
-# Targets
-(
-    ## ARCH: x86_64
-    SDKROOT="$(xcrun --show-sdk-path --sdk macosx)"
-    PATH="$(xcrun --show-sdk-platform-path --sdk macosx)/usr/bin:$PATH"
-    export CFLAGS="-arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} -O2 -g -flto $CFLAGS"
-    export LDFLAGS="-arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} -flto $LDFLAGS"
-    export CPPFLAGS="$CFLAGS $CPPFLAGS"
-    [[ -e Makefile ]] && make -s distclean
-    ./configure --disable-shared --enable-minimal --prefix="$prefix"
-    make -j3 check
-    make -j3 install
-)
-
-# Cleanup
-make -s distclean

platform-darwin/Scripts/genassets

@@ -2,6 +2,7 @@
 # See https://developer.apple.com/library/ios/qa/qa1686/_index.html
 cd "${BASH_SOURCE%/*}"
 source bashlib
+trap 'echo >&2 "ERROR: $?: $BASH_COMMAND"' ERR
 set -e
 cd ..
 export PATH+=:/usr/local/bin
@@ -97,26 +98,18 @@ if [[ "$(latest "$ios_icon"/*)" -nt "$appiconset/Contents.json" ]] ||
             source=$ios_icon/$filename
             if [[ ! -e $source ]]; then
                 source=$mac_icon/$filename
-                if [[ ! -e $source ]]; then
-                    err 'No icon for: %s' "$filename"
-                    exit 1
-                fi
+                [[ -e $source ]] || ftl 'No icon for: %s' "$filename"
             fi
 
-            if imageProps=$(copyImage "$source" "$appiconset/$filename"); then
-                printf '%s{"size":"%dx%d","filename":"%s","scale":"%sx"' \
-                    "$comma" "$pt" "$pt" "$filename" "$scale"
-                [[ $idiom ]] && printf ',"idiom":"%s"' "$idiom"
-                [[ $os ]] && printf ',"minimum-system-version":"%s"' "$os"
-                [[ $imageProps ]] && printf '%s' "$imageProps"
-                printf '}'
-
-                comma=,
-            else
-                rm "$appiconset/Contents.json"
-                exit
-            fi
+            imageProps=$(copyImage "$source" "$appiconset/$filename")
+            printf '%s{"size":"%dx%d","filename":"%s","scale":"%sx"' \
+                "$comma" "$pt" "$pt" "$filename" "$scale"
+            [[ $idiom ]] && printf ',"idiom":"%s"' "$idiom"
+            [[ $os ]] && printf ',"minimum-system-version":"%s"' "$os"
+            [[ $imageProps ]] && printf '%s' "$imageProps"
+            printf '}'
 
+            comma=,
         done
         printf '],"info":{"version":1,"author":"genassets"},"properties":{"pre-rendered":true}}\n'
     } > "$appiconset/Contents.json"
@@ -137,20 +130,16 @@ if [[ "$(latest "$ios_launch"/*)" -nt "$launchimage/Contents.json" ]]; then
             esac
             filename="Default${os:+-$os}${subtype:+-$subtype}${scale:+@${scale}x}${idiom:+~$idiom}.png"
 
-            if imageProps=$(copyImage "$ios_launch/$name${scale:+@${scale}x}.png" "$launchimage/$filename"); then
-                printf '%s{"extent":"full-screen","filename":"%s","orientation":"portrait","scale":"%sx"' \
-                    "$comma" "$filename" "${scale:-1}"
-                [[ $idiom ]] && printf ',"idiom":"%s"' "$idiom"
-                [[ $os ]] && printf ',"minimum-system-version":"%s"' "$os"
-                [[ $subtype ]] && printf ',"subtype":"%s"' "$subtype"
-                [[ $imageProps ]] && printf '%s' "$imageProps"
-                printf '}'
+            imageProps=$(copyImage "$ios_launch/$name${scale:+@${scale}x}.png" "$launchimage/$filename")
+            printf '%s{"extent":"full-screen","filename":"%s","orientation":"portrait","scale":"%sx"' \
+                "$comma" "$filename" "${scale:-1}"
+            [[ $idiom ]] && printf ',"idiom":"%s"' "$idiom"
+            [[ $os ]] && printf ',"minimum-system-version":"%s"' "$os"
+            [[ $subtype ]] && printf ',"subtype":"%s"' "$subtype"
+            [[ $imageProps ]] && printf '%s' "$imageProps"
+            printf '}'
 
-                comma=,
-            else
-                rm "$launchimage/Contents.json"
-                exit
-            fi
+            comma=,
         done
         printf '],"info":{"version":1,"author":"genassets"}}\n'
     } > "$launchimage/Contents.json"

platform-darwin/Scripts/updateDependencies

@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-# This script should be in the 'Scripts' directory under the git repository's root.
-cd "${BASH_SOURCE%/*}/.."
-shopt -s extglob
-
-
-## Submodules that need to be checked out.
-dependencies=( External/{InAppSettingsKit,Pearl{,:External/jrswizzle,:External/uicolor-utilities},RHStatusItemView} )
-
-## Custom migration.
-# None yet.
-
-
-################################################################################
-isCheckedOut() {
-    local modulePath=$1
-    ! git submodule status | grep -q "^-[^ ]* $modulePath"
-}
-
-# git submodule sync -- A bug causes this to init ALL external dependencies.
-git submodule sync $(git submodule status | awk '/^ / { print $2 }')
-
-
-# Check out our missing dependencies
-for dependency in "${dependencies[@]}"; do
-    [[ $dependency = *:* ]] && root=${dependency%%:*} || root=.
-    path=${dependency#*:}
-    ( cd "$root"; git submodule update --init "$path" )
-done
-
-
-# Update our modules
-git submodule update
-
-
-# Our modules may define a custom update script, if so, run it.
-find !(Scripts)/ -name "${BASH_SOURCE##*/}" -exec {} \;
-
-
-# Finally, for our modules that haven't got a custom update script, update them recursively.
-git submodule update --recursive --rebase

platform-darwin/Scripts/updatePlist

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 cd "${BASH_SOURCE%/*}"
 source ./bashlib
+trap 'echo >&2 "ERROR: $?: $BASH_COMMAND"' ERR
+set -e
 cd ..
 export PATH+=:/usr/libexec
 

platform-darwin/Source/Mac/MPInitialWindowController.m

@@ -44,7 +44,7 @@
 
 - (IBAction)androidPlayStore:(id)sender {
 
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://masterpasswordapp.com"]];
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://masterpassword.app"]];
     [self close];
 }
 

platform-darwin/Source/Mac/MPPasswordWindowController.xib

@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
         <capability name="box content view" minToolsVersion="7.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/>
     </dependencies>
     <objects>
@@ -27,7 +28,7 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Master Password" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="MPSitesWindow">
-            <windowStyleMask key="styleMask" texturedBackground="YES" unifiedTitleAndToolbar="YES" fullSizeContentView="YES"/>
+            <windowStyleMask key="styleMask" texturedBackground="YES" fullSizeContentView="YES"/>
             <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES" transient="YES" ignoresCycle="YES" fullScreenAuxiliary="YES"/>
             <rect key="contentRect" x="0.0" y="0.0" width="640" height="577"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
@@ -35,7 +36,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="640" height="577"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <visualEffectView blendingMode="behindWindow" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="eRe-Ef-AZx">
+                    <visualEffectView blendingMode="behindWindow" material="appearanceBased" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="eRe-Ef-AZx">
                         <rect key="frame" x="0.0" y="0.0" width="640" height="577"/>
                     </visualEffectView>
                     <progressIndicator hidden="YES" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="oSh-Ec-8Nf" userLabel="Progress Spinner">
@@ -45,7 +46,7 @@
                         <rect key="frame" x="20" y="383" width="600" height="150"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ond-dT-x5d" userLabel="Site Password Label">
-                                <rect key="frame" x="157" y="116" width="285" height="14"/>
+                                <rect key="frame" x="157" y="116" width="286" height="14"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -73,7 +74,7 @@
                                 </connections>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ia6-7b-dFr">
-                                <rect key="frame" x="115" y="68" width="370" height="14"/>
+                                <rect key="frame" x="127" y="68" width="347" height="14"/>
                                 <shadow key="shadow" blurRadius="0.5">
                                     <size key="offset" width="0.0" height="1"/>
                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -186,7 +187,7 @@
                                 </contentFilters>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="KeljXoleKowi9@" placeholderString="" id="WVV-EE-tkB">
                                     <font key="font" size="64" name="SourceCodePro-Regular"/>
-                                    <color key="textColor" name="keyboardFocusIndicatorColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" name="selectedControlColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                                 <connections>
@@ -223,13 +224,13 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="33" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" id="xvJ-5c-vDp" customClass="MPSitesTableView">
-                                    <rect key="frame" x="0.0" y="0.0" width="515" height="0.0"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="515" height="180"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn editable="NO" width="512" minWidth="512" maxWidth="512" id="S71-gk-yF7">
+                                        <tableColumn identifier="" editable="NO" width="512" minWidth="512" maxWidth="512" id="S71-gk-yF7">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -312,7 +313,7 @@
                         </connections>
                     </scrollView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="nM8-O3-spM" customClass="MPGradientView">
-                        <rect key="frame" x="0.0" y="0.0" width="640" height="212"/>
+                        <rect key="frame" x="0.0" y="0.0" width="640" height="214"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="color" keyPath="startingColor">
                                 <color key="value" red="0.7019608021" green="0.7019608021" blue="0.7019608021" alpha="0.0" colorSpace="calibratedRGB"/>
@@ -570,7 +571,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         </connections>
                     </textField>
                     <stackView distribution="fill" orientation="horizontal" alignment="bottom" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pHt-gg-ZNX">
-                        <rect key="frame" x="72" y="20" width="495" height="152"/>
+                        <rect key="frame" x="72" y="20" width="495" height="154"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Qo-iG-CQt">
                                 <rect key="frame" x="0.0" y="-1" width="85" height="19"/>
@@ -593,10 +594,10 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                 </connections>
                             </button>
                             <stackView distribution="fill" orientation="vertical" alignment="centerX" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DT0-RU-3LT">
-                                <rect key="frame" x="93" y="0.0" width="177" height="152"/>
+                                <rect key="frame" x="93" y="0.0" width="177" height="154"/>
                                 <subviews>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uol-dE-I8H">
-                                        <rect key="frame" x="77" y="138" width="23" height="14"/>
+                                        <rect key="frame" x="77" y="140" width="23" height="14"/>
                                         <shadow key="shadow" blurRadius="0.5">
                                             <size key="offset" width="0.0" height="1"/>
                                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -633,7 +634,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                         </connections>
                                     </textField>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="brI-fg-Kav">
-                                        <rect key="frame" x="40" y="111" width="96" height="19"/>
+                                        <rect key="frame" x="41" y="113" width="96" height="19"/>
                                         <shadow key="shadow">
                                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                         </shadow>
@@ -662,7 +663,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="R46-fx-n14">
-                                        <rect key="frame" x="0.0" y="85" width="177" height="19"/>
+                                        <rect key="frame" x="0.0" y="87" width="177" height="19"/>
                                         <shadow key="shadow">
                                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                         </shadow>
@@ -688,10 +689,10 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                         </connections>
                                     </button>
                                     <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bgn-Ne-fQ7" userLabel="Version Container">
-                                        <rect key="frame" x="70" y="56" width="36" height="22"/>
+                                        <rect key="frame" x="71" y="57" width="36" height="23"/>
                                         <subviews>
                                             <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mcq-qD-yte">
-                                                <rect key="frame" x="-3" y="-3" width="19" height="27"/>
+                                                <rect key="frame" x="-3" y="-2" width="19" height="27"/>
                                                 <shadow key="shadow">
                                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                                 </shadow>
@@ -701,7 +702,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                                 </connections>
                                             </stepper>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gyg-Fh-yn7">
-                                                <rect key="frame" x="19" y="3" width="19" height="19"/>
+                                                <rect key="frame" x="19" y="4" width="19" height="19"/>
                                                 <shadow key="shadow" blurRadius="0.5">
                                                     <size key="offset" width="0.0" height="1"/>
                                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -742,10 +743,10 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                         </connections>
                                     </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6II-KA-cNi" userLabel="Counter Container">
-                                        <rect key="frame" x="74" y="26" width="28" height="22"/>
+                                        <rect key="frame" x="75" y="26" width="28" height="23"/>
                                         <subviews>
                                             <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XgA-Vl-CKh" userLabel="Counter Stepper">
-                                                <rect key="frame" x="-3" y="-3" width="19" height="27"/>
+                                                <rect key="frame" x="-3" y="-2" width="19" height="27"/>
                                                 <shadow key="shadow">
                                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                                 </shadow>
@@ -755,7 +756,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                                 </connections>
                                             </stepper>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NvO-kt-eZ2" userLabel="Counter Field">
-                                                <rect key="frame" x="19" y="1" width="11" height="19"/>
+                                                <rect key="frame" x="19" y="2" width="11" height="19"/>
                                                 <shadow key="shadow" blurRadius="0.5">
                                                     <size key="offset" width="0.0" height="1"/>
                                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -888,7 +889,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         </customSpacing>
                     </stackView>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="luC-0j-BeV">
-                        <rect key="frame" x="134" y="50" width="103" height="14"/>
+                        <rect key="frame" x="135" y="51" width="103" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -925,7 +926,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gjx-bt-fKM">
-                        <rect key="frame" x="133" y="80" width="100" height="14"/>
+                        <rect key="frame" x="134" y="82" width="100" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -962,7 +963,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dbM-ja-dKO" userLabel="Version Tip">
-                        <rect key="frame" x="87" y="106" width="332" height="14"/>
+                        <rect key="frame" x="88" y="108" width="332" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -1170,7 +1171,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                 <binding destination="-2" name="contentArray" keyPath="sites" id="c96-Dv-HK1"/>
             </connections>
         </arrayController>
-        <box autoresizesSubviews="NO" title="Choose a password type for apple.com:" borderType="line" id="bZe-7q-i6q">
+        <box autoresizesSubviews="NO" borderType="line" title="Choose a password type for apple.com:" id="bZe-7q-i6q">
             <rect key="frame" x="0.0" y="0.0" width="416" height="296"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <view key="contentView" id="hAc-y9-IMT">
@@ -1243,11 +1244,9 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                     <constraint firstItem="3fr-Fd-pxx" firstAttribute="top" secondItem="hAc-y9-IMT" secondAttribute="top" constant="8" id="xVT-HC-qsE"/>
                 </constraints>
             </view>
-            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-            <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <point key="canvasLocation" x="333" y="125"/>
         </box>
-        <box autoresizesSubviews="NO" title="Answer to security questions for apple.com:" borderType="line" id="hi3-SX-Td3">
+        <box autoresizesSubviews="NO" borderType="line" title="Answer to security questions for apple.com:" id="hi3-SX-Td3">
             <rect key="frame" x="0.0" y="0.0" width="416" height="180"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <view key="contentView" wantsLayer="YES" id="8Ep-zH-Nzv">
@@ -1321,8 +1320,6 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                 <constraint firstAttribute="trailing" secondItem="12d-V9-LDB" secondAttribute="trailing" constant="12" id="Ysu-F5-ukt"/>
                 <constraint firstItem="12d-V9-LDB" firstAttribute="leading" secondItem="hi3-SX-Td3" secondAttribute="leading" constant="12" id="oPv-4N-T9I"/>
             </constraints>
-            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-            <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <point key="canvasLocation" x="333" y="491"/>
         </box>
     </objects>

platform-darwin/Source/iOS/MPPreferencesViewController.m

@@ -207,19 +207,19 @@
 - (IBAction)homePageButton:(id)sender {
 
     [[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender:
-            [NSURL URLWithString:@"https://ssl.masterpasswordapp.com"]];
+            [NSURL URLWithString:@"https://masterpassword.app"]];
 }
 
 - (IBAction)securityButton:(id)sender {
 
     [[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender:
-            [NSURL URLWithString:@"https://ssl.masterpasswordapp.com/security.html"]];
+            [NSURL URLWithString:@"https://masterpassword.app/security.html"]];
 }
 
 - (IBAction)sourceButton:(id)sender {
 
     [[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender:
-            [NSURL URLWithString:@"https://github.com/Lyndir/MasterPassword/"]];
+            [NSURL URLWithString:@"https://gitlab.com/MasterPassword/MasterPassword/"]];
 }
 
 - (IBAction)thanksButton:(id)sender {

platform-darwin/Source/iOS/MPWebViewController.m

@@ -32,7 +32,7 @@
     [super viewWillAppear:animated];
 
     if (!self.initialURL)
-        self.initialURL = [NSURL URLWithString:@"https://ssl.masterpasswordapp.com"];
+        self.initialURL = [NSURL URLWithString:@"https://masterpassword.app"];
 
     self.webNavigationItem.title = self.initialURL.host;
 

platform-darwin/Source/iOS/Storyboard.storyboard

@@ -489,7 +489,7 @@
                             <navigationBar contentMode="scaleToFill" barStyle="black" translatesAutoresizingMaskIntoConstraints="NO" id="03x-KT-JQN">
                                 <rect key="frame" x="0.0" y="20" width="375" height="74"/>
                                 <items>
-                                    <navigationItem title="masterpasswordapp.com" prompt="Loading" id="Wpf-6b-UJb">
+                                    <navigationItem title="masterpassword.app" prompt="Loading" id="Wpf-6b-UJb">
                                         <barButtonItem key="rightBarButtonItem" systemItem="done" id="Tbg-c3-qOh">
                                             <connections>
                                                 <action selector="done:" destination="Sd5-eW-Cx2" id="cuN-bV-cwl"/>
@@ -2487,11 +2487,11 @@ See </string>
                                                     <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
                                                 </attributes>
                                             </fragment>
-                                            <fragment content="http://masterpasswordapp.com/security.html">
+                                            <fragment content="https://masterpassword.app/security.html">
                                                 <attributes>
                                                     <color key="NSColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <font key="NSFont" size="14" name="Exo2.0-Regular"/>
-                                                    <url key="NSLink" string="http://masterpasswordapp.com/security.html"/>
+                                                    <url key="NSLink" string="https://masterpassword.app/security.html"/>
                                                     <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
                                                 </attributes>
                                             </fragment>

platform-independent/c/README.md

@@ -1,9 +1,13 @@
 # Native CLI
 
-This is a command-line terminal interface to the Master Password standard implementation.
+The CLI is a command-line terminal interface to the Master Password standard implementation.
 
 To use the app, you'll first need to build it, then install it into your system's PATH.
 
+Start by changing into the CLI application directory:
+
+    cd cli
+
 
 ## Building
 
@@ -15,6 +19,13 @@ Note that the build depends on your system having certain dependencies already i
 By default, you'll need to have at least `libsodium`, `libjson-c` and `libncurses` installed.
 
 
+## Building with docker
+
+To install mpw into a Docker container, make sure you have Docker installed on your system, then run something like:
+
+    docker build -f cli/Dockerfile .
+
+
 ## Building with cmake
 
 There is also a cmake configuration you can use to build instead of using the `./build` script.  While `./build` depends on Bash and is geared toward POSIX systems, cmake is platform-independent.  You should use your platform's cmake tools to continue.  On POSIX systems, you can do this:

platform-independent/c/cli/.gitignore

@@ -14,3 +14,4 @@ CMakeCache.txt
 CMakeFiles
 Makefile
 cmake_install.cmake
+install_manifest.txt

platform-independent/c/cli/CMakeLists.txt

@@ -1,5 +1,5 @@
 ### CMAKE
-project( mpw C )
+project( masterpassword-cli C )
 cmake_minimum_required( VERSION 3.0.2 )
 
 
@@ -39,8 +39,8 @@ endif()
 ### DEPENDENCIES
 function( use_mpw_sodium t r )
     if( USE_SODIUM )
-        target_link_libraries(  "${t}" sodium )
-        target_compile_definitions( "${t}" PUBLIC -DMPW_SODIUM=1 )
+        target_link_libraries(  "${t}" PRIVATE sodium )
+        target_compile_definitions( "${t}" PRIVATE -DMPW_SODIUM=1 )
         message( STATUS         "${t}: USE_SODIUM is enabled." )
 
     elseif( r STREQUAL "required" )
@@ -56,9 +56,9 @@ function( use_mpw_color t )
     find_package( Curses )
     if( USE_COLOR )
         if ( CURSES_FOUND )
-            target_include_directories( "${t}" PUBLIC ${CURSES_INCLUDE_DIR} )
-            target_link_libraries( "${t}" ${CURSES_LIBRARIES} )
-            target_compile_definitions( "${t}" PUBLIC -DMPW_COLOR=1 ${CURSES_DEFINITIONS} )
+            target_include_directories( "${t}" PRIVATE ${CURSES_INCLUDE_DIR} )
+            target_link_libraries( "${t}" PRIVATE ${CURSES_LIBRARIES} )
+            target_compile_definitions( "${t}" PRIVATE -DMPW_COLOR=1 ${CURSES_DEFINITIONS} )
             message( STATUS     "${t}: USE_COLOR is enabled." )
 
         elseif( r STREQUAL "required" )
@@ -80,8 +80,8 @@ endfunction()
 
 function( use_mpw_json t )
     if( USE_JSON )
-        target_link_libraries(  "${t}" json-c )
-        target_compile_definitions( "${t}" PUBLIC -DMPW_JSON=1 )
+        target_link_libraries(  "${t}" PRIVATE json-c )
+        target_compile_definitions( "${t}" PRIVATE -DMPW_JSON=1 )
         message( STATUS         "${t}: USE_JSON is enabled." )
 
     elseif( r STREQUAL "required" )
@@ -97,9 +97,9 @@ function( use_mpw_xml t r )
     find_package( LibXml2 )
     if( USE_XML )
         if ( LIBXML2_FOUND )
-            target_include_directories( "${t}" PUBLIC ${LIBXML2_INCLUDE_DIR} )
-            target_link_libraries( "${t}" ${LIBXML2_LIBRARIES} )
-            target_compile_definitions( "${t}" PUBLIC -DMPW_XML=1 ${LIBXML2_DEFINITIONS} )
+            target_include_directories( "${t}" PRIVATE ${LIBXML2_INCLUDE_DIR} )
+            target_link_libraries( "${t}" PRIVATE ${LIBXML2_LIBRARIES} )
+            target_compile_definitions( "${t}" PRIVATE -DMPW_XML=1 ${LIBXML2_DEFINITIONS} )
             message( STATUS     "${t}: USE_XML is enabled." )
 
         elseif( r STREQUAL "required" )
@@ -123,9 +123,11 @@ endfunction()
 ### TARGET: MPW
 if( BUILD_MPW )
     # target
-    add_executable( mpw "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c" "core/mpw-marshal-util.c" "core/mpw-marshal.c"
-                        "cli/mpw-cli-util.c" "cli/mpw-cli.c" )
-    target_include_directories( mpw PUBLIC core cli )
+    add_executable( mpw "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c"
+                        "../core/src/mpw-marshal-util.c" "../core/src/mpw-marshal.c"
+                        "src/mpw-cli-util.c" "src/mpw-cli.c" )
+    target_include_directories( mpw PUBLIC ../core/src src )
+    install( TARGETS mpw RUNTIME DESTINATION bin )
 
     # dependencies
     use_mpw_sodium( mpw required )
@@ -137,23 +139,25 @@ endif()
 ### TARGET: MPW-BENCH
 if( BUILD_MPW_BENCH )
     # target
-    add_executable( mpw_bench "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c"
-                        "cli/mpw-bench.c" )
-    target_include_directories( mpw_bench PUBLIC core cli )
+    add_executable( mpw-bench "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c"
+                              "src/mpw-bench.c" )
+    target_include_directories( mpw-bench PUBLIC ../core/src src )
+    install( TARGETS mpw-bench RUNTIME DESTINATION bin )
 
     # dependencies
-    use_mpw_sodium( mpw_bench required )
+    use_mpw_sodium( mpw-bench required )
 endif()
 
 
 ### TARGET: MPW-TESTS
 if( BUILD_MPW_TESTS )
     # target
-    add_executable( mpw_tests "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c"
-                              "cli/mpw-tests-util.c" "cli/mpw-tests.c" )
-    target_include_directories( mpw_tests PUBLIC core cli )
+    add_executable( mpw-tests "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c"
+                              "src/mpw-tests-util.c" "src/mpw-tests.c" )
+    target_include_directories( mpw-tests PUBLIC ../core/src src )
+    install( TARGETS mpw-tests RUNTIME DESTINATION bin )
 
     # dependencies
-    use_mpw_sodium( mpw_tests required )
-    use_mpw_xml( mpw_tests required )
+    use_mpw_sodium( mpw-tests required )
+    use_mpw_xml( mpw-tests required )
 endif()

platform-independent/c/cli/Dockerfile

@@ -0,0 +1,9 @@
+FROM alpine
+WORKDIR /mpw/cli
+ADD . /mpw
+
+RUN apk update && apk add cmake make gcc musl-dev ncurses-dev libsodium-dev json-c-dev libxml2-dev
+RUN cmake -DBUILD_MPW_TESTS=ON . && make install
+RUN mpw-tests
+
+CMD mpw

platform-independent/c/cli/build

@@ -63,18 +63,18 @@ mpw() {
     cflags=(
         "${cflags[@]}"
 
-        # library paths
-        -I"lib/include"
         # mpw paths
-        -I"core" -I"cli"
+        -I"../core/src" -I"src"
     )
     ldflags=(
         "${ldflags[@]}"
     )
 
     # build
-    cc "${cflags[@]}" "$@" "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c" "core/mpw-marshal-util.c" "core/mpw-marshal.c" "cli/mpw-cli-util.c" \
-       "${ldflags[@]}"     "cli/mpw-cli.c" -o "mpw"
+    cc "${cflags[@]}" "$@" \
+       "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" \
+       "../core/src/mpw-marshal-util.c" "../core/src/mpw-marshal.c" "src/mpw-cli-util.c" \
+       "${ldflags[@]}" "src/mpw-cli.c" -o "mpw"
     echo "done!  You can now run ./mpw-cli-tests, ./install or use ./$_"
 }
 
@@ -88,18 +88,17 @@ mpw-bench() {
     cflags=(
         "${cflags[@]}"
 
-        # library paths
-        -I"lib/include"
         # mpw paths
-        -I"core" -I"cli"
+        -I"../core/src" -I"src"
     )
     ldflags=(
         "${ldflags[@]}"
     )
 
     # build
-    cc "${cflags[@]}" "$@" "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c" \
-       "${ldflags[@]}"     "cli/mpw-bench.c" -o "mpw-bench"
+    cc "${cflags[@]}" "$@" \
+       "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" \
+       "${ldflags[@]}" "src/mpw-bench.c" -o "mpw-bench"
     echo "done!  You can now use ./$_"
 }
 
@@ -114,18 +113,17 @@ mpw-tests() {
     cflags=(
         "${cflags[@]}"
 
-        # library paths
-        -I"lib/include"
         # mpw paths
-        -I"core" -I"cli"
+        -I"../core/src" -I"src"
     )
     ldflags=(
         "${ldflags[@]}"
     )
 
     # build
-    cc "${cflags[@]}" "$@" "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c" "cli/mpw-tests-util.c" \
-       "${ldflags[@]}"     "cli/mpw-tests.c" -o "mpw-tests"
+    cc "${cflags[@]}" "$@" \
+        "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" "src/mpw-tests-util.c" \
+       "${ldflags[@]}" "src/mpw-tests.c" -o "mpw-tests"
     echo "done!  You can now use ./$_"
 }