Improvement to distribution script and create release signature.

This reverts commit b248f2d440.

.gitignore

@@ -3,40 +3,44 @@
 Thumbs.db
 
 # IntelliJ
-/MasterPassword/Java/.idea
-/.idea/*
-!/.idea/encodings.xml
-!/.idea/inspectionProfiles
-!/.idea/projectCodeStyle.xml
-!/.idea/validation.xml
+.idea
 *.iml
-/*.ipr
-/*.iws
+*.ipr
+*.iws
 
 # Xcode IDE
 xcuserdata/
-/DerivedData/
+DerivedData/
 
 # Generated
-MasterPassword/Resources/Media/Images.xcassets/
+/platform-independent/cli-c/VERSION
+/platform-independent/cli-c/mpw-*.tar.gz
+/platform-darwin/Resources/Media/Images.xcassets/
 
 # Media
-Press/Background.png
-Press/Front-Page.png
-Press/MasterPassword_PressKit/MasterPassword_pressrelease_*.pdf
+public/Press/Background.png
+public/Press/Front-Page.png
+public/Press/MasterPassword_PressKit/MasterPassword_pressrelease_*.pdf
 
-# IPA
-/sendipa/*
-!/sendipa/sendipa.conf
+# Gradle
+build
+!/build
+.gradle
+local.properties
+
+# Maven
+target
+dependency-reduced-pom.xml
 
 # C
-MasterPassword/C/VERSION
-MasterPassword/C/*.o
-MasterPassword/C/mpw-*.tar.gz
-MasterPassword/C/mpw
-MasterPassword/C/mpw-bench
-MasterPassword/C/mpw-tests
-MasterPassword/C/lib/*/.unpacked
-MasterPassword/C/lib/*/.patched
-MasterPassword/C/lib/*/src
-MasterPassword/C/lib/include
+core/c/*.o
+core/c/lib/*/.unpacked
+core/c/lib/*/.patched
+core/c/lib/*/src
+core/c/lib/include
+platform-independent/cli-c/cli/*.o
+platform-independent/cli-c/mpw-*.tar.gz
+platform-independent/cli-c/mpw
+platform-independent/cli-c/mpw-bench
+platform-independent/cli-c/mpw-tests
+platform-independent/cli-c/VERSION

.gitmodules

@@ -1,21 +1,21 @@
 [submodule "External/Pearl"]
-	path = External/Pearl
+	path = platform-darwin/External/Pearl
 	url = git://github.com/Lyndir/Pearl.git
 [submodule "External/InAppSettingsKit"]
-	path = External/InAppSettingsKit
+	path = platform-darwin/External/InAppSettingsKit
 	url = git://github.com/lhunath/InAppSettingsKit.git
 [submodule "External/KCOrderedAccessorFix"]
-	path = External/KCOrderedAccessorFix
+	path = platform-darwin/External/KCOrderedAccessorFix
 	url = https://github.com/lhunath/KCOrderedAccessorFix.git
 [submodule "External/AttributedMarkdown"]
-	path = External/AttributedMarkdown
+	path = platform-darwin/External/AttributedMarkdown
 	url = https://github.com/dreamwieber/AttributedMarkdown.git
 [submodule "External/uicolor-utilities"]
-	path = External/uicolor-utilities
+	path = platform-darwin/External/uicolor-utilities
 	url = git://github.com/lhunath/uicolor-utilities.git
 [submodule "External/jrswizzle"]
-	path = External/jrswizzle
+	path = platform-darwin/External/jrswizzle
 	url = git://github.com/jonmarimba/jrswizzle.git
 [submodule "MasterPassword/Web/js/mpw-js"]
-	path = MasterPassword/Web/js/mpw-js
+	path = platform-independent/web-js/js/mpw-js
 	url = https://github.com/tmthrgd/mpw-js.git

.idea/encodings.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
-    <file url="file://$PROJECT_DIR$/MasterPassword/Java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/MasterPassword/Java/masterpassword-algorithm" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/MasterPassword/Java/masterpassword-cli" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/MasterPassword/Java/masterpassword-gui" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/MasterPassword/Java/masterpassword-model" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,18 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-    <option name="myLocal" value="false" />
-    <inspection_tool class="Convert to string" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="FunctionImplicitDeclarationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="ImplicitIntegerAndEnumConversion" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="MethodIsLaterInTheScope" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="OCNotLocalizedStringInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="OCUnusedMacroInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="OCUnusedMethodInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="Replace with subshell" enabled="true" level="INFO" enabled_by_default="true" />
-    <inspection_tool class="SignednessMismatch" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="UnavailableInDeploymentTarget" enabled="true" level="INFO" enabled_by_default="true" />
-    <inspection_tool class="UnusedLocalVariable" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="UnusedParameter" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>

.travis.yml

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

External/iOS/Reveal.framework

@@ -1 +0,0 @@
-/Applications/Reveal.app/Contents/SharedSupport/iOS-Libraries/Reveal.framework

MasterPassword.xcworkspace/contents.xcworkspacedata

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj">
-   </FileRef>
-</Workspace>

MasterPassword/C/distribute

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

MasterPassword/C/mpw_tests.xml

@@ -1 +0,0 @@
-../Java/masterpassword-tests/src/main/resources/mpw_tests.xml

MasterPassword/Java/.gitignore

@@ -1,8 +0,0 @@
-# Gradle
-build
-.gradle
-local.properties
-
-# Maven
-target
-dependency-reduced-pom.xml

MasterPassword/Java/masterpassword-algorithm/build.gradle

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

MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java

@@ -1,29 +0,0 @@
-package com.lyndir.masterpassword;
-
-/**
- * <i>07 04, 2012</i>
- *
- * @author lhunath
- */
-public enum MPSiteFeature {
-
-    /**
-     * Export the key-protected content data.
-     */
-    ExportContent( 1 << 10 ),
-
-    /**
-     * Never export content.
-     */
-    DevicePrivate( 1 << 11 );
-
-    MPSiteFeature(final int mask) {
-        this.mask = mask;
-    }
-
-    private final int mask;
-
-    public int getMask() {
-        return mask;
-    }
-}

MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPSiteTypeClass.java

@@ -1,21 +0,0 @@
-package com.lyndir.masterpassword;
-
-/**
- * <i>07 04, 2012</i>
- *
- * @author lhunath
- */
-public enum MPSiteTypeClass {
-    Generated( 1 << 4 ),
-    Stored( 1 << 5 );
-
-    private final int mask;
-
-    MPSiteTypeClass(final int mask) {
-        this.mask = mask;
-    }
-
-    public int getMask() {
-        return mask;
-    }
-}

MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java

@@ -1,48 +0,0 @@
-package com.lyndir.masterpassword;
-
-import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
-
-import com.google.common.collect.ImmutableList;
-import com.lyndir.lhunath.opal.system.util.MetaObject;
-import java.util.List;
-
-
-/**
- * <i>07 04, 2012</i>
- *
- * @author lhunath
- */
-public class MPTemplate extends MetaObject {
-
-    private final String                         templateString;
-    private final List<MPTemplateCharacterClass> template;
-
-    MPTemplate(final String templateString) {
-
-        ImmutableList.Builder<MPTemplateCharacterClass> builder = ImmutableList.builder();
-        for (int i = 0; i < templateString.length(); ++i)
-            builder.add( MPTemplateCharacterClass.forIdentifier( templateString.charAt( i ) ) );
-
-        this.templateString = templateString;
-        template = builder.build();
-    }
-
-    public String getTemplateString() {
-        return templateString;
-    }
-
-    public MPTemplateCharacterClass getCharacterClassAtIndex(final int index) {
-
-        return template.get( index );
-    }
-
-    public int length() {
-
-        return template.size();
-    }
-
-    @Override
-    public String toString() {
-        return strf( "{MPTemplate: %s}", templateString );
-    }
-}

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

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

MasterPassword/Java/masterpassword-android/build.gradle

@@ -1,44 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.0"
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-    defaultConfig {
-        applicationId "com.lyndir.masterpassword"
-        minSdkVersion 19
-        targetSdkVersion 25
-        versionCode 20401
-        versionName "2.4.1"
-    }
-    // release with: STORE_PW=$(mpw masterpassword.keystore) KEY_PW=$(mpw masterpassword-android) gradle assembleRelease
-    signingConfigs {
-        release {
-            storeFile file('masterpassword.keystore')
-            storePassword System.getenv('STORE_PW')
-
-            keyAlias 'masterpassword-android'
-            keyPassword System.getenv('KEY_PW')
-        }
-    }
-    buildTypes {
-        release {
-            signingConfig signingConfigs.release
-        }
-    }
-}
-
-dependencies {
-    compile project( ':masterpassword-algorithm' )
-    compile project( ':masterpassword-tests' )
-
-    // Android dependencies
-    compile 'org.slf4j:slf4j-android:1.7.13-underscore'
-    compile 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
-    compile files('libs/scrypt-1.4.0-native.jar')
-}

MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/Res.java

@@ -1,34 +0,0 @@
-package com.lyndir.masterpassword;
-
-import android.content.res.Resources;
-import android.graphics.Typeface;
-
-
-/**
- * @author lhunath, 2014-08-25
- */
-public class Res {
-
-    public static Typeface sourceCodePro_Black;
-    public static Typeface sourceCodePro_ExtraLight;
-    public static Typeface exo_Bold;
-    public static Typeface exo_ExtraBold;
-    public static Typeface exo_Regular;
-    public static Typeface exo_Thin;
-
-    private static boolean initialized;
-
-    public static void init(Resources resources) {
-
-        if (initialized)
-            return;
-        initialized = true;
-
-        sourceCodePro_Black = Typeface.createFromAsset( resources.getAssets(), "SourceCodePro-Black.otf" );
-        sourceCodePro_ExtraLight = Typeface.createFromAsset( resources.getAssets(), "SourceCodePro-ExtraLight.otf" );
-        exo_Bold = Typeface.createFromAsset( resources.getAssets(), "Exo2.0-Bold.otf" );
-        exo_ExtraBold = Typeface.createFromAsset( resources.getAssets(), "Exo2.0-ExtraBold.otf" );
-        exo_Regular = Typeface.createFromAsset( resources.getAssets(), "Exo2.0-Regular.otf" );
-        exo_Thin = Typeface.createFromAsset( resources.getAssets(), "Exo2.0-Thin.otf" );
-    }
-}

MasterPassword/Java/settings.gradle

@@ -1,7 +0,0 @@
-rootProject.name = 'masterpassword'
-include ':masterpassword-tests'
-include ':masterpassword-algorithm'
-include ':masterpassword-model'
-include ':masterpassword-cli'
-include ':masterpassword-gui'
-include ':masterpassword-android'

MasterPassword/ObjC/MPAlgorithmV0.h

@@ -1,21 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPAlgorithmV0
-//
-//  Created by Maarten Billemont on 16/07/12.
-//  Copyright 2012 lhunath (Maarten Billemont). All rights reserved.
-//
-
-#import "MPAlgorithm.h"
-
-@interface MPAlgorithmV0 : NSObject<MPAlgorithm>
-@end

MasterPassword/ObjC/MPAlgorithmV1.h

@@ -1,21 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPAlgorithmV1
-//
-//  Created by Maarten Billemont on 17/07/12.
-//  Copyright 2012 lhunath (Maarten Billemont). All rights reserved.
-//
-
-#import "MPAlgorithmV0.h"
-
-@interface MPAlgorithmV1 : MPAlgorithmV0
-@end

MasterPassword/ObjC/MPAlgorithmV1.m

@@ -1,48 +0,0 @@
-/**
-* Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
-*
-* See the enclosed file LICENSE for license information (LGPLv3). If you did
-* not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
-*
-* @author   Maarten Billemont <lhunath@lyndir.com>
-* @license  http://www.gnu.org/licenses/lgpl-3.0.txt
-*/
-
-//
-//  MPAlgorithmV1
-//
-//  Created by Maarten Billemont on 17/07/12.
-//  Copyright 2012 lhunath (Maarten Billemont). All rights reserved.
-//
-
-#import "MPAlgorithmV1.h"
-#import "MPEntities.h"
-
-@implementation MPAlgorithmV1
-
-- (MPAlgorithmVersion)version {
-
-    return MPAlgorithmVersion1;
-}
-
-- (BOOL)tryMigrateSite:(MPSiteEntity *)site explicit:(BOOL)explicit {
-
-    if ([site.algorithm version] != [self version] - 1)
-        // Only migrate from previous version.
-        return NO;
-
-    if (!explicit) {
-        if (site.type & MPSiteTypeClassGenerated) {
-            // This migration requires explicit permission for types of the generated class.
-            site.requiresExplicitMigration = YES;
-            return NO;
-        }
-    }
-
-    // Apply migration.
-    site.requiresExplicitMigration = NO;
-    site.algorithm = self;
-    return YES;
-}
-
-@end

MasterPassword/ObjC/MPAlgorithmV2.h

@@ -1,21 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPAlgorithmV2
-//
-//  Created by Maarten Billemont on 17/07/12.
-//  Copyright 2012 lhunath (Maarten Billemont). All rights reserved.
-//
-
-#import "MPAlgorithmV1.h"
-
-@interface MPAlgorithmV2 : MPAlgorithmV1
-@end

MasterPassword/ObjC/MPAlgorithmV2.m

@@ -1,48 +0,0 @@
-/**
-* Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
-*
-* See the enclosed file LICENSE for license information (LGPLv3). If you did
-* not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
-*
-* @author   Maarten Billemont <lhunath@lyndir.com>
-* @license  http://www.gnu.org/licenses/lgpl-3.0.txt
-*/
-
-//
-//  MPAlgorithmV2
-//
-//  Created by Maarten Billemont on 17/07/12.
-//  Copyright 2012 lhunath (Maarten Billemont). All rights reserved.
-//
-
-#import "MPAlgorithmV2.h"
-#import "MPEntities.h"
-
-@implementation MPAlgorithmV2
-
-- (MPAlgorithmVersion)version {
-
-    return MPAlgorithmVersion2;
-}
-
-- (BOOL)tryMigrateSite:(MPSiteEntity *)site explicit:(BOOL)explicit {
-
-    if ([site.algorithm version] != [self version] - 1)
-        // Only migrate from previous version.
-        return NO;
-
-    if (!explicit) {
-        if (site.type & MPSiteTypeClassGenerated && site.name.length != [site.name dataUsingEncoding:NSUTF8StringEncoding].length) {
-            // This migration requires explicit permission for types of the generated class.
-            site.requiresExplicitMigration = YES;
-            return NO;
-        }
-    }
-
-    // Apply migration.
-    site.requiresExplicitMigration = NO;
-    site.algorithm = self;
-    return YES;
-}
-
-@end

MasterPassword/ObjC/MPAlgorithmV3.h

@@ -1,21 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPAlgorithmV3
-//
-//  Created by Maarten Billemont on 13/01/15.
-//  Copyright 2015 lhunath (Maarten Billemont). All rights reserved.
-//
-
-#import "MPAlgorithmV2.h"
-
-@interface MPAlgorithmV3 : MPAlgorithmV2
-@end

MasterPassword/ObjC/MPAlgorithmV3.m

@@ -1,49 +0,0 @@
-/**
-* Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
-*
-* See the enclosed file LICENSE for license information (LGPLv3). If you did
-* not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
-*
-* @author   Maarten Billemont <lhunath@lyndir.com>
-* @license  http://www.gnu.org/licenses/lgpl-3.0.txt
-*/
-
-//
-//  MPAlgorithmV3
-//
-//  Created by Maarten Billemont on 13/01/15.
-//  Copyright 2015 lhunath (Maarten Billemont). All rights reserved.
-//
-
-#import "MPAlgorithmV3.h"
-#import "MPEntities.h"
-
-@implementation MPAlgorithmV3
-
-- (MPAlgorithmVersion)version {
-
-    return MPAlgorithmVersion3;
-}
-
-- (BOOL)tryMigrateSite:(MPSiteEntity *)site explicit:(BOOL)explicit {
-
-    if ([site.algorithm version] != [self version] - 1)
-        // Only migrate from previous version.
-        return NO;
-
-    if (!explicit) {
-        if (site.type & MPSiteTypeClassGenerated &&
-                site.user.name.length != [site.user.name dataUsingEncoding:NSUTF8StringEncoding].length) {
-            // This migration requires explicit permission for types of the generated class.
-            site.requiresExplicitMigration = YES;
-            return NO;
-        }
-    }
-
-    // Apply migration.
-    site.requiresExplicitMigration = NO;
-    site.algorithm = self;
-    return YES;
-}
-
-@end

MasterPassword/ObjC/MPAppDelegate_Key.h

@@ -1,19 +0,0 @@
-//
-//  MPAppDelegate_Key.h
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 24/11/11.
-//  Copyright (c) 2011 Lyndir. All rights reserved.
-//
-
-#import "MPAppDelegate_Shared.h"
-
-@interface MPAppDelegate_Shared(Key)
-
-- (BOOL)signInAsUser:(MPUserEntity *)user saveInContext:(NSManagedObjectContext *)moc usingMasterPassword:(NSString *)password;
-- (void)signOutAnimated:(BOOL)animated;
-
-- (void)storeSavedKeyFor:(MPUserEntity *)user;
-- (void)forgetSavedKeyFor:(MPUserEntity *)user;
-
-@end

MasterPassword/ObjC/MPAppDelegate_Shared.h

@@ -1,28 +0,0 @@
-//
-//  MPAppDelegate_Shared.h
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 24/11/11.
-//  Copyright (c) 2011 Lyndir. All rights reserved.
-//
-
-#import "MPEntities.h"
-
-#if TARGET_OS_IPHONE
-@interface MPAppDelegate_Shared : PearlAppDelegate
-#else
-@interface MPAppDelegate_Shared : NSObject <PearlConfigDelegate>
-#endif
-
-@property(strong, nonatomic, readonly) MPKey *key;
-@property(strong, nonatomic, readonly) NSManagedObjectID *activeUserOID;
-@property(strong, nonatomic, readonly) NSPersistentStoreCoordinator *storeCoordinator;
-
-+ (instancetype)get;
-
-- (MPUserEntity *)activeUserForMainThread;
-- (MPUserEntity *)activeUserInContext:(NSManagedObjectContext *)context;
-- (void)setActiveUser:(MPUserEntity *)activeUser;
-- (void)handleCoordinatorError:(NSError *)error;
-
-@end

MasterPassword/ObjC/MPAppDelegate_Store.h

@@ -1,40 +0,0 @@
-//
-//  MPAppDelegate_Key.h
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 24/11/11.
-//  Copyright (c) 2011 Lyndir. All rights reserved.
-//
-
-#import "MPAppDelegate_Shared.h"
-
-#import "MPFixable.h"
-
-typedef NS_ENUM( NSUInteger, MPImportResult ) {
-    MPImportResultSuccess,
-    MPImportResultCancelled,
-    MPImportResultInvalidPassword,
-    MPImportResultMalformedInput,
-    MPImportResultInternalError,
-};
-
-@interface MPAppDelegate_Shared(Store)
-
-+ (NSManagedObjectContext *)managedObjectContextForMainThreadIfReady;
-+ (BOOL)managedObjectContextForMainThreadPerformBlock:(void (^)(NSManagedObjectContext *mainContext))mocBlock;
-+ (BOOL)managedObjectContextForMainThreadPerformBlockAndWait:(void (^)(NSManagedObjectContext *mainContext))mocBlock;
-+ (BOOL)managedObjectContextPerformBlock:(void (^)(NSManagedObjectContext *context))mocBlock;
-+ (BOOL)managedObjectContextPerformBlockAndWait:(void (^)(NSManagedObjectContext *context))mocBlock;
-
-- (MPFixableResult)findAndFixInconsistenciesSaveInContext:(NSManagedObjectContext *)context;
-- (void)deleteAndResetStore;
-
-/** @param completion The block to execute after adding the site, executed from the main thread with the new site in the main MOC. */
-- (void)addSiteNamed:(NSString *)siteName completion:(void ( ^ )(MPSiteEntity *site, NSManagedObjectContext *context))completion;
-- (MPSiteEntity *)changeSite:(MPSiteEntity *)site saveInContext:(NSManagedObjectContext *)context toType:(MPSiteType)type;
-- (MPImportResult)importSites:(NSString *)importedSitesString
-            askImportPassword:(NSString *(^)(NSString *userName))importPassword
-              askUserPassword:(NSString *(^)(NSString *userName, NSUInteger importCount, NSUInteger deleteCount))userPassword;
-- (NSString *)exportSitesRevealPasswords:(BOOL)revealPasswords;
-
-@end

MasterPassword/ObjC/MPUserEntity.h

@@ -1,34 +0,0 @@
-//
-//  MPUserEntity.h
-//  MasterPassword-Mac
-//
-//  Created by Maarten Billemont on 2014-09-21.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-@class MPSiteEntity;
-
-@interface MPUserEntity : NSManagedObject
-
-@property (nonatomic, retain) NSNumber * avatar_;
-@property (nonatomic, retain) NSNumber * defaultType_;
-@property (nonatomic, retain) NSData * keyID;
-@property (nonatomic, retain) NSDate * lastUsed;
-@property (nonatomic, retain) NSString * name;
-@property (nonatomic, retain) NSNumber * saveKey_;
-@property (nonatomic, retain) NSNumber * touchID_;
-@property (nonatomic, retain) NSNumber * version_;
-@property (nonatomic, retain) NSSet *sites;
-@end
-
-@interface MPUserEntity (CoreDataGeneratedAccessors)
-
-- (void)addSitesObject:(MPSiteEntity *)value;
-- (void)removeSitesObject:(MPSiteEntity *)value;
-- (void)addSites:(NSSet *)values;
-- (void)removeSites:(NSSet *)values;
-
-@end

MasterPassword/ObjC/Mac/MPGradientView.h

@@ -1,16 +0,0 @@
-//
-// Created by Maarten Billemont on 2016-05-15.
-// Copyright (c) 2016 Lyndir. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-IB_DESIGNABLE
-@interface MPGradientView : NSView
-
-@property(nonatomic, retain) IBInspectable NSColor *startingColor;
-@property(nonatomic, retain) IBInspectable NSColor *endingColor;
-@property(nonatomic, assign) IBInspectable NSInteger angle;
-@property(nonatomic, assign) IBInspectable CGFloat ratio;
-
-@end

MasterPassword/ObjC/Mac/MPInitialWindowController.h

@@ -1,29 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPInitialWindowController.h
-//  MPInitialWindowController
-//
-//  Created by lhunath on 2014-06-29.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <AppKit/AppKit.h>
-
-@interface MPInitialWindowController : NSWindowController
-
-@property(nonatomic, weak) IBOutlet NSButton *openAtLoginButton;
-
-- (IBAction)iphoneAppStore:(id)sender;
-- (IBAction)androidPlayStore:(id)sender;
-- (IBAction)togglePreference:(id)sender;
-
-@end

MasterPassword/ObjC/Mac/MPMacApplication.h

@@ -1,9 +0,0 @@
-//
-// Created by Maarten Billemont on 2016-04-30.
-// Copyright (c) 2016 Lyndir. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface MPMacApplication : NSApplication
-@end

MasterPassword/ObjC/Mac/MPSiteModel.h

@@ -1,53 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPSiteModel.h
-//  MPSiteModel
-//
-//  Created by lhunath on 2/11/2014.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "MPSiteEntity.h"
-#import "MPAlgorithm.h"
-#import "MPUserEntity.h"
-
-@class MPSiteEntity;
-
-@interface MPSiteModel : NSObject
-
-@property (nonatomic) NSString *name;
-@property (nonatomic) NSAttributedString *displayedName;
-@property (nonatomic) MPSiteType type;
-@property (nonatomic) NSString *typeName;
-@property (nonatomic) NSString *content;
-@property (nonatomic) NSString *displayedContent;
-@property (nonatomic) NSString *question;
-@property (nonatomic) NSString *answer;
-@property (nonatomic) NSString *loginName;
-@property (nonatomic) BOOL loginGenerated;
-@property (nonatomic) NSNumber *uses;
-@property (nonatomic) NSUInteger counter;
-@property (nonatomic) NSDate *lastUsed;
-@property (nonatomic) id<MPAlgorithm> algorithm;
-@property (nonatomic) MPAlgorithmVersion algorithmVersion;
-@property (nonatomic, readonly) BOOL outdated;
-@property (nonatomic, readonly) BOOL generated;
-@property (nonatomic, readonly) BOOL stored;
-@property (nonatomic, readonly) BOOL transient;
-
-- (instancetype)initWithEntity:(MPSiteEntity *)entity fuzzyGroups:(NSArray *)fuzzyGroups;
-- (instancetype)initWithName:(NSString *)siteName forUser:(MPUserEntity *)user;
-- (MPSiteEntity *)entityInContext:(NSManagedObjectContext *)moc;
-
-- (void)updateContent;
-@end

MasterPassword/ObjC/Mac/MPSitesTableView.h

@@ -1,27 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPSitesTableView.h
-//  MPSitesTableView
-//
-//  Created by lhunath on 2014-06-30.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <AppKit/AppKit.h>
-
-@class MPPasswordWindowController;
-
-@interface MPSitesTableView : NSTableView
-
-@property(nonatomic, weak) MPPasswordWindowController *controller;
-
-@end

MasterPassword/ObjC/Mac/MPSitesTableView.m

@@ -1,34 +0,0 @@
-/**
-* Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
-*
-* See the enclosed file LICENSE for license information (LGPLv3). If you did
-* not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
-*
-* @author   Maarten Billemont <lhunath@lyndir.com>
-* @license  http://www.gnu.org/licenses/lgpl-3.0.txt
-*/
-
-//
-//  MPSitesTableView.h
-//  MPSitesTableView
-//
-//  Created by lhunath on 2014-06-30.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import "MPSitesTableView.h"
-#import "MPPasswordWindowController.h"
-
-@implementation MPSitesTableView
-
-- (void)doCommandBySelector:(SEL)aSelector {
-
-    [self.controller handleCommand:aSelector];
-}
-
-- (void)keyDown:(NSEvent *)theEvent {
-
-    [self interpretKeyEvents:@[ theEvent ]];
-}
-
-@end

MasterPassword/ObjC/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper/main.m

@@ -1,28 +0,0 @@
-//
-//  main.m
-//  MasterPassword-Mac-LoginHelper
-//
-//  Created by Maarten Billemont on 2013-06-07.
-//  Copyright (c) 2013 Maarten Billemont. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-int main(int argc, char *argv[]) {
-
-    NSURL *bundleURL = [[[[[[NSBundle mainBundle] bundleURL]
-            URLByDeletingLastPathComponent] URLByDeletingLastPathComponent]
-            URLByDeletingLastPathComponent] URLByDeletingLastPathComponent];
-
-    NSError *error = nil;
-    NSRunningApplication *application = [[NSWorkspace sharedWorkspace]
-            launchApplicationAtURL:bundleURL options:NSWorkspaceLaunchWithoutActivation
-                     configuration:@{} error:&error];
-
-    if (!application || error) {
-        NSLog( @"Error launching main app: %@", [error debugDescription] );
-        return (int)error.code?: 1;
-    }
-
-    return 0;
-}

MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0710"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DA5BFA43147E415C00F98B1E"
-               BuildableName = "Master Password.app"
-               BlueprintName = "MasterPassword"
-               ReferencedContainer = "container:MasterPassword-Mac.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug-Mac"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA5BFA43147E415C00F98B1E"
-            BuildableName = "Master Password.app"
-            BlueprintName = "MasterPassword"
-            ReferencedContainer = "container:MasterPassword-Mac.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug-Mac"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA5BFA43147E415C00F98B1E"
-            BuildableName = "Master Password.app"
-            BlueprintName = "MasterPassword"
-            ReferencedContainer = "container:MasterPassword-Mac.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "CA_DEBUG_TRANSACTIONS"
-            value = "1"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Debug-Mac"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA5BFA43147E415C00F98B1E"
-            BuildableName = "Master Password.app"
-            BlueprintName = "MasterPassword"
-            ReferencedContainer = "container:MasterPassword-Mac.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug-Mac">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "AdHoc-Mac"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

MasterPassword/ObjC/Mac/MasterPassword-Prefix.pch

@@ -1,107 +0,0 @@
-//
-// Prefix header for all source files of the 'MasterPassword' target in the 'MasterPassword' project
-//
-
-#import <Availability.h>
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
-    #warning "This project uses features only available in Mac OS X 10.8 and later."
-#endif
-
-#import "Pearl-Prefix.pch"
-
-#ifdef __OBJC__
-
-#import <Cocoa/Cocoa.h>
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-#ifdef CRASHLYTICS
-    #import <Crashlytics/Crashlytics.h>
-#endif
-
-#import "MPTypes.h"
-#import "MPMacConfig.h"
-
-#else
-
-#import <libgen.h>
-#import <CoreFoundation/CFString.h>
-#import <objc/runtime.h>
-#import <objc/message.h>
-#import <objc/NSObjCRuntime.h>
-#import <stdlib.h>
-
-#define trc(format, ...) \
-    do { \
-        char *_msg = NULL; \
-        asprintf( &_msg, format, ##__VA_ARGS__ ); \
-        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
-        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
-                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
-                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
-                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 0, \
-                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
-    } while (0)
-
-#define dbg(format, ...) \
-    do { \
-        char *_msg = NULL; \
-        asprintf( &_msg, format, ##__VA_ARGS__ ); \
-        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
-        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
-                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
-                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
-                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 1, \
-                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
-    } while (0)
-
-#define inf(format, ...) \
-    do { \
-        char *_msg = NULL; \
-        asprintf( &_msg, format, ##__VA_ARGS__ ); \
-        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
-        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
-                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
-                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
-                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 2, \
-                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
-    } while (0)
-
-#define wrn(format, ...) \
-    do { \
-        char *_msg = NULL; \
-        asprintf( &_msg, format, ##__VA_ARGS__ ); \
-        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
-        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
-                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
-                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
-                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 3, \
-                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
-    } while (0)
-
-#define err(format, ...) \
-    do { \
-        char *_msg = NULL; \
-        asprintf( &_msg, format, ##__VA_ARGS__ ); \
-        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
-        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
-                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
-                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
-                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 4, \
-                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
-    } while (0)
-
-#define ftl(format, ...) \
-    do { \
-        char *_msg = NULL; \
-        asprintf( &_msg, format, ##__VA_ARGS__ ); \
-        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
-        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
-                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
-                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
-                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 5, \
-                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
-        abort(); \
-    } while (0)
-
-#endif

MasterPassword/ObjC/Mac/main.m

@@ -1,12 +0,0 @@
-//
-//  main.m
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 04/03/12.
-//  Copyright (c) 2012 Lyndir. All rights reserved.
-//
-
-int main(int argc, char *argv[]) {
-
-    return NSApplicationMain( argc, (const char **)argv );
-}

MasterPassword/ObjC/iOS/AttributedMarkdown/AttributedMarkdown.h

@@ -1,13 +0,0 @@
-//
-//  AttributedMarkdown.h
-//  AttributedMarkdown
-//
-//  Created by Maarten Billemont on 2014-09-28.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface AttributedMarkdown : NSObject
-
-@end

MasterPassword/ObjC/iOS/AttributedMarkdown/AttributedMarkdown.m

@@ -1,13 +0,0 @@
-//
-//  AttributedMarkdown.m
-//  AttributedMarkdown
-//
-//  Created by Maarten Billemont on 2014-09-28.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import "AttributedMarkdown.h"
-
-@implementation AttributedMarkdown
-
-@end

MasterPassword/ObjC/iOS/AttributedMarkdownTests/Info.plist

@@ -1,24 +0,0 @@
-<?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>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.lyndir.$(PRODUCT_NAME:rfc1034identifier)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>

MasterPassword/ObjC/iOS/MPAnswersViewController.h

@@ -1,46 +0,0 @@
-//
-//  MPPreferencesViewController.h
-//  MasterPassword-iOS
-//
-//  Created by Maarten Billemont on 04/06/12.
-//  Copyright (c) 2012 Lyndir. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "MPTypeViewController.h"
-#import "MPSiteQuestionEntity.h"
-
-@interface MPAnswersViewController : UIViewController
-
-@property (nonatomic) IBOutlet UITableView *tableView;
-
-- (void)setSite:(MPSiteEntity *)site;
-- (MPSiteEntity *)siteInContext:(NSManagedObjectContext *)context;
-
-@end
-
-@interface MPGlobalAnswersCell : UITableViewCell
-
-@property (nonatomic) IBOutlet UILabel *titleLabel;
-@property (nonatomic) IBOutlet UITextField *answerField;
-
-- (void)setSite:(MPSiteEntity *)site;
-
-@end
-
-@interface MPSendAnswersCell : UITableViewCell
-
-@end
-
-@interface MPMultipleAnswersCell : UITableViewCell <UITextFieldDelegate>
-
-@end
-
-@interface MPAnswersQuestionCell : UITableViewCell
-
-@property(nonatomic) IBOutlet UITextField *questionField;
-@property(nonatomic) IBOutlet UITextField *answerField;
-
-- (void)setQuestion:(MPSiteQuestionEntity *)question forSite:(MPSiteEntity *)site inVC:(MPAnswersViewController *)VC;
-
-@end

MasterPassword/ObjC/iOS/MPAppSettingsViewController.h

@@ -1,23 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPAppSettingsViewController.h
-//  MPAppSettingsViewController
-//
-//  Created by lhunath on 2014-04-18.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "IASKAppSettingsViewController.h"
-
-@interface MPAppSettingsViewController : IASKAppSettingsViewController
-@end

MasterPassword/ObjC/iOS/MPAppSettingsViewController.m

@@ -1,46 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPAppSettingsViewController.h
-//  MPAppSettingsViewController
-//
-//  Created by lhunath on 2014-04-18.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import "MPAppSettingsViewController.h"
-#import "UIColor+Expanded.h"
-
-@implementation MPAppSettingsViewController {
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-
-    [super viewWillAppear:animated];
-
-    self.tableView.contentInset = UIEdgeInsetsMake( 64, 0, 49, 0 );
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-
-    UITableViewCell *cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
-    cell.backgroundColor = [UIColor clearColor];
-    cell.textLabel.textColor = [UIColor whiteColor];
-
-    if (cell.selectionStyle != UITableViewCellSelectionStyleNone) {
-        cell.selectedBackgroundView = [[UIView alloc] initWithFrame:cell.bounds];
-        cell.selectedBackgroundView.backgroundColor = [UIColor colorWithRGBAHex:0x78DDFB33];
-    }
-
-    return cell;
-}
-
-@end

MasterPassword/ObjC/iOS/MPAvatarCell.h

@@ -1,47 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPAvatarCell.h
-//  MPAvatarCell
-//
-//  Created by lhunath on 2014-03-11.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "MPEntities.h"
-@class MPAvatarCell;
-
-/* Avatar with a "+" symbol. */
-extern const long MPAvatarAdd;
-
-typedef NS_ENUM(NSUInteger, MPAvatarMode) {
-    MPAvatarModeLowered,
-    MPAvatarModeRaisedButInactive,
-    MPAvatarModeRaisedAndActive,
-    MPAvatarModeRaisedAndHidden,
-    MPAvatarModeRaisedAndMinimized,
-};
-
-@interface MPAvatarCell : UICollectionViewCell 
-@property (copy, nonatomic) NSString *name;
-@property (assign, nonatomic) NSUInteger avatar;
-@property (assign, nonatomic) MPAvatarMode mode;
-@property (assign, nonatomic) CGFloat visibility;
-@property (assign, nonatomic) BOOL spinnerActive;
-@property (assign, nonatomic, readonly) BOOL newUser;
-
-+ (NSString *)reuseIdentifier;
-
-- (void)setVisibility:(CGFloat)visibility animated:(BOOL)animated;
-- (void)setMode:(MPAvatarMode)mode animated:(BOOL)animated;
-
-@end

MasterPassword/ObjC/iOS/MPCell.h

@@ -1,23 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPCell.h
-//  MPCell
-//
-//  Created by lhunath on 2014-03-27.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface MPCell : UICollectionViewCell
-
-@end

MasterPassword/ObjC/iOS/MPCell.m

@@ -1,24 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPCell.h
-//  MPCell
-//
-//  Created by lhunath on 2014-03-27.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import "MPCell.h"
-
-@implementation MPCell {
-}
-
-@end

MasterPassword/ObjC/iOS/MPCombinedViewController.h

@@ -1,35 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPCombinedViewController.h
-//  MPCombinedViewController
-//
-//  Created by lhunath on 2014-03-08.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import "MPUsersViewController.h"
-#import "MPPasswordsViewController.h"
-#import "MPEmergencyViewController.h"
-
-typedef NS_ENUM(NSUInteger, MPCombinedMode) {
-    MPCombinedModeUserSelection,
-    MPCombinedModePasswordSelection,
-};
-
-@interface MPCombinedViewController : UIViewController
-
-@property(nonatomic) MPCombinedMode mode;
-@property(nonatomic, weak) MPUsersViewController *usersVC;
-@property(nonatomic, weak) MPPasswordsViewController *passwordsVC;
-@property(nonatomic, weak) MPEmergencyViewController *emergencyVC;
-
-@end

MasterPassword/ObjC/iOS/MPEmergencyViewController.h

@@ -1,38 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPCombinedViewController.h
-//  MPCombinedViewController
-//
-//  Created by lhunath on 2014-03-08.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-
-@interface MPEmergencyViewController : UIViewController <UITextFieldDelegate>
-
-@property(weak, nonatomic) IBOutlet UIScrollView *scrollView;
-@property(weak, nonatomic) IBOutlet UIView *dialogView;
-@property(weak, nonatomic) IBOutlet UIView *containerView;
-@property(weak, nonatomic) IBOutlet UITextField *fullNameField;
-@property(weak, nonatomic) IBOutlet UITextField *masterPasswordField;
-@property(weak, nonatomic) IBOutlet UITextField *siteField;
-@property(weak, nonatomic) IBOutlet UIStepper *counterStepper;
-@property(weak, nonatomic) IBOutlet UISegmentedControl *typeControl;
-@property(weak, nonatomic) IBOutlet UILabel *counterLabel;
-@property(weak, nonatomic) IBOutlet UIActivityIndicatorView *activity;
-@property(weak, nonatomic) IBOutlet UILabel *passwordLabel;
-@property(weak, nonatomic) IBOutlet UIView *tipContainer;
-
-- (IBAction)controlChanged:(UIControl *)control;
-- (IBAction)copyPassword:(UITapGestureRecognizer *)recognizer;
-
-@end

MasterPassword/ObjC/iOS/MPGuideViewController.h

@@ -1,20 +0,0 @@
-//
-//  MPGuideViewController.h
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 30/01/12.
-//  Copyright (c) 2012 Lyndir. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface MPGuideViewController : UIViewController<UICollectionViewDataSource, UICollectionViewDelegateFlowLayout>
-
-@property(nonatomic) IBOutlet UICollectionView *collectionView;
-@property(nonatomic) IBOutlet UILabel *captionLabel;
-@property(nonatomic) IBOutlet UIPageControl *pageControl;
-@property(nonatomic) IBOutlet UINavigationBar *navigationBar;
-
-- (IBAction)close:(id)sender;
-
-@end

MasterPassword/ObjC/iOS/MPLogsViewController.h

@@ -1,29 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPLogsViewController.h
-//  MPLogsViewController
-//
-//  Created by lhunath on 2013-04-29.
-//  Copyright, lhunath (Maarten Billemont) 2013. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-@interface MPLogsViewController : UIViewController
-@property (weak, nonatomic) IBOutlet UITextView *logView;
-@property (weak, nonatomic) IBOutlet UISegmentedControl *levelControl;
-
-- (IBAction)toggleLevelControl:(UISegmentedControl *)sender;
-- (IBAction)refresh:(UIBarButtonItem *)sender;
-- (IBAction)mail:(UIBarButtonItem *)sender;
-@end

MasterPassword/ObjC/iOS/MPMessageViewController.h

@@ -1,25 +0,0 @@
-//
-//  MPPreferencesViewController.h
-//  MasterPassword-iOS
-//
-//  Created by Maarten Billemont on 04/06/12.
-//  Copyright (c) 2012 Lyndir. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface MPMessage : NSObject
-
-@property(nonatomic) NSString *title;
-@property(nonatomic) NSString *text;
-@property(nonatomic) BOOL info;
-
-+ (instancetype)messageWithTitle:(NSString *)title text:(NSString *)text info:(BOOL)info;
-
-@end
-
-@interface MPMessageViewController : UIViewController
-
-@property (nonatomic) MPMessage *message;
-
-@end

MasterPassword/ObjC/iOS/MPNavigationController.h

@@ -1,23 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPNavigationController.h
-//  MPNavigationController
-//
-//  Created by lhunath on 2014-06-03.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-
-@interface MPNavigationController : UINavigationController
-@end

MasterPassword/ObjC/iOS/MPNavigationController.m

@@ -1,38 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPNavigationController.h
-//  MPNavigationController
-//
-//  Created by lhunath on 2014-06-03.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import "MPNavigationController.h"
-#import "MPWebViewController.h"
-
-@implementation MPNavigationController
-
-- (void)viewDidAppear:(BOOL)animated {
-
-    [super viewDidAppear:animated];
-
-    if ([[MPiOSConfig get].showSetup boolValue])
-        [self performSegueWithIdentifier:@"setup" sender:self];
-}
-
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-
-    if ([segue.identifier isEqualToString:@"web"])
-        ((MPWebViewController *)segue.destinationViewController).initialURL = sender;
-}
-
-@end

MasterPassword/ObjC/iOS/MPOverlayViewController.h

@@ -1,29 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPOverlayViewController.h
-//  MPOverlayViewController
-//
-//  Created by lhunath on 2014-09-22.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-
-@interface MPOverlayViewController : UIViewController
-@end
-
-@interface MPOverlaySegue : UIStoryboardSegue
-
-+ (instancetype)dismissViewController:(UIViewController *)viewController;
-
-@end

MasterPassword/ObjC/iOS/MPPasswordCell.h

@@ -1,37 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPAvatarCell.h
-//  MPAvatarCell
-//
-//  Created by lhunath on 2014-03-11.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "MPEntities.h"
-#import "MPCell.h"
-
-typedef NS_ENUM ( NSUInteger, MPPasswordCellMode ) {
-    MPPasswordCellModePassword,
-    MPPasswordCellModeSettings,
-};
-
-@interface MPPasswordCell : MPCell <UIScrollViewDelegate, UITextFieldDelegate>
-
-@property (nonatomic) NSArray *fuzzyGroups;
-
-- (void)setSite:(MPSiteEntity *)site animated:(BOOL)animated;
-- (void)setTransientSite:(NSString *)siteName animated:(BOOL)animated;
-- (void)setMode:(MPPasswordCellMode)mode animated:(BOOL)animated;
-- (MPSiteEntity *)siteInContext:(NSManagedObjectContext *)context;
-
-@end

MasterPassword/ObjC/iOS/MPPasswordsSegue.h

@@ -1,25 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPPasswordsSegue.h
-//  MPPasswordsSegue
-//
-//  Created by lhunath on 2014-04-12.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface MPPasswordsSegue : UIStoryboardSegue
-
-@property (nonatomic, assign) BOOL animated;
-
-@end

MasterPassword/ObjC/iOS/MPPopdownSegue.h

@@ -1,22 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPPopdownSegue.h
-//  MPPopdownSegue
-//
-//  Created by lhunath on 2014-04-17.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface MPPopdownSegue : UIStoryboardSegue
-@end

MasterPassword/ObjC/iOS/MPRootSegue.h

@@ -1,25 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPRootSegue.h
-//  MPRootSegue
-//
-//  Created by lhunath on 2014-09-26.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-
-@interface MPRootSegue : UIStoryboardSegue
-
-
-@end

MasterPassword/ObjC/iOS/MPRootSegue.m

@@ -1,38 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPRootSegue.h
-//  MPRootSegue
-//
-//  Created by lhunath on 2014-09-26.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import "MPRootSegue.h"
-
-
-@implementation MPRootSegue {
-
-}
-
-- (void)perform {
-
-    UIViewController *sourceViewController = self.sourceViewController;
-    UIViewController *destinationViewController = self.destinationViewController;
-    [sourceViewController addChildViewController:destinationViewController];
-    destinationViewController.view.frame = sourceViewController.view.bounds;
-    destinationViewController.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    [sourceViewController.view addSubview:destinationViewController.view];
-    [destinationViewController didMoveToParentViewController:sourceViewController];
-    [sourceViewController setNeedsStatusBarAppearanceUpdate];
-}
-
-@end

MasterPassword/ObjC/iOS/MPSetupViewController.h

@@ -1,28 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPSetupViewController.h
-//  MPSetupViewController
-//
-//  Created by lhunath on 2013-04-11.
-//  Copyright, lhunath (Maarten Billemont) 2013. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface MPSetupViewController : UIViewController
-
-@property(weak, nonatomic) IBOutlet UISwitch *rememberLoginSwitch;
-@property(weak, nonatomic) IBOutlet UISwitch *showPasswordsSwitch;
-
-- (IBAction)close:(UIBarButtonItem *)sender;
-
-@end

MasterPassword/ObjC/iOS/MPTypeViewController.h

@@ -1,29 +0,0 @@
-//
-//  MPTypeViewController.h
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 27/11/11.
-//  Copyright (c) 2011 Lyndir. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-#import "MPEntities.h"
-
-@protocol MPTypeDelegate<NSObject>
-
-@required
-- (void)didSelectType:(MPSiteType)type;
-- (MPSiteType)selectedType;
-
-@optional
-- (MPSiteEntity *)selectedSite;
-
-@end
-
-@interface MPTypeViewController : UITableViewController
-
-@property(nonatomic, weak) id<MPTypeDelegate> delegate;
-@property(weak, nonatomic) IBOutlet UIView *recommendedTipContainer;
-
-@end

MasterPassword/ObjC/iOS/MPWebViewController.h

@@ -1,29 +0,0 @@
-/**
- * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
- *
- * See the enclosed file LICENSE for license information (LGPLv3). If you did
- * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * @author   Maarten Billemont <lhunath@lyndir.com>
- * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
- */
-
-//
-//  MPWebViewController.h
-//  MPWebViewController
-//
-//  Created by lhunath on 2014-05-09.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-
-@interface MPWebViewController : UIViewController <UIWebViewDelegate>
-
-@property(nonatomic) IBOutlet UIWebView *webView;
-@property(nonatomic) IBOutlet UINavigationItem *webNavigationItem;
-
-@property(nonatomic) NSURL *initialURL;
-
-@end

MasterPassword/ObjC/iOS/MPiOSAppDelegate.h

@@ -1,21 +0,0 @@
-//
-//  MPiOSAppDelegate.h
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 24/11/11.
-//  Copyright (c) 2011 Lyndir. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-#import "MPAppDelegate_Shared.h"
-
-@interface MPiOSAppDelegate : MPAppDelegate_Shared
-
-- (void)showFeedbackWithLogs:(BOOL)logs forVC:(UIViewController *)viewController;
-- (void)openFeedbackWithLogs:(BOOL)logs forVC:(UIViewController *)viewController;
-
-- (void)showExportForVC:(UIViewController *)viewController;
-- (void)changeMasterPasswordFor:(MPUserEntity *)user saveInContext:(NSManagedObjectContext *)moc didResetBlock:(void (^)(void))didReset;
-
-@end

MasterPassword/ObjC/iOS/MPiOSConfig.h

@@ -1,27 +0,0 @@
-//
-//  MPConfig.h
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 02/01/12.
-//  Copyright (c) 2012 Lyndir. All rights reserved.
-//
-
-#import "MPConfig.h"
-
-@interface MPiOSConfig : MPConfig
-
-@property(nonatomic, retain) NSNumber *helpHidden;
-@property(nonatomic, retain) NSNumber *siteInfoHidden;
-@property(nonatomic, retain) NSNumber *showSetup;
-@property(nonatomic, retain) NSNumber *actionsTipShown;
-@property(nonatomic, retain) NSNumber *typeTipShown;
-@property(nonatomic, retain) NSNumber *loginNameTipShown;
-@property(nonatomic, retain) NSNumber *traceMode;
-@property(nonatomic, retain) NSNumber *dictationSearch;
-@property(nonatomic, retain) NSNumber *allowDowngrade;
-@property(nonatomic, retain) NSNumber *developmentFuelRemaining;
-@property(nonatomic, retain) NSNumber *developmentFuelInvested;
-@property(nonatomic, retain) NSNumber *developmentFuelConsumption;
-@property(nonatomic, retain) NSDate *developmentFuelChecked;
-
-@end

MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0710"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DA5BFA43147E415C00F98B1E"
-               BuildableName = "MasterPassword.app"
-               BlueprintName = "MasterPassword"
-               ReferencedContainer = "container:MasterPassword-iOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug-iOS"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA5BFA43147E415C00F98B1E"
-            BuildableName = "MasterPassword.app"
-            BlueprintName = "MasterPassword"
-            ReferencedContainer = "container:MasterPassword-iOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug-iOS"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA5BFA43147E415C00F98B1E"
-            BuildableName = "MasterPassword.app"
-            BlueprintName = "MasterPassword"
-            ReferencedContainer = "container:MasterPassword-iOS.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Debug-iOS"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA5BFA43147E415C00F98B1E"
-            BuildableName = "MasterPassword.app"
-            BlueprintName = "MasterPassword"
-            ReferencedContainer = "container:MasterPassword-iOS.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "AppStore-iOS">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "AppStore-iOS"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

MasterPassword/ObjC/iOS/NSString+MPMarkDown.m

@@ -1,56 +0,0 @@
-/**
-* Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
-*
-* See the enclosed file LICENSE for license information (LGPLv3). If you did
-* not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
-*
-* @author   Maarten Billemont <lhunath@lyndir.com>
-* @license  http://www.gnu.org/licenses/lgpl-3.0.txt
-*/
-
-//
-//  NSString(MPMarkDown).h
-//  NSString(MPMarkDown)
-//
-//  Created by lhunath on 2014-09-28.
-//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
-//
-
-#import "NSString+MPMarkDown.h"
-#import "markdown_lib.h"
-#import "markdown_peg.h"
-
-@implementation NSString(MPMarkDown)
-
-- (NSAttributedString *)attributedMarkdownStringWithFontSize:(CGFloat)fontSize {
-
-    NSMutableAttributedString *attributedString = markdown_to_attr_string( self, 0, @{
-            @(EMPH)          : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-Bold" size:fontSize] },
-            @(STRONG)        : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-ExtraBold" size:fontSize] },
-            @(EMPH | STRONG) : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-ExtraBold" size:fontSize] },
-            @(PLAIN)         : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-Regular" size:fontSize] },
-            @(H1)            : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-Thin" size:fontSize * 2.f] },
-            @(H2)            : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-Thin" size:fontSize * 1.5f] },
-            @(H3)            : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-Thin" size:fontSize * 1.17f] },
-            @(H4)            : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-Thin" size:fontSize * 1.f] },
-            @(H5)            : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-Thin" size:fontSize * .83f] },
-            @(H6)            : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-Thin" size:fontSize * .75f] },
-            @(BLOCKQUOTE)    : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-Thin" size:fontSize * 1.17f] },
-            @(CODE)          : @{ NSFontAttributeName : [UIFont fontWithName:@"SourceCodePro-Regular" size:fontSize] },
-            @(VERBATIM)      : @{ NSFontAttributeName : [UIFont fontWithName:@"SourceCodePro-Regular" size:fontSize] },
-            @(NOTE)          : @{ NSFontAttributeName : [UIFont fontWithName:@"Exo2.0-Thin" size:fontSize * 1.17f] },
-    } );
-
-    // Trim trailing newlines.
-    NSCharacterSet *trimSet = [NSCharacterSet newlineCharacterSet];
-    while (YES) {
-        NSRange range = [attributedString.string rangeOfCharacterFromSet:trimSet options:NSBackwardsSearch];
-        if (!range.length || NSMaxRange( range ) != attributedString.length)
-            break;
-
-        [attributedString replaceCharactersInRange:range withString:@""];
-    }
-
-    return attributedString;
-}
-@end

MasterPassword/ObjC/iOS/main.m

@@ -1,16 +0,0 @@
-//
-//  main.m
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 24/11/11.
-//  Copyright (c) 2011 Lyndir. All rights reserved.
-//
-
-#import "MPiOSAppDelegate.h"
-
-int main(int argc, char *argv[]) {
-
-    @autoreleasepool {
-        return UIApplicationMain( argc, argv, nil, NSStringFromClass( [MPiOSAppDelegate class] ) );
-    }
-}

MasterPassword/Resources/TestFlight/TestFlight.plist

@@ -1,8 +0,0 @@
-<?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>Application Token</key>
-	<string></string>
-</dict>
-</plist>

README.md

@@ -1,6 +1,198 @@
-[![Gittip](http://img.shields.io/gittip/lhunath.png)](https://www.gittip.com/lhunath/)
 [![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
 
-Master Password is an algorithm and Java/iOS application to solve the real trouble with passwords.
+
+
+# [Master Password •••|](http://masterpasswordapp.com)
+
+Master Password is a completely new way of thinking about passwords.
+
+It consists of an algorithm that implements the core idea and applications for various platforms making the alogirthm available to users on a variety of devices and platforms.
+
+To skip the intro and go straight to the information on how to use the code, [click here](#source-code).
+
+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 also available from the following package managers: [macOS: Homebrew](https://brew.sh/).  Get in touch if you are interested in adding Master Password to any other package managers.
+
+
+
+## What is a password?
+
+The "password".  Somehow, passwords have become the default solution to authentication across the web.  We've long since accepted this as the way things are, but let's stop to think for a moment about what passwords actually are:
+
+A password is a secret that is known only to the party providing a service and the party that should be allowed access to this service.
+
+Simple enough - a secret that you know and your website knows but nobody else, thereby guaranteeing that you and only you have access to your account on this website.  Unfortunately, in practice, the ubiquitous use of passwords has us completely overwhelmed.  And the only way we can cope with that is by finding ways of making the problem manageable.
+
+
+
+## What's the problem?
+
+Coming up with a secret password is pretty easy.  Say you're organizing a secret meeting and will only let people in if they know the password at the door.  You tell those you trust, the password for tonight's meeting is "purple oranges with a smile".
+
+The problem we have in our daily lives, however, is the fact that we need secret passwords for almost everything now.  A password for our email, twitter, 9gag, facebook, imgur, amazon, ebay, paypal, bank, reddit, etc.  And every time we want to use a new site, we need another one.  The problem now becomes clear: passwords are meant to be remembered and recalled with ease when needed, but this becomes impossible when we have secrets for every distinct activity in our lives.
+
+We cannot recall passwords the way we are expected to when there are too many.
+
+
+
+## Coping
+
+Life gives us no advice on how to deal with this problem.  So we find our own ways:
+
+ - We use a single personal secret for all our websites, thereby violating the secrecy of these passwords (eg. you've given your email secret to twitter).
+ - We use simple variations of a personal secret or pattern, thereby trivializing the complexity of these passwords (eg. google98, twitter98; reversals, eg. 8991elgoog)
+ - We use external means of remembering passwords, thereby increasing the risk of loss (both loss of access when we lose the tool and theft when a thief finds our tool)
+
+These coping mechanisms come in various forms, and they all have down-sides, because at the root of each of these lies an undeniable truth:
+
+Our passwords are no longer true to the original definition.
+
+
+
+## Master Password's approach
+
+The theory behind Master Password starts with accepting that it is impossible to keep track of passwords for all your accounts.  Instead, we return to the core premise of the password: a secret phrase that you can remember easily, all by yourself.
+
+Master Password solves this problem by letting you remember one and only one password.  You use this password with Master Password only.  Master Password then gives you access to any website or service you want by creating a website-specific key for it.
+
+1. You sign into Master Password using your one password.
+2. You ask Master Password for the key to enter your website, eg. twitter.
+3. You log into twitter using your username and the key from Master Password.
+
+Master Password is *not* a password manager.  It does not store your website passwords.  Therefore, there is zero risk of you losing your website passwords (or them falling in the wrong hands).  Master Password simply uses your one password and the name of the site to generate a site-specific secret.
+
+
+
+## Benefits
+
+ - You don't need to come up with a secure password every time you make a new account - Master Password gives you the key for it.
+ - You don't need to try to remember a password you created two years ago for that one account - Master Password just gives you the key for it.
+ - You don't need to that you can't get into that account you made at work when you come home because you don't have your work passwords with you - Master Password is always available.
+ - You don't need to try to keep password lists in sync or stored somewhere easily accessible - Master Password is always available.
+ - You don't need to worry what you'll do if your computer dies or you need to log into your bank while you're in the airport transit zone - Master Password is always available.
+ - You don't need to worry about your password manager website getting hacked, your phone getting duplicated, somebody taking a picture of your passwords book - Master Password keeps no records.
+
+
+
+## How does it work?
+
+The details of how Master Password works [are available here](http://masterpasswordapp.com/algorithm.html).
+
+In short:
+
+    master-key = SCRYPT( user-name, master-password )
+    site-key = HMAC-SHA-256( site-name . site-counter, master-key )
+    site-password = PW-TEMPLATE( site-key, site-template )
+
+Master Password can derive the `site-password` in an entirely stateless manner.  It is therefore better defined as a calculator than a manager.  It is the user's responsibility to remember the inputs: `user-name`, `master-password`, `site-name`, `site-counter` and `site-template`.
+
+We standardize `user-name` as your full name, `site-name` as the domain name of the site, `site-counter` to `1` (unless you explicitly increment it) and `site-template` to `Long Password`; as a result the only token the user really needs to remember actively is `master-password`.
+
+
+
+
+# Source Code
+
+Master Password's algorithm is [documented](http://masterpasswordapp.com/algorithm.html) and its implementation is Free Software (GPLv3).
+
+
+
+## Components
+
+There are several components available here.  As an end-user, you can currently use the iOS app, the Android app, the OS X app, the Java desktop app, the C CLI app or the Java CLI app.  There are also several components that are useful for developers:
+
+ - `core/c`: This is the reference implementation of the Master Password algorithm, written in C.
+ - `core/java/algorithm`: This is a Java implementation of the Master Password algorithm.
+ - `core/java/model`: This is an object model to simplify use of Master Password by Java applications.
+ - `core/java/tests`: These are Java integration tests designed to ensure Master Password performs as expected.
+ - `platform-android`: This is the official Android implementation of Master Password in Java.
+ - `platform-darwin`: This is the official iOS and OS X implementation of Master Password in Objective-C.
+ - `platform-independent/cli-c`: This is the platform-independent console implementation of Master Password, written in C.
+ - `platform-independent/cli-java`: This is the platform-independent console implementation of Master Password, written in Java.
+ - `platform-independent/gui-java`: This is the platform-independent desktop implementation of Master Password, written in Java.
+ - `platform-independent/web-js`: This is the platform-independent browser application for Master Password, written in JavaScript.
+
+
+
+## Building and running
+
+
+### macOS or iOS
+
+Make sure you have all relevant submodules checked out.
+
+Go into `platform-darwin` and open `MasterPassword.xcworkspace` in Xcode.  Select the desired target from the Scheme Selector and build, run or archive.
+
+
+### Web
+
+Make sure you have all relevant submodules checked out.
+
+Go into `platform-independent/web-js` and open `index.html` in your browser.  You should be able to run this locally, there is no need for hosting or an application server.
+
+
+### Java
+
+Go into the `gradle` directory and run `./gradlew build`.  All Java components will then be built:
+
+ - `platform-independent/gui-java/build/distributions`:
+   contains an archive with the Master Password Java GUI.  Unpack it and run the `gui` script.
+ - `platform-independent/cli-java/build/distributions`:
+   contains an archive with the Master Password Java command-line interface.  Unpack it and run the `cli` script.
+ - `platform-android/build/outputs/apk`:
+   contains the Android application package.  Install it on your Android device.
+
+
+### Native CLI
+
+Go into the `platform-independent/cli-c` directory and run `./build`.  The native command-line client will then be built.
+
+When the build completes, you will have an `mpw` binary you can use.  You can copy it into your `PATH` or use the `./install` script to help you do so.
+
+For example:
+
+    ./build && sudo ./install
+    mpw -h
+
+The build has a few dependencies you should have installed before running it:
+
+ - `mpw`: `openssl-dev`, `ncurses-dev` (if `mpw_color=1`)
+ - `mpw-bench`: `openssl-dev`
+ - `mpw-tests`: `openssl-dev`, `libxml2`
+
+There are a few different ways you can modify the build process:
+
+ - You can change the targets that should be built.  By default, all targets are built.  These are the available targets:
+    - `mpw`: This is the standard command-line `mpw` tool which implements all Master Password features.
+    - `mpw-tests`: This is a tool to perform the standard tests script on the `mpw` implementation.
+    - `mpw-bench`: This is a tool to run a benchmark on the `mpw` implementation, comparing it to the performance of other algorithms.
+ - You can specify custom arguments to the compiler, pass them as arguments to the build script.
+ - The build process involves some optionals, they can by toggled from their default setting by passing variables:
+    - `mpw_color`: [default: 1] Colorized Identicon, depends on 
+
+To change the targets to build, use:
+
+    targets='mpw mpw-bench' ./build
+
+To add a library search path, use:
+
+    ./build -L/usr/local/lib
+
+Change an optional feature:
+
+    mpw_color=0 ./build
+
+
+
+## Support
+
+Feel free to contribute by forking the project, reporting issues or joining the discussion on:
+
+ - [Gitter](https://gitter.im/lyndir/MasterPassword)
+ - #masterpassword (on chat.freenode.net)
+ - #masterpassword:lyndir.com (on Matrix)
+ - masterpassword@lyndir.com

core/c/mpw-algorithm.c

@@ -1,10 +1,20 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
 //
-//  mpw-algorithm.c
-//  MasterPassword
+// 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.
 //
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
 
 #include "mpw-algorithm.h"
 #include "mpw-algorithm_v0.c"

core/c/mpw-algorithm.h

@@ -1,10 +1,20 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
 //
-//  mpw-algorithm.h
-//  MasterPassword
+// 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.
 //
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
 
 // NOTE: mpw is currently NOT thread-safe.
 #include "mpw-types.h"

core/c/mpw-algorithm_v0.c

@@ -1,10 +1,20 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
 //
-//  mpw-algorithm.c
-//  MasterPassword
+// 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.
 //
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
 
 #include <string.h>
 #include <errno.h>

core/c/mpw-algorithm_v1.c

@@ -1,10 +1,20 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
 //
-//  mpw-algorithm.c
-//  MasterPassword
+// 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.
 //
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
 
 #include <string.h>
 #include <errno.h>

core/c/mpw-algorithm_v2.c

@@ -1,10 +1,20 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
 //
-//  mpw-algorithm.c
-//  MasterPassword
+// 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.
 //
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
 
 #include <string.h>
 #include <errno.h>

core/c/mpw-algorithm_v3.c

@@ -1,10 +1,20 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
 //
-//  mpw-algorithm.c
-//  MasterPassword
+// 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.
 //
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
 
 #include <string.h>
 #include <errno.h>

core/c/mpw-types.c

@@ -1,10 +1,20 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
 //
-//  mpw-types.c
-//  MasterPassword
+// 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.
 //
-//  Created by Maarten Billemont on 2012-02-01.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
 
 #include <stdlib.h>
 #include <stdio.h>

core/c/mpw-types.h

@@ -1,10 +1,20 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
 //
-//  mpw-types.h
-//  MasterPassword
+// 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.
 //
-//  Created by Maarten Billemont on 2012-02-01.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
 
 #ifndef _MPW_TYPES_H
 #define _MPW_TYPES_H
@@ -22,11 +32,11 @@
 //// Types.
 
 typedef enum( unsigned int, MPSiteVariant ) {
-    /** Generate the password to log in with. */
+    /** Generate a key for authentication. */
             MPSiteVariantPassword,
-    /** Generate the login name to log in as. */
+    /** Generate a name for identification. */
             MPSiteVariantLogin,
-    /** Generate the answer to a security question. */
+    /** Generate an answer to a security question. */
             MPSiteVariantAnswer,
 };
 

core/c/mpw-util.c

@@ -1,10 +1,20 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
 //
-//  mpw-util.c
-//  MasterPassword
+// 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.
 //
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
 
 #include <stdio.h>
 #include <stdlib.h>

core/c/mpw-util.h

@@ -1,10 +1,20 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
 //
-//  mpw-util.h
-//  MasterPassword
+// 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.
 //
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
 
 #include <stdio.h>
 #include <stdint.h>

core/java/algorithm/build.gradle

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

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

@@ -1,3 +1,21 @@
+//==============================================================================
+// 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;
@@ -10,7 +28,7 @@ import java.nio.charset.Charset;
 /**
  * @author lhunath, 2016-10-29
  */
-public class MPConstant {
+public final class MPConstant {
 
     /* Environment */
 
@@ -58,17 +76,24 @@ public class MPConstant {
     /**
      * mpw: Input character encoding.
      */
-    public static final Charset                      mpw_charset   = Charsets.UTF_8;
+    public static final Charset                      mpw_charset         = Charsets.UTF_8;
     /**
      * mpw: Platform-agnostic byte order.
      */
-    public static final ByteOrder                    mpw_byteOrder = ByteOrder.BIG_ENDIAN;
+    public static final ByteOrder                    mpw_byteOrder       = ByteOrder.BIG_ENDIAN;
     /**
      * mpw: Site digest.
      */
-    public static final MessageAuthenticationDigests mpw_digest    = MessageAuthenticationDigests.HmacSHA256;
+    public static final MessageAuthenticationDigests mpw_digest          = MessageAuthenticationDigests.HmacSHA256;
     /**
      * mpw: Key ID hash.
      */
-    public static final MessageDigests               mpw_hash      = MessageDigests.SHA256;
+    public static final MessageDigests               mpw_hash            = MessageDigests.SHA256;
+    /**
+     * mpw: validity for the time-based rolling counter.
+     */
+    public static final int                          mpw_counter_timeout = 5 * 60 /* s */;
+
+
+    public static final int MS_PER_S = 1000;
 }

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

@@ -1,3 +1,21 @@
+//==============================================================================
+// 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.*;
@@ -19,12 +37,12 @@ public class MPIdenticon {
     private static final Logger logger = Logger.get( MPIdenticon.class );
 
     private static final Charset charset   = Charsets.UTF_8;
-    private static final Color[] colors    = new Color[]{
+    private static final Color[] colors    = {
             Color.RED, Color.GREEN, Color.YELLOW, Color.BLUE, Color.MAGENTA, Color.CYAN, Color.MONO };
-    private static final char[]  leftArm   = new char[]{ '╔', '╚', '╰', '═' };
-    private static final char[]  rightArm  = new char[]{ '╗', '╝', '╯', '═' };
-    private static final char[]  body      = new char[]{ '█', '░', '▒', '▓', '☺', '☻' };
-    private static final char[]  accessory = new char[]{
+    private static final char[]  leftArm   = { '╔', '╚', '╰', '═' };
+    private static final char[]  rightArm  = { '╗', '╝', '╯', '═' };
+    private static final char[]  body      = { '█', '░', '▒', '▓', '☺', '☻' };
+    private static final char[]  accessory = {
             '◈', '◎', '◐', '◑', '◒', '◓', '☀', '☁', '☂', '☃', '☄', '★', '☆', '☎', '☏', '⎈', '⌂', '☘', '☢', '☣', '☕', '⌚', '⌛', '⏰', '⚡',
             '⛄', '⛅', '☔', '♔', '♕', '♖', '♗', '♘', '♙', '♚', '♛', '♜', '♝', '♞', '♟', '♨', '♩', '♪', '♫', '⚐', '⚑', '⚔', '⚖', '⚙', '⚠',
             '⌘', '⏎', '✄', '✆', '✈', '✉', '✌' };
@@ -33,11 +51,12 @@ public class MPIdenticon {
     private final Color  color;
     private final String text;
 
-    public MPIdenticon(String fullName, String masterPassword) {
+    public MPIdenticon(final String fullName, final String masterPassword) {
         this( fullName, masterPassword.toCharArray() );
     }
 
-    public MPIdenticon(String fullName, char[] masterPassword) {
+    @SuppressWarnings("MethodCanBeVariableArityMethod")
+    public MPIdenticon(final String fullName, final char[] masterPassword) {
         this.fullName = fullName;
 
         byte[] masterPasswordBytes = charset.encode( CharBuffer.wrap( masterPassword ) ).array();

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

@@ -0,0 +1,47 @@
+//==============================================================================
+// 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;
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public enum MPSiteFeature {
+
+    /**
+     * Export the key-protected content data.
+     */
+    ExportContent( 1 << 10 ),
+
+    /**
+     * Never export content.
+     */
+    DevicePrivate( 1 << 11 );
+
+    MPSiteFeature(final int mask) {
+        this.mask = mask;
+    }
+
+    private final int mask;
+
+    public int getMask() {
+        return mask;
+    }
+}

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

@@ -1,12 +1,30 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
 package com.lyndir.masterpassword;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.lyndir.lhunath.opal.system.logging.Logger;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import javax.annotation.Nullable;
 import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NonNls;
 
 
 /**
@@ -17,12 +35,12 @@ import org.jetbrains.annotations.Contract;
 public enum MPSiteType {
 
     GeneratedMaximum( "Max", "20 characters, contains symbols.", //
-                      ImmutableList.of( "x", "max", "maximum" ), //
+                      ImmutableList.of( "x", "max", "maximum" ), // NON-NLS
                       ImmutableList.of( new MPTemplate( "anoxxxxxxxxxxxxxxxxx" ), new MPTemplate( "axxxxxxxxxxxxxxxxxno" ) ), //
                       MPSiteTypeClass.Generated, 0x0 ),
 
     GeneratedLong( "Long", "Copy-friendly, 14 characters, contains symbols.", //
-                   ImmutableList.of( "l", "long" ),  //
+                   ImmutableList.of( "l", "long" ), // NON-NLS
                    ImmutableList.of( new MPTemplate( "CvcvnoCvcvCvcv" ), new MPTemplate( "CvcvCvcvnoCvcv" ),
                                      new MPTemplate( "CvcvCvcvCvcvno" ), new MPTemplate( "CvccnoCvcvCvcv" ),
                                      new MPTemplate( "CvccCvcvnoCvcv" ), new MPTemplate( "CvccCvcvCvcvno" ),
@@ -37,43 +55,43 @@ public enum MPSiteType {
                    MPSiteTypeClass.Generated, 0x1 ),
 
     GeneratedMedium( "Medium", "Copy-friendly, 8 characters, contains symbols.", //
-                     ImmutableList.of( "m", "med", "medium" ), //
+                     ImmutableList.of( "m", "med", "medium" ), // NON-NLS
                      ImmutableList.of( new MPTemplate( "CvcnoCvc" ), new MPTemplate( "CvcCvcno" ) ), //
                      MPSiteTypeClass.Generated, 0x2 ),
 
     GeneratedBasic( "Basic", "8 characters, no symbols.", //
-                    ImmutableList.of( "b", "basic" ), //
+                    ImmutableList.of( "b", "basic" ), // NON-NLS
                     ImmutableList.of( new MPTemplate( "aaanaaan" ), new MPTemplate( "aannaaan" ), new MPTemplate( "aaannaaa" ) ), //
                     MPSiteTypeClass.Generated, 0x3 ),
 
     GeneratedShort( "Short", "Copy-friendly, 4 characters, no symbols.", //
-                    ImmutableList.of( "s", "short" ), //
+                    ImmutableList.of( "s", "short" ), // NON-NLS
                     ImmutableList.of( new MPTemplate( "Cvcn" ) ), //
                     MPSiteTypeClass.Generated, 0x4 ),
 
     GeneratedPIN( "PIN", "4 numbers.", //
-                  ImmutableList.of( "i", "pin" ), //
+                  ImmutableList.of( "i", "pin" ), // NON-NLS
                   ImmutableList.of( new MPTemplate( "nnnn" ) ), //
                   MPSiteTypeClass.Generated, 0x5 ),
 
     GeneratedName( "Name", "9 letter name.", //
-                   ImmutableList.of( "n", "name" ), //
+                   ImmutableList.of( "n", "name" ), // NON-NLS
                    ImmutableList.of( new MPTemplate( "cvccvcvcv" ) ), //
                    MPSiteTypeClass.Generated, 0xE ),
 
     GeneratedPhrase( "Phrase", "20 character sentence.", //
-                     ImmutableList.of( "p", "phrase" ), //
+                     ImmutableList.of( "p", "phrase" ), // NON-NLS
                      ImmutableList.of( new MPTemplate( "cvcc cvc cvccvcv cvc" ), new MPTemplate( "cvc cvccvcvcv cvcv" ),
                                        new MPTemplate( "cv cvccv cvc cvcvccv" ) ), //
                      MPSiteTypeClass.Generated, 0xF ),
 
     StoredPersonal( "Personal", "AES-encrypted, exportable.", //
-                    ImmutableList.of( "personal" ), //
+                    ImmutableList.of( "personal" ), // NON-NLS
                     ImmutableList.<MPTemplate>of(), //
                     MPSiteTypeClass.Stored, 0x0, MPSiteFeature.ExportContent ),
 
     StoredDevicePrivate( "Device", "AES-encrypted, not exported.", //
-                         ImmutableList.of( "device" ), //
+                         ImmutableList.of( "device" ), // NON-NLS
                          ImmutableList.<MPTemplate>of(), //
                          MPSiteTypeClass.Stored, 0x1, MPSiteFeature.DevicePrivate );
 
@@ -129,7 +147,7 @@ public enum MPSiteType {
 
     public int getType() {
         int mask = typeIndex | typeClass.getMask();
-        for (MPSiteFeature typeFeature : typeFeatures)
+        for (final MPSiteFeature typeFeature : typeFeatures)
             mask |= typeFeature.getMask();
 
         return mask;
@@ -143,7 +161,7 @@ public enum MPSiteType {
     public static MPSiteType forOption(final String option) {
 
         for (final MPSiteType type : values())
-            if (type.getOptions().contains( option.toLowerCase() ))
+            if (type.getOptions().contains( option.toLowerCase( Locale.ROOT ) ))
                 return type;
 
         throw logger.bug( "No type for option: %s", option );
@@ -154,7 +172,7 @@ public enum MPSiteType {
      *
      * @return The type registered with the given name.
      */
-    @Contract("!null -> !null, null -> null")
+    @Contract("!null -> !null")
     public static MPSiteType forName(@Nullable final String name) {
 
         if (name == null)
@@ -189,7 +207,7 @@ public enum MPSiteType {
      */
     public static MPSiteType forType(final int type) {
 
-        for (MPSiteType siteType : values())
+        for (final MPSiteType siteType : values())
             if (siteType.getType() == type)
                 return siteType;
 
@@ -205,7 +223,7 @@ public enum MPSiteType {
 
         int typeMask = mask & ~0xF;
         ImmutableList.Builder<MPSiteType> types = ImmutableList.builder();
-        for (MPSiteType siteType : values())
+        for (final MPSiteType siteType : values())
             if (((siteType.getType() & ~0xF) & typeMask) != 0)
                 types.add( siteType );
 

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

@@ -0,0 +1,39 @@
+//==============================================================================
+// 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;
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public enum MPSiteTypeClass {
+    Generated( 1 << 4 ),
+    Stored( 1 << 5 );
+
+    private final int mask;
+
+    MPSiteTypeClass(final int mask) {
+        this.mask = mask;
+    }
+
+    public int getMask() {
+        return mask;
+    }
+}

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

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

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

@@ -0,0 +1,70 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
+package com.lyndir.masterpassword;
+
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
+
+import com.google.common.collect.ImmutableList;
+import com.lyndir.lhunath.opal.system.util.MetaObject;
+import java.io.Serializable;
+import java.util.List;
+import org.jetbrains.annotations.NonNls;
+
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public class MPTemplate extends MetaObject implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final String templateString;
+    private final List<MPTemplateCharacterClass> template;
+
+    MPTemplate(@NonNls final String templateString) {
+
+        ImmutableList.Builder<MPTemplateCharacterClass> builder = ImmutableList.builder();
+        for (int i = 0; i < templateString.length(); ++i)
+            builder.add( MPTemplateCharacterClass.forIdentifier( templateString.charAt( i ) ) );
+
+        this.templateString = templateString;
+        template = builder.build();
+    }
+
+    public String getTemplateString() {
+        return templateString;
+    }
+
+    public MPTemplateCharacterClass getCharacterClassAtIndex(final int index) {
+
+        return template.get( index );
+    }
+
+    public int length() {
+
+        return template.size();
+    }
+
+    @Override
+    public String toString() {
+        return strf( "{MPTemplate: %s}", templateString );
+    }
+}

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

@@ -1,6 +1,25 @@
+//==============================================================================
+// 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.lyndir.lhunath.opal.system.logging.Logger;
+import org.jetbrains.annotations.NonNls;
 
 
 /**
@@ -27,7 +46,7 @@ public enum MPTemplateCharacterClass {
     private final char   identifier;
     private final char[] characters;
 
-    MPTemplateCharacterClass(final char identifier, final String characters) {
+    MPTemplateCharacterClass(final char identifier, @NonNls final String characters) {
 
         this.identifier = identifier;
         this.characters = characters.toCharArray();
@@ -44,7 +63,7 @@ public enum MPTemplateCharacterClass {
     }
 
     public static MPTemplateCharacterClass forIdentifier(final char identifier) {
-        for (MPTemplateCharacterClass characterClass : values())
+        for (final MPTemplateCharacterClass characterClass : values())
             if (characterClass.getIdentifier() == identifier)
                 return characterClass;
 

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

@@ -1,5 +1,25 @@
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
+//
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+
 package com.lyndir.masterpassword;
 
+import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
+
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.UnsignedInteger;
 import com.lyndir.lhunath.opal.system.*;
@@ -7,7 +27,6 @@ import com.lyndir.lhunath.opal.system.logging.Logger;
 import java.util.Arrays;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.jetbrains.annotations.NotNull;
 
 
 /**
@@ -26,13 +45,15 @@ public abstract class MasterKey {
     @Nullable
     private byte[] masterKey;
 
+    @SuppressWarnings("MethodCanBeVariableArityMethod")
     public static MasterKey create(final String fullName, final char[] masterPassword) {
 
         return create( Version.CURRENT, fullName, masterPassword );
     }
 
     @Nonnull
-    public static MasterKey create(Version version, final String fullName, final char[] masterPassword) {
+    @SuppressWarnings("MethodCanBeVariableArityMethod")
+    public static MasterKey create(final Version version, final String fullName, final char[] masterPassword) {
 
         switch (version) {
             case V0:
@@ -45,7 +66,7 @@ public abstract class MasterKey {
                 return new MasterKeyV3( fullName ).revalidate( masterPassword );
         }
 
-        throw new UnsupportedOperationException( "Unsupported version: " + version );
+        throw new UnsupportedOperationException( strf( "Unsupported version: %s", version ) );
     }
 
     public static boolean isAllowNativeByDefault() {
@@ -65,18 +86,19 @@ public abstract class MasterKey {
         allowNativeByDefault = allowNative;
     }
 
-    protected MasterKey(@NotNull final String fullName) {
+    protected MasterKey(@Nonnull final String fullName) {
 
         this.fullName = fullName;
         logger.trc( "fullName: %s", fullName );
     }
 
     @Nullable
-    protected abstract byte[] deriveKey(final char[] masterPassword);
+    @SuppressWarnings("MethodCanBeVariableArityMethod")
+    protected abstract byte[] deriveKey(char[] masterPassword);
 
     public abstract Version getAlgorithmVersion();
 
-    @NotNull
+    @Nonnull
     public String getFullName() {
 
         return fullName;
@@ -103,8 +125,8 @@ public abstract class MasterKey {
         return idForBytes( getKey() );
     }
 
-    public abstract String encode(@Nonnull final String siteName, final MPSiteType siteType, @Nonnull final UnsignedInteger siteCounter,
-                                  final MPSiteVariant siteVariant, @Nullable final String siteContext);
+    public abstract String encode(@Nonnull String siteName, MPSiteType siteType, @Nonnull UnsignedInteger siteCounter,
+                                  MPSiteVariant siteVariant, @Nullable String siteContext);
 
     public boolean isValid() {
         return masterKey != null;
@@ -118,6 +140,7 @@ public abstract class MasterKey {
         }
     }
 
+    @SuppressWarnings("MethodCanBeVariableArityMethod")
     public MasterKey revalidate(final char[] masterPassword) {
         invalidate();
 
@@ -127,19 +150,19 @@ public abstract class MasterKey {
         masterKey = deriveKey( masterPassword );
 
         if (masterKey == null)
-            logger.dbg( "masterKey calculation failed after %.2fs.", (System.currentTimeMillis() - start) / 1000D );
+            logger.dbg( "masterKey calculation failed after %.2fs.", (double)(System.currentTimeMillis() - start) / MPConstant.MS_PER_S );
         else
             logger.trc( "masterKey ID: %s (derived in %.2fs)", CodeUtils.encodeHex( idForBytes( masterKey ) ),
-                        (System.currentTimeMillis() - start) / 1000D );
+                        (double)(System.currentTimeMillis() - start) / MPConstant.MS_PER_S );
 
         return this;
     }
 
-    protected abstract byte[] bytesForInt(final int number);
+    protected abstract byte[] bytesForInt(int number);
 
-    protected abstract byte[] bytesForInt(@Nonnull final UnsignedInteger number);
+    protected abstract byte[] bytesForInt(@Nonnull UnsignedInteger number);
 
-    protected abstract byte[] idForBytes(final byte[] bytes);
+    protected abstract byte[] idForBytes(byte[] bytes);
 
     public enum Version {
         /**
@@ -190,7 +213,7 @@ public abstract class MasterKey {
                     return "2.2";
             }
 
-            throw new UnsupportedOperationException( "Unsupported version: " + this );
+            throw new UnsupportedOperationException( strf( "Unsupported version: %s", this ) );
         }
     }
 }

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

@@ -1,3 +1,21 @@
+//==============================================================================
+// 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;
@@ -58,6 +76,7 @@ public class MasterKeyV0 extends MasterKey {
         return scrypt( masterKeySalt, mpBytes );
     }
 
+    @Nullable
     protected byte[] scrypt(final byte[] masterKeySalt, final byte[] mpBytes) {
         try {
             if (isAllowNative())
@@ -65,7 +84,7 @@ public class MasterKeyV0 extends MasterKey {
             else
                 return SCrypt.scryptJ( mpBytes, masterKeySalt, MPConstant.scrypt_N, MPConstant.scrypt_r, MPConstant.scrypt_p, MPConstant.mpw_dkLen );
         }
-        catch (GeneralSecurityException e) {
+        catch (final GeneralSecurityException e) {
             logger.bug( e );
             return null;
         }
@@ -86,18 +105,18 @@ public class MasterKeyV0 extends MasterKey {
         logger.trc( "siteType: %d (%s)", siteType.ordinal(), siteType );
 
         if (siteCounter.longValue() == 0)
-            siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (300 * 1000)) * 300 );
+            siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (MPConstant.mpw_counter_timeout * 1000)) * MPConstant.mpw_counter_timeout );
 
         String siteScope = siteVariant.getScope();
         byte[] siteNameBytes = siteName.getBytes( MPConstant.mpw_charset );
         byte[] siteNameLengthBytes = bytesForInt( siteName.length() );
         byte[] siteCounterBytes = bytesForInt( siteCounter );
-        byte[] siteContextBytes = siteContext == null || siteContext.isEmpty()? null: siteContext.getBytes( MPConstant.mpw_charset );
-        byte[] siteContextLengthBytes = bytesForInt( siteContextBytes == null? 0: siteContextBytes.length );
-        logger.trc( "site scope: %s, context: %s", siteScope, siteContextBytes == null? "<empty>": siteContext );
+        byte[] siteContextBytes = ((siteContext == null) || siteContext.isEmpty())? null: siteContext.getBytes( MPConstant.mpw_charset );
+        byte[] siteContextLengthBytes = bytesForInt( (siteContextBytes == null)? 0: siteContextBytes.length );
+        logger.trc( "site scope: %s, context: %s", siteScope, (siteContextBytes == null)? "<empty>": siteContext );
         logger.trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)", siteScope, CodeUtils.encodeHex( siteNameLengthBytes ),
                     siteName, CodeUtils.encodeHex( siteCounterBytes ), CodeUtils.encodeHex( siteContextLengthBytes ),
-                    siteContextBytes == null? "(null)": siteContext );
+                    (siteContextBytes == null)? "(null)": siteContext );
 
         byte[] sitePasswordInfo = Bytes.concat( siteScope.getBytes( MPConstant.mpw_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes );
         if (siteContextBytes != null)
@@ -108,7 +127,7 @@ public class MasterKeyV0 extends MasterKey {
         int[] sitePasswordSeed = new int[sitePasswordSeedBytes.length];
         for (int i = 0; i < sitePasswordSeedBytes.length; ++i) {
             ByteBuffer buf = ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( ByteOrder.BIG_ENDIAN );
-            Arrays.fill( buf.array(), sitePasswordSeedBytes[i] > 0? (byte) 0x00: (byte) 0xFF );
+            Arrays.fill( buf.array(), (byte) ((sitePasswordSeedBytes[i] > 0)? 0x00: 0xFF) );
             buf.position( 2 );
             buf.put( sitePasswordSeedBytes[i] ).rewind();
             sitePasswordSeed[i] = buf.getInt() & 0xFFFF;