The root of the users VC interferes with touches from the sites VC when it appears.

[ADDED]     Calculate cost for cracking a password.
[UPDATED]   Hardware cost data based on various GPUs with updated hashcat metrics.
[ADDED]     Ability to calculate the strength of an arbitrary password.

.dockerignore

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

.gitignore

@@ -1,42 +1,29 @@
 # OS-Specific junk.
 .DS_Store
 Thumbs.db
+*~
 
 # IntelliJ
-/MasterPassword/Java/.idea
-/.idea/*
-!/.idea/encodings.xml
-!/.idea/inspectionProfiles
-!/.idea/projectCodeStyle.xml
-!/.idea/validation.xml
+.idea
 *.iml
-/*.ipr
-/*.iws
+*.ipr
+*.iws
+out
 
 # Xcode IDE
 xcuserdata/
-/DerivedData/
+DerivedData/
 
 # Generated
-MasterPassword/Resources/Media/Images.xcassets/
+/platform-darwin/Resources/Media/Images.xcassets/
+/platform-darwin/Podfile.lock
+/platform-darwin/Pods/
 
-# Media
-Press/Background.png
-Press/Front-Page.png
-Press/MasterPassword_PressKit/MasterPassword_pressrelease_*.pdf
+# Gradle
+build
+.gradle
+local.properties
+/builds
+/platform-android/.externalNativeBuild
+.cxx
 
-# IPA
-/sendipa/*
-!/sendipa/sendipa.conf
-
-# 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

.gitlab-ci.yml

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

.gitmodules

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

.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>

.idea/projectCodeStyle.xml

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

.travis.yml

@@ -1,8 +0,0 @@
-language: objective-c
-osx_image: xcode7
-xcode_scheme: MasterPassword iOS (App Store)
-xcode_workspace: MasterPassword.xcworkspace
-xcode_sdk: iphonesimulator
-env: TERM=dumb
-git:
-  submodules: true

Brewfile

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

Dockerfile

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

External/AttributedMarkdown

@@ -1 +0,0 @@
-Subproject commit d598fb4f5e29f5aaa66e7e880a9857019865881b

External/InAppSettingsKit

@@ -1 +0,0 @@
-Subproject commit b58b72563acecb727da1f7ca151798a911229593

External/KCOrderedAccessorFix

@@ -1 +0,0 @@
-Subproject commit 1b8f8b79ad12b70976c7a417ff1a9d29e8c0ed73

External/Mac/Crashlytics.framework/Crashlytics

@@ -1 +0,0 @@
-Versions/Current/Crashlytics

External/Mac/Crashlytics.framework/Headers

@@ -1 +0,0 @@
-Versions/Current/Headers

External/Mac/Crashlytics.framework/Modules

@@ -1 +0,0 @@
-Versions/Current/Modules

External/Mac/Crashlytics.framework/Resources

@@ -1 +0,0 @@
-Versions/Current/Resources

External/Mac/Crashlytics.framework/Versions/A/Headers/ANSCompatibility.h

@@ -1,31 +0,0 @@
-//
-//  ANSCompatibility.h
-//  AnswersKit
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#pragma once
-
-#if !__has_feature(nullability)
-#define nonnull
-#define nullable
-#define _Nullable
-#define _Nonnull
-#endif
-
-#ifndef NS_ASSUME_NONNULL_BEGIN
-#define NS_ASSUME_NONNULL_BEGIN
-#endif
-
-#ifndef NS_ASSUME_NONNULL_END
-#define NS_ASSUME_NONNULL_END
-#endif
-
-#if __has_feature(objc_generics)
-#define ANS_GENERIC_NSARRAY(type) NSArray<type>
-#define ANS_GENERIC_NSDICTIONARY(key_type,object_key) NSDictionary<key_type, object_key>
-#else
-#define ANS_GENERIC_NSARRAY(type) NSArray
-#define ANS_GENERIC_NSDICTIONARY(key_type,object_key) NSDictionary
-#endif

External/Mac/Crashlytics.framework/Versions/A/Headers/Answers.h

@@ -1,210 +0,0 @@
-//
-//  Answers.h
-//  Crashlytics
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "ANSCompatibility.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- *  This class exposes the Answers Events API, allowing you to track key 
- *  user user actions and metrics in your app.
- */
-@interface Answers : NSObject
-
-/**
- *  Log a Sign Up event to see users signing up for your app in real-time, understand how
- *  many users are signing up with different methods and their success rate signing up.
- *
- *  @param signUpMethodOrNil     The method by which a user logged in, e.g. Twitter or Digits.
- *  @param signUpSucceededOrNil  The ultimate success or failure of the login
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
- */
-+ (void)logSignUpWithMethod:(nullable NSString *)signUpMethodOrNil
-                    success:(nullable NSNumber *)signUpSucceededOrNil
-           customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log an Log In event to see users logging into your app in real-time, understand how many
- *  users are logging in with different methods and their success rate logging into your app.
- *
- *  @param loginMethodOrNil      The method by which a user logged in, e.g. email, Twitter or Digits.
- *  @param loginSucceededOrNil   The ultimate success or failure of the login
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
- */
-+ (void)logLoginWithMethod:(nullable NSString *)loginMethodOrNil
-                   success:(nullable NSNumber *)loginSucceededOrNil
-          customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Share event to see users sharing from your app in real-time, letting you
- *  understand what content they're sharing from the type or genre down to the specific id.
- *
- *  @param shareMethodOrNil      The method by which a user shared, e.g. email, Twitter, SMS.
- *  @param contentNameOrNil      The human readable name for this piece of content.
- *  @param contentTypeOrNil      The type of content shared.
- *  @param contentIdOrNil        The unique identifier for this piece of content. Useful for finding the top shared item.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
- */
-+ (void)logShareWithMethod:(nullable NSString *)shareMethodOrNil
-               contentName:(nullable NSString *)contentNameOrNil
-               contentType:(nullable NSString *)contentTypeOrNil
-                 contentId:(nullable NSString *)contentIdOrNil
-          customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log an Invite Event to track how users are inviting other users into
- *  your application.
- *
- *  @param inviteMethodOrNil     The method of invitation, e.g. GameCenter, Twitter, email.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
- */
-+ (void)logInviteWithMethod:(nullable NSString *)inviteMethodOrNil
-           customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Purchase event to see your revenue in real-time, understand how many users are making purchases, see which
- *  items are most popular, and track plenty of other important purchase-related metrics.
- *
- *  @param itemPriceOrNil         The purchased item's price.
- *  @param currencyOrNil          The ISO4217 currency code. Example: USD
- *  @param purchaseSucceededOrNil Was the purchase succesful or unsuccesful
- *  @param itemNameOrNil          The human-readable form of the item's name. Example:
- *  @param itemTypeOrNil          The type, or genre of the item. Example: Song
- *  @param itemIdOrNil            The machine-readable, unique item identifier Example: SKU
- *  @param customAttributesOrNil  A dictionary of custom attributes to associate with this purchase.
- */
-+ (void)logPurchaseWithPrice:(nullable NSDecimalNumber *)itemPriceOrNil
-                    currency:(nullable NSString *)currencyOrNil
-                     success:(nullable NSNumber *)purchaseSucceededOrNil
-                    itemName:(nullable NSString *)itemNameOrNil
-                    itemType:(nullable NSString *)itemTypeOrNil
-                      itemId:(nullable NSString *)itemIdOrNil
-            customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Level Start Event to track where users are in your game.
- *
- *  @param levelNameOrNil        The level name
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this level start event.
- */
-+ (void)logLevelStart:(nullable NSString *)levelNameOrNil
-     customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Level End event to track how users are completing levels in your game.
- *
- *  @param levelNameOrNil                 The name of the level completed, E.G. "1" or "Training"
- *  @param scoreOrNil                     The score the user completed the level with.
- *  @param levelCompletedSuccesfullyOrNil A boolean representing whether or not the level was completed succesfully.
- *  @param customAttributesOrNil          A dictionary of custom attributes to associate with this event.
- */
-+ (void)logLevelEnd:(nullable NSString *)levelNameOrNil
-              score:(nullable NSNumber *)scoreOrNil
-            success:(nullable NSNumber *)levelCompletedSuccesfullyOrNil
-   customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log an Add to Cart event to see users adding items to a shopping cart in real-time, understand how
- *  many users start the purchase flow, see which items are most popular, and track plenty of other important
- *  purchase-related metrics.
- *
- *  @param itemPriceOrNil         The purchased item's price.
- *  @param currencyOrNil          The ISO4217 currency code. Example: USD
- *  @param itemNameOrNil          The human-readable form of the item's name. Example:
- *  @param itemTypeOrNil          The type, or genre of the item. Example: Song
- *  @param itemIdOrNil            The machine-readable, unique item identifier Example: SKU
- *  @param customAttributesOrNil  A dictionary of custom attributes to associate with this event.
- */
-+ (void)logAddToCartWithPrice:(nullable NSDecimalNumber *)itemPriceOrNil
-                     currency:(nullable NSString *)currencyOrNil
-                     itemName:(nullable NSString *)itemNameOrNil
-                     itemType:(nullable NSString *)itemTypeOrNil
-                       itemId:(nullable NSString *)itemIdOrNil
-             customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Start Checkout event to see users moving through the purchase funnel in real-time, understand how many
- *  users are doing this and how much they're spending per checkout, and see how it related to other important
- *  purchase-related metrics.
- *
- *  @param totalPriceOrNil        The total price of the cart.
- *  @param currencyOrNil          The ISO4217 currency code. Example: USD
- *  @param itemCountOrNil         The number of items in the cart.
- *  @param customAttributesOrNil  A dictionary of custom attributes to associate with this event.
- */
-+ (void)logStartCheckoutWithPrice:(nullable NSDecimalNumber *)totalPriceOrNil
-                         currency:(nullable NSString *)currencyOrNil
-                        itemCount:(nullable NSNumber *)itemCountOrNil
-                 customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Rating event to see users rating content within your app in real-time and understand what
- *  content is most engaging, from the type or genre down to the specific id.
- *
- *  @param ratingOrNil           The integer rating given by the user.
- *  @param contentNameOrNil      The human readable name for this piece of content.
- *  @param contentTypeOrNil      The type of content shared.
- *  @param contentIdOrNil        The unique identifier for this piece of content. Useful for finding the top shared item.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
- */
-+ (void)logRating:(nullable NSNumber *)ratingOrNil
-      contentName:(nullable NSString *)contentNameOrNil
-      contentType:(nullable NSString *)contentTypeOrNil
-        contentId:(nullable NSString *)contentIdOrNil
- customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Content View event to see users viewing content within your app in real-time and
- *  understand what content is most engaging, from the type or genre down to the specific id.
- *
- *  @param contentNameOrNil      The human readable name for this piece of content.
- *  @param contentTypeOrNil      The type of content shared.
- *  @param contentIdOrNil        The unique identifier for this piece of content. Useful for finding the top shared item.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
- */
-+ (void)logContentViewWithName:(nullable NSString *)contentNameOrNil
-                   contentType:(nullable NSString *)contentTypeOrNil
-                     contentId:(nullable NSString *)contentIdOrNil
-              customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Search event allows you to see users searching within your app in real-time and understand
- *  exactly what they're searching for.
- *
- *  @param queryOrNil            The user's query.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
- */
-+ (void)logSearchWithQuery:(nullable NSString *)queryOrNil
-          customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Custom Event to see user actions that are uniquely important for your app in real-time, to see how often
- *  they're performing these actions with breakdowns by different categories you add. Use a human-readable name for
- *  the name of the event, since this is how the event will appear in Answers.
- *
- *  @param eventName             The human-readable name for the event.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event. Attribute keys
- *                               must be <code>NSString</code> and and values must be <code>NSNumber</code> or <code>NSString</code>.
- *  @discussion                  How we treat <code>NSNumbers</code>:
- *                               We will provide information about the distribution of values over time.
- *
- *                               How we treat <code>NSStrings</code>:
- *                               NSStrings are used as categorical data, allowing comparison across different category values.
- *                               Strings are limited to a maximum length of 100 characters, attributes over this length will be
- *                               truncated.
- *
- *                               When tracking the Tweet views to better understand user engagement, sending the tweet's length
- *                               and the type of media present in the tweet allows you to track how tweet length and the type of media influence
- *                               engagement.
- */
-+ (void)logCustomEventWithName:(NSString *)eventName
-              customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-@end
-
-NS_ASSUME_NONNULL_END

External/Mac/Crashlytics.framework/Versions/A/Headers/CLSAttributes.h

@@ -1,33 +0,0 @@
-//
-//  CLSAttributes.h
-//  Crashlytics
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#pragma once
-
-#define CLS_DEPRECATED(x)  __attribute__ ((deprecated(x)))
-
-#if !__has_feature(nullability)
-    #define nonnull
-    #define nullable
-    #define _Nullable
-    #define _Nonnull
-#endif
-
-#ifndef NS_ASSUME_NONNULL_BEGIN
-    #define NS_ASSUME_NONNULL_BEGIN
-#endif
-
-#ifndef NS_ASSUME_NONNULL_END
-    #define NS_ASSUME_NONNULL_END
-#endif
-
-#if __has_feature(objc_generics)
-    #define CLS_GENERIC_NSARRAY(type) NSArray<type>
-    #define CLS_GENERIC_NSDICTIONARY(key_type,object_key) NSDictionary<key_type, object_key>
-#else
-    #define CLS_GENERIC_NSARRAY(type) NSArray
-    #define CLS_GENERIC_NSDICTIONARY(key_type,object_key) NSDictionary
-#endif

External/Mac/Crashlytics.framework/Versions/A/Headers/CLSLogging.h

@@ -1,64 +0,0 @@
-//
-//  CLSLogging.h
-//  Crashlytics
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-#ifdef __OBJC__
-#import "CLSAttributes.h"
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-#endif
-
-
-
-/**
- *
- * The CLS_LOG macro provides as easy way to gather more information in your log messages that are
- * sent with your crash data. CLS_LOG prepends your custom log message with the function name and
- * line number where the macro was used. If your app was built with the DEBUG preprocessor macro
- * defined CLS_LOG uses the CLSNSLog function which forwards your log message to NSLog and CLSLog.
- * If the DEBUG preprocessor macro is not defined CLS_LOG uses CLSLog only.
- *
- * Example output:
- * -[AppDelegate login:] line 134 $ login start
- *
- * If you would like to change this macro, create a new header file, unset our define and then define
- * your own version. Make sure this new header file is imported after the Crashlytics header file.
- *
- * #undef CLS_LOG
- * #define CLS_LOG(__FORMAT__, ...) CLSNSLog...
- *
- **/
-#ifdef __OBJC__
-#ifdef DEBUG
-#define CLS_LOG(__FORMAT__, ...) CLSNSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
-#else
-#define CLS_LOG(__FORMAT__, ...) CLSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
-#endif
-#endif
-
-/**
- *
- * Add logging that will be sent with your crash data. This logging will not show up in the system.log
- * and will only be visible in your Crashlytics dashboard.
- *
- **/
-
-#ifdef __OBJC__
-OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
-OBJC_EXTERN void CLSLogv(NSString *format, va_list ap) NS_FORMAT_FUNCTION(1,0);
-
-/**
- *
- * Add logging that will be sent with your crash data. This logging will show up in the system.log
- * and your Crashlytics dashboard. It is not recommended for Release builds.
- *
- **/
-OBJC_EXTERN void CLSNSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
-OBJC_EXTERN void CLSNSLogv(NSString *format, va_list ap) NS_FORMAT_FUNCTION(1,0);
-
-
-NS_ASSUME_NONNULL_END
-#endif

External/Mac/Crashlytics.framework/Versions/A/Headers/CLSReport.h

@@ -1,103 +0,0 @@
-//
-//  CLSReport.h
-//  Crashlytics
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "CLSAttributes.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * The CLSCrashReport protocol is deprecated. See the CLSReport class and the CrashyticsDelegate changes for details.
- **/
-@protocol CLSCrashReport <NSObject>
-
-@property (nonatomic, copy, readonly) NSString *identifier;
-@property (nonatomic, copy, readonly) NSDictionary *customKeys;
-@property (nonatomic, copy, readonly) NSString *bundleVersion;
-@property (nonatomic, copy, readonly) NSString *bundleShortVersionString;
-@property (nonatomic, copy, readonly) NSDate *crashedOnDate;
-@property (nonatomic, copy, readonly) NSString *OSVersion;
-@property (nonatomic, copy, readonly) NSString *OSBuildVersion;
-
-@end
-
-/**
- * The CLSReport exposes an interface to the phsyical report that Crashlytics has created. You can
- * use this class to get information about the event, and can also set some values after the
- * event has occured.
- **/
-@interface CLSReport : NSObject <CLSCrashReport>
-
-- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
-
-/**
- * Returns the session identifier for the report.
- **/
-@property (nonatomic, copy, readonly) NSString *identifier;
-
-/**
- * Returns the custom key value data for the report.
- **/
-@property (nonatomic, copy, readonly) NSDictionary *customKeys;
-
-/**
- * Returns the CFBundleVersion of the application that generated the report.
- **/
-@property (nonatomic, copy, readonly) NSString *bundleVersion;
-
-/**
- * Returns the CFBundleShortVersionString of the application that generated the report.
- **/
-@property (nonatomic, copy, readonly) NSString *bundleShortVersionString;
-
-/**
- * Returns the date that the report was created.
- **/
-@property (nonatomic, copy, readonly) NSDate *dateCreated;
-
-/**
- * Returns the os version that the application crashed on.
- **/
-@property (nonatomic, copy, readonly) NSString *OSVersion;
-
-/**
- * Returns the os build version that the application crashed on.
- **/
-@property (nonatomic, copy, readonly) NSString *OSBuildVersion;
-
-/**
- * Returns YES if the report contains any crash information, otherwise returns NO.
- **/
-@property (nonatomic, assign, readonly) BOOL isCrash;
-
-/**
- * You can use this method to set, after the event, additional custom keys. The rules
- * and semantics for this method are the same as those documented in Crashlytics.h. Be aware
- * that the maximum size and count of custom keys is still enforced, and you can overwrite keys
- * and/or cause excess keys to be deleted by using this method.
- **/
-- (void)setObjectValue:(nullable id)value forKey:(NSString *)key;
-
-/**
- * Record an application-specific user identifier. See Crashlytics.h for details.
- **/
-@property (nonatomic, copy, nullable) NSString * userIdentifier;
-
-/**
- * Record a user name. See Crashlytics.h for details.
- **/
-@property (nonatomic, copy, nullable) NSString * userName;
-
-/**
- * Record a user email. See Crashlytics.h for details.
- **/
-@property (nonatomic, copy, nullable) NSString * userEmail;
-
-@end
-
-NS_ASSUME_NONNULL_END

External/Mac/Crashlytics.framework/Versions/A/Headers/CLSStackFrame.h

@@ -1,37 +0,0 @@
-//
-//  CLSStackFrame.h
-//  Crashlytics
-//
-//  Copyright 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "CLSAttributes.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- *
- * This class is used in conjunction with -[Crashlytics recordCustomExceptionName:reason:frameArray:] to
- * record information about non-ObjC/C++ exceptions. All information included here will be displayed 
- * in the Crashlytics UI, and can influence crash grouping. Be particularly careful with the use of the 
- * address property. If set, Crashlytics will attempt symbolication and could overwrite other properities 
- * in the process.
- *
- **/
-@interface CLSStackFrame : NSObject
-
-+ (instancetype)stackFrame;
-+ (instancetype)stackFrameWithAddress:(NSUInteger)address;
-+ (instancetype)stackFrameWithSymbol:(NSString *)symbol;
-
-@property (nonatomic, copy, nullable) NSString *symbol;
-@property (nonatomic, copy, nullable) NSString *library;
-@property (nonatomic, copy, nullable) NSString *fileName;
-@property (nonatomic, assign) uint32_t lineNumber;
-@property (nonatomic, assign) uint64_t offset;
-@property (nonatomic, assign) uint64_t address;
-
-@end
-
-NS_ASSUME_NONNULL_END

External/Mac/Crashlytics.framework/Versions/A/Headers/Crashlytics.h

@@ -1,263 +0,0 @@
-//
-//  Crashlytics.h
-//  Crashlytics
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-#import "CLSAttributes.h"
-#import "CLSLogging.h"
-#import "CLSReport.h"
-#import "CLSStackFrame.h"
-#import "Answers.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol CrashlyticsDelegate;
-
-/**
- *  Crashlytics. Handles configuration and initialization of Crashlytics.
- */
-@interface Crashlytics : NSObject
-
-@property (nonatomic, readonly, copy) NSString *APIKey;
-@property (nonatomic, readonly, copy) NSString *version;
-@property (nonatomic, assign)         BOOL      debugMode;
-
-/**
- *
- * The delegate can be used to influence decisions on reporting and behavior, as well as reacting
- * to previous crashes.
- *
- * Make certain that the delegate is setup before starting Crashlytics with startWithAPIKey:... or
- * via +[Fabric with:...]. Failure to do will result in missing any delegate callbacks that occur
- * synchronously during start.
- *
- **/
-@property (nonatomic, assign, nullable) id <CrashlyticsDelegate> delegate;
-
-/**
- *  The recommended way to install Crashlytics into your application is to place a call to +startWithAPIKey: 
- *  in your -application:didFinishLaunchingWithOptions: or -applicationDidFinishLaunching:
- *  method.
- *
- *  Note: Starting with 3.0, the submission process has been significantly improved. The delay parameter
- *  is no longer required to throttle submissions on launch, performance will be great without it.
- *
- *  @param apiKey The Crashlytics API Key for this app
- *
- *  @return The singleton Crashlytics instance
- */
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey;
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey afterDelay:(NSTimeInterval)delay CLS_DEPRECATED("Crashlytics no longer needs or uses the delay parameter.  Please use +startWithAPIKey: instead.");
-
-/**
- *  If you need the functionality provided by the CrashlyticsDelegate protocol, you can use
- *  these convenience methods to activate the framework and set the delegate in one call.
- *  
- *  @param apiKey   The Crashlytics API Key for this app
- *  @param delegate A delegate object which conforms to CrashlyticsDelegate.
- *
- *  @return The singleton Crashlytics instance
- */
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(nullable id<CrashlyticsDelegate>)delegate;
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(nullable id<CrashlyticsDelegate>)delegate afterDelay:(NSTimeInterval)delay CLS_DEPRECATED("Crashlytics no longer needs or uses the delay parameter.  Please use +startWithAPIKey:delegate: instead.");
-
-/**
- *  Access the singleton Crashlytics instance.
- *
- *  @return The singleton Crashlytics instance
- */
-+ (Crashlytics *)sharedInstance;
-
-/**
- *  The easiest way to cause a crash - great for testing!
- */
-- (void)crash;
-
-/**
- *  The easiest way to cause a crash with an exception - great for testing.
- */
-- (void)throwException;
-
-/**
- *  Specify a user identifier which will be visible in the Crashlytics UI.
- *
- *  Many of our customers have requested the ability to tie crashes to specific end-users of their
- *  application in order to facilitate responses to support requests or permit the ability to reach
- *  out for more information. We allow you to specify up to three separate values for display within
- *  the Crashlytics UI - but please be mindful of your end-user's privacy.
- *
- *  We recommend specifying a user identifier - an arbitrary string that ties an end-user to a record
- *  in your system. This could be a database id, hash, or other value that is meaningless to a
- *  third-party observer but can be indexed and queried by you.
- *
- *  Optionally, you may also specify the end-user's name or username, as well as email address if you
- *  do not have a system that works well with obscured identifiers.
- *
- *  Pursuant to our EULA, this data is transferred securely throughout our system and we will not
- *  disseminate end-user data unless required to by law. That said, if you choose to provide end-user
- *  contact information, we strongly recommend that you disclose this in your application's privacy
- *  policy. Data privacy is of our utmost concern.
- *
- *  @param identifier An arbitrary user identifier string which ties an end-user to a record in your system.
- */
-- (void)setUserIdentifier:(nullable NSString *)identifier;
-
-/**
- *  Specify a user name which will be visible in the Crashlytics UI.
- *  Please be mindful of your end-user's privacy and see if setUserIdentifier: can fulfil your needs.
- *  @see setUserIdentifier:
- *
- *  @param name An end user's name.
- */
-- (void)setUserName:(nullable NSString *)name;
-
-/**
- *  Specify a user email which will be visible in the Crashlytics UI.
- *  Please be mindful of your end-user's privacy and see if setUserIdentifier: can fulfil your needs.
- *  
- *  @see setUserIdentifier:
- *
- *  @param email An end user's email address.
- */
-- (void)setUserEmail:(nullable NSString *)email;
-
-+ (void)setUserIdentifier:(nullable NSString *)identifier CLS_DEPRECATED("Please access this method via +sharedInstance");
-+ (void)setUserName:(nullable NSString *)name CLS_DEPRECATED("Please access this method via +sharedInstance");
-+ (void)setUserEmail:(nullable NSString *)email CLS_DEPRECATED("Please access this method via +sharedInstance");
-
-/**
- *  Set a value for a for a key to be associated with your crash data which will be visible in the Crashlytics UI.
- *  When setting an object value, the object is converted to a string. This is typically done by calling 
- *  -[NSObject description].
- *
- *  @param value The object to be associated with the key
- *  @param key   The key with which to associate the value
- */
-- (void)setObjectValue:(nullable id)value forKey:(NSString *)key;
-
-/**
- *  Set an int value for a key to be associated with your crash data which will be visible in the Crashlytics UI.
- *
- *  @param value The integer value to be set
- *  @param key   The key with which to associate the value
- */
-- (void)setIntValue:(int)value forKey:(NSString *)key;
-
-/**
- *  Set an BOOL value for a key to be associated with your crash data which will be visible in the Crashlytics UI.
- *
- *  @param value The BOOL value to be set
- *  @param key   The key with which to associate the value
- */
-- (void)setBoolValue:(BOOL)value forKey:(NSString *)key;
-
-/**
- *  Set an float value for a key to be associated with your crash data which will be visible in the Crashlytics UI.
- *
- *  @param value The float value to be set
- *  @param key   The key with which to associate the value
- */
-- (void)setFloatValue:(float)value forKey:(NSString *)key;
-
-+ (void)setObjectValue:(nullable id)value forKey:(NSString *)key CLS_DEPRECATED("Please access this method via +sharedInstance");
-+ (void)setIntValue:(int)value forKey:(NSString *)key CLS_DEPRECATED("Please access this method via +sharedInstance");
-+ (void)setBoolValue:(BOOL)value forKey:(NSString *)key CLS_DEPRECATED("Please access this method via +sharedInstance");
-+ (void)setFloatValue:(float)value forKey:(NSString *)key CLS_DEPRECATED("Please access this method via +sharedInstance");
-
-/**
- *  This method can be used to record a single exception structure in a report. This is particularly useful
- *  when your code interacts with non-native languages like Lua, C#, or Javascript. This call can be
- *  expensive and should only be used shortly before process termination. This API is not intended be to used
- *  to log NSException objects. All safely-reportable NSExceptions are automatically captured by
- *  Crashlytics.
- *
- *  @param name       The name of the custom exception
- *  @param reason     The reason this exception occured
- *  @param frameArray An array of CLSStackFrame objects
- */
-- (void)recordCustomExceptionName:(NSString *)name reason:(nullable NSString *)reason frameArray:(CLS_GENERIC_NSARRAY(CLSStackFrame *) *)frameArray;
-
-/**
- *
- * This allows you to record a non-fatal event, described by an NSError object. These events will be grouped and
- * displayed similarly to crashes. Keep in mind that this method can be expensive. Also, the total number of
- * NSErrors that can be recorded during your app's life-cycle is limited by a fixed-size circular buffer. If the
- * buffer is overrun, the oldest data is dropped. Errors are relayed to Crashlytics on a subsequent launch
- * of your application.
- *
- * You can also use the -recordError:withAdditionalUserInfo: to include additional context not represented
- * by the NSError instance itself.
- *
- **/
-- (void)recordError:(NSError *)error;
-- (void)recordError:(NSError *)error withAdditionalUserInfo:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)userInfo;
-
-- (void)logEvent:(NSString *)eventName CLS_DEPRECATED("Please refer to Answers +logCustomEventWithName:");
-- (void)logEvent:(NSString *)eventName attributes:(nullable NSDictionary *) attributes CLS_DEPRECATED("Please refer to Answers +logCustomEventWithName:");
-+ (void)logEvent:(NSString *)eventName CLS_DEPRECATED("Please refer to Answers +logCustomEventWithName:");
-+ (void)logEvent:(NSString *)eventName attributes:(nullable NSDictionary *) attributes CLS_DEPRECATED("Please refer to Answers +logCustomEventWithName:");
-
-@end
-
-/**
- *
- * The CrashlyticsDelegate protocol provides a mechanism for your application to take
- * action on events that occur in the Crashlytics crash reporting system.  You can make
- * use of these calls by assigning an object to the Crashlytics' delegate property directly,
- * or through the convenience +startWithAPIKey:delegate: method.
- *
- */
-@protocol CrashlyticsDelegate <NSObject>
-@optional
-
-
-- (void)crashlyticsDidDetectCrashDuringPreviousExecution:(Crashlytics *)crashlytics CLS_DEPRECATED("Please refer to -crashlyticsDidDetectReportForLastExecution:");
-- (void)crashlytics:(Crashlytics *)crashlytics didDetectCrashDuringPreviousExecution:(id <CLSCrashReport>)crash CLS_DEPRECATED("Please refer to -crashlyticsDidDetectReportForLastExecution:");
-
-/**
- *
- *  Called when a Crashlytics instance has determined that the last execution of the
- *  application ended in a crash.  This is called synchronously on Crashlytics
- *  initialization. Your delegate must invoke the completionHandler, but does not need to do so
- *  synchronously, or even on the main thread. Invoking completionHandler with NO will cause the
- *  detected report to be deleted and not submitted to Crashlytics. This is useful for
- *  implementing permission prompts, or other more-complex forms of logic around submitting crashes.
- *
- *  @warning Failure to invoke the completionHandler will prevent submissions from being reported. Watch out.
- *
- *  @warning Just implementing this delegate method will disable all forms of synchronous report submission. This can
- *           impact the reliability of reporting crashes very early in application launch.
- *
- *  @param report            The CLSReport object representing the last detected crash
- *  @param completionHandler The completion handler to call when your logic has completed.
- *
- */
-- (void)crashlyticsDidDetectReportForLastExecution:(CLSReport *)report completionHandler:(void (^)(BOOL submit))completionHandler;
-
-/**
- *  If your app is running on an OS that supports it (OS X 10.9+, iOS 7.0+), Crashlytics will submit
- *  most reports using out-of-process background networking operations. This results in a significant
- *  improvement in reliability of reporting, as well as power and performance wins for your users.
- *  If you don't want this functionality, you can disable by returning NO from this method.
- *
- *  @warning Background submission is not supported for extensions on iOS or OS X.
- *
- *  @param crashlytics The Crashlytics singleton instance
- *
- *  @return Return NO if you don't want out-of-process background network operations.
- *
- */
-- (BOOL)crashlyticsCanUseBackgroundSessions:(Crashlytics *)crashlytics;
-
-@end
-
-/**
- *  `CrashlyticsKit` can be used as a parameter to `[Fabric with:@[CrashlyticsKit]];` in Objective-C. In Swift, use Crashlytics.sharedInstance()
- */
-#define CrashlyticsKit [Crashlytics sharedInstance]
-
-NS_ASSUME_NONNULL_END

External/Mac/Crashlytics.framework/Versions/A/Modules/module.modulemap

@@ -1,14 +0,0 @@
-framework module Crashlytics {
-    header "Crashlytics.h"
-    header "Answers.h"
-    header "ANSCompatibility.h"
-    header "CLSLogging.h"
-    header "CLSReport.h"
-    header "CLSStackFrame.h"
-    header "CLSAttributes.h"
-
-    export *
-
-    link "z"
-    link "c++"
-}

External/Mac/Crashlytics.framework/Versions/A/Resources/Info.plist

@@ -1,51 +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>BuildMachineOSBuild</key>
-	<string>14F1021</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>Crashlytics</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.twitter.crashlytics.mac</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Crashlytics</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>3.6.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>99</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>7B91b</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>15A278</string>
-	<key>DTSDKName</key>
-	<string>macosx10.11</string>
-	<key>DTXcode</key>
-	<string>0710</string>
-	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2015 Crashlytics, Inc. All rights reserved.</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-</dict>
-</plist>

External/Mac/Crashlytics.framework/Versions/Current

@@ -1 +0,0 @@
-A

External/Mac/Crashlytics.framework/run

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-#  run
-#
-#  Copyright (c) 2015 Crashlytics. All rights reserved.
-
-#  Figure out where we're being called from
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-
-#  Quote path in case of spaces or special chars
-DIR="\"${DIR}"
-
-PATH_SEP="/"
-VALIDATE_COMMAND="uploadDSYM\" $@ validate run-script"
-UPLOAD_COMMAND="uploadDSYM\" $@ run-script"
-
-#  Ensure params are as expected, run in sync mode to validate
-eval $DIR$PATH_SEP$VALIDATE_COMMAND
-return_code=$?
-
-if [[ $return_code != 0 ]]; then
-  exit $return_code
-fi
-
-#  Verification passed, upload dSYM in background to prevent Xcode from waiting
-#  Note: Validation is performed again before upload.
-#  Output can still be found in Console.app
-eval $DIR$PATH_SEP$UPLOAD_COMMAND > /dev/null 2>&1 &

External/Mac/Fabric.framework/Fabric

@@ -1 +0,0 @@
-Versions/Current/Fabric

External/Mac/Fabric.framework/Headers

@@ -1 +0,0 @@
-Versions/Current/Headers

External/Mac/Fabric.framework/Modules

@@ -1 +0,0 @@
-Versions/Current/Modules

External/Mac/Fabric.framework/Resources

@@ -1 +0,0 @@
-Versions/Current/Resources

External/Mac/Fabric.framework/Versions/A/Headers/FABAttributes.h

@@ -1,60 +0,0 @@
-//
-//  FABAttributes.h
-//  Fabric
-//
-//  Copyright (C) 2015 Twitter, Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#pragma once
-
-#define FAB_UNAVAILABLE(x) __attribute__((unavailable(x)))
-
-#if __has_feature(nullability)
-    #define fab_nullable           nullable
-    #define fab_nonnull            nonnull
-    #define fab_null_unspecified   null_unspecified
-    #define fab_null_resettable    null_resettable
-    #define __fab_nullable         __nullable
-    #define __fab_nonnull          __nonnull
-    #define __fab_null_unspecified __null_unspecified
-#else
-    #define fab_nullable
-    #define fab_nonnull
-    #define fab_null_unspecified
-    #define fab_null_resettable
-    #define __fab_nullable
-    #define __fab_nonnull
-    #define __fab_null_unspecified
-#endif
-
-#ifndef NS_ASSUME_NONNULL_BEGIN
-    #define NS_ASSUME_NONNULL_BEGIN
-#endif
-
-#ifndef NS_ASSUME_NONNULL_END
-    #define NS_ASSUME_NONNULL_END
-#endif
-
-
-/**
- * The following macros are defined here to provide
- * backwards compatability. If you are still using
- * them you should migrate to the new versions that
- * are defined above.
- */
-#define FAB_NONNULL       __fab_nonnull
-#define FAB_NULLABLE      __fab_nullable
-#define FAB_START_NONNULL NS_ASSUME_NONNULL_BEGIN
-#define FAB_END_NONNULL   NS_ASSUME_NONNULL_END

External/Mac/Fabric.framework/Versions/A/Headers/Fabric.h

@@ -1,77 +0,0 @@
-//
-//  Fabric.h
-//  Fabric
-//
-//  Copyright (C) 2015 Twitter, Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#import <Foundation/Foundation.h>
-#import "FABAttributes.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-#if TARGET_OS_IPHONE
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 60000
-    #error "Fabric's minimum iOS version is 6.0"
-#endif
-#else
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
-    #error "Fabric's minimum OS X version is 10.7"
-#endif
-#endif
-
-/**
- *  Fabric Base. Coordinates configuration and starts all provided kits.
- */
-@interface Fabric : NSObject
-
-/**
- * Initialize Fabric and all provided kits. Call this method within your App Delegate's `application:didFinishLaunchingWithOptions:` and provide the kits you wish to use.
- *
- * For example, in Objective-C:
- *
- *      `[Fabric with:@[[Crashlytics class], [Twitter class], [Digits class], [MoPub class]]];`
- *
- * Swift:
- *
- *      `Fabric.with([Crashlytics.self(), Twitter.self(), Digits.self(), MoPub.self()])`
- *
- * Only the first call to this method is honored. Subsequent calls are no-ops.
- *
- * @param kitClasses An array of kit Class objects
- *
- * @return Returns the shared Fabric instance. In most cases this can be ignored.
- */
-+ (instancetype)with:(NSArray *)kitClasses;
-
-/**
- *  Returns the Fabric singleton object.
- */
-+ (instancetype)sharedSDK;
-
-/**
- *  This BOOL enables or disables debug logging, such as kit version information. The default value is NO.
- */
-@property (nonatomic, assign) BOOL debug;
-
-/**
- *  Unavailable. Use `+sharedSDK` to retrieve the shared Fabric instance.
- */
-- (id)init FAB_UNAVAILABLE("Use +sharedSDK to retrieve the shared Fabric instance.");
-
-@end
-
-NS_ASSUME_NONNULL_END
-

External/Mac/Fabric.framework/Versions/A/Modules/module.modulemap

@@ -1,6 +0,0 @@
-framework module Fabric {
-    umbrella header "Fabric.h"
-
-    export *
-    module * { export * }
-}

External/Mac/Fabric.framework/Versions/A/Resources/Info.plist

@@ -1,51 +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>BuildMachineOSBuild</key>
-	<string>14F1021</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>Fabric</string>
-	<key>CFBundleIdentifier</key>
-	<string>io.fabric.sdk.mac</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Fabric</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.6.4</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>45</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>7B91b</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>15A278</string>
-	<key>DTSDKName</key>
-	<string>macosx10.11</string>
-	<key>DTXcode</key>
-	<string>0710</string>
-	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2015 Twitter. All rights reserved.</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-</dict>
-</plist>

External/Mac/Fabric.framework/Versions/Current

@@ -1 +0,0 @@
-A

External/Mac/Fabric.framework/run

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-#  run
-#
-#  Copyright (c) 2015 Crashlytics. All rights reserved.
-
-#  Figure out where we're being called from
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-
-#  Quote path in case of spaces or special chars
-DIR="\"${DIR}"
-
-PATH_SEP="/"
-VALIDATE_COMMAND="uploadDSYM\" $@ validate run-script"
-UPLOAD_COMMAND="uploadDSYM\" $@ run-script"
-
-#  Ensure params are as expected, run in sync mode to validate
-eval $DIR$PATH_SEP$VALIDATE_COMMAND
-return_code=$?
-
-if [[ $return_code != 0 ]]; then
-  exit $return_code
-fi
-
-#  Verification passed, upload dSYM in background to prevent Xcode from waiting
-#  Note: Validation is performed again before upload.
-#  Output can still be found in Console.app
-eval $DIR$PATH_SEP$UPLOAD_COMMAND > /dev/null 2>&1 &

External/Pearl

@@ -1 +0,0 @@
-Subproject commit 8b6e3481d7963d08cd50fc5994702f2abdce3cc5

External/iOS/Crashlytics.framework/Headers/ANSCompatibility.h

@@ -1,31 +0,0 @@
-//
-//  ANSCompatibility.h
-//  AnswersKit
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#pragma once
-
-#if !__has_feature(nullability)
-#define nonnull
-#define nullable
-#define _Nullable
-#define _Nonnull
-#endif
-
-#ifndef NS_ASSUME_NONNULL_BEGIN
-#define NS_ASSUME_NONNULL_BEGIN
-#endif
-
-#ifndef NS_ASSUME_NONNULL_END
-#define NS_ASSUME_NONNULL_END
-#endif
-
-#if __has_feature(objc_generics)
-#define ANS_GENERIC_NSARRAY(type) NSArray<type>
-#define ANS_GENERIC_NSDICTIONARY(key_type,object_key) NSDictionary<key_type, object_key>
-#else
-#define ANS_GENERIC_NSARRAY(type) NSArray
-#define ANS_GENERIC_NSDICTIONARY(key_type,object_key) NSDictionary
-#endif

External/iOS/Crashlytics.framework/Headers/Answers.h

@@ -1,210 +0,0 @@
-//
-//  Answers.h
-//  Crashlytics
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "ANSCompatibility.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- *  This class exposes the Answers Events API, allowing you to track key 
- *  user user actions and metrics in your app.
- */
-@interface Answers : NSObject
-
-/**
- *  Log a Sign Up event to see users signing up for your app in real-time, understand how
- *  many users are signing up with different methods and their success rate signing up.
- *
- *  @param signUpMethodOrNil     The method by which a user logged in, e.g. Twitter or Digits.
- *  @param signUpSucceededOrNil  The ultimate success or failure of the login
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this purchase.
- */
-+ (void)logSignUpWithMethod:(nullable NSString *)signUpMethodOrNil
-                    success:(nullable NSNumber *)signUpSucceededOrNil
-           customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log an Log In event to see users logging into your app in real-time, understand how many
- *  users are logging in with different methods and their success rate logging into your app.
- *
- *  @param loginMethodOrNil      The method by which a user logged in, e.g. email, Twitter or Digits.
- *  @param loginSucceededOrNil   The ultimate success or failure of the login
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this purchase.
- */
-+ (void)logLoginWithMethod:(nullable NSString *)loginMethodOrNil
-                   success:(nullable NSNumber *)loginSucceededOrNil
-          customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Share event to see users sharing from your app in real-time, letting you
- *  understand what content they're sharing from the type or genre down to the specific id.
- *
- *  @param shareMethodOrNil      The method by which a user shared, e.g. email, Twitter, SMS.
- *  @param contentNameOrNil      The human readable name for this piece of content.
- *  @param contentTypeOrNil      The type of content shared.
- *  @param contentIdOrNil        The unique identifier for this piece of content. Useful for finding the top shared item.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
- */
-+ (void)logShareWithMethod:(nullable NSString *)shareMethodOrNil
-               contentName:(nullable NSString *)contentNameOrNil
-               contentType:(nullable NSString *)contentTypeOrNil
-                 contentId:(nullable NSString *)contentIdOrNil
-          customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log an Invite Event to track how users are inviting other users into
- *  your application.
- *
- *  @param inviteMethodOrNil     The method of invitation, e.g. GameCenter, Twitter, email.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this purchase.
- */
-+ (void)logInviteWithMethod:(nullable NSString *)inviteMethodOrNil
-           customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Purchase event to see your revenue in real-time, understand how many users are making purchases, see which
- *  items are most popular, and track plenty of other important purchase-related metrics.
- *
- *  @param itemPriceOrNil         The purchased item's price.
- *  @param currencyOrNil          The ISO4217 currency code. Example: USD
- *  @param purchaseSucceededOrNil Was the purchase succesful or unsuccesful
- *  @param itemNameOrNil          The human-readable form of the item's name. Example:
- *  @param itemIdOrNil            The machine-readable, unique item identifier Example: SKU
- *  @param itemTypeOrNil          The type, or genre of the item. Example: Song
- *  @param customAttributesOrNil  A dictionary of custom attributes to associate with this purchase.
- */
-+ (void)logPurchaseWithPrice:(nullable NSDecimalNumber *)itemPriceOrNil
-                    currency:(nullable NSString *)currencyOrNil
-                     success:(nullable NSNumber *)purchaseSucceededOrNil
-                    itemName:(nullable NSString *)itemNameOrNil
-                    itemType:(nullable NSString *)itemTypeOrNil
-                      itemId:(nullable NSString *)itemIdOrNil
-            customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Level Start Event to track where users are in your game.
- *
- *  @param levelNameOrNil        The level name
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this level start event.
- */
-+ (void)logLevelStart:(nullable NSString *)levelNameOrNil
-     customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Level End event to track how users are completing levels in your game.
- *
- *  @param levelNameOrNil                 The name of the level completed, E.G. "1" or "Training"
- *  @param scoreOrNil                     The score the user completed the level with.
- *  @param levelCompletedSuccesfullyOrNil A boolean representing whether or not the level was completed succesfully.
- *  @param customAttributesOrNil          A dictionary of custom attributes to associate with this purchase.
- */
-+ (void)logLevelEnd:(nullable NSString *)levelNameOrNil
-              score:(nullable NSNumber *)scoreOrNil
-            success:(nullable NSNumber *)levelCompletedSuccesfullyOrNil
-   customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log an Add to Cart event to see users adding items to a shopping cart in real-time, understand how
- *  many users start the purchase flow, see which items are most popular, and track plenty of other important
- *  purchase-related metrics.
- *
- *  @param itemPriceOrNil         The purchased item's price.
- *  @param currencyOrNil          The ISO4217 currency code. Example: USD
- *  @param itemNameOrNil          The human-readable form of the item's name. Example:
- *  @param itemTypeOrNil          The type, or genre of the item. Example: Song
- *  @param itemIdOrNil            The machine-readable, unique item identifier Example: SKU
- *  @param customAttributesOrNil  A dictionary of custom attributes to associate with this purchase.
- */
-+ (void)logAddToCartWithPrice:(nullable NSDecimalNumber *)itemPriceOrNil
-                     currency:(nullable NSString *)currencyOrNil
-                     itemName:(nullable NSString *)itemNameOrNil
-                     itemType:(nullable NSString *)itemTypeOrNil
-                       itemId:(nullable NSString *)itemIdOrNil
-             customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Start Checkout event to see users moving through the purchase funnel in real-time, understand how many
- *  users are doing this and how much they're spending per checkout, and see how it related to other important
- *  purchase-related metrics.
- *
- *  @param totalPriceOrNil        The total price of the cart.
- *  @param currencyOrNil          The ISO4217 currency code. Example: USD
- *  @param itemCountOrNil         The number of items in the cart.
- *  @param customAttributesOrNil  A dictionary of custom attributes to associate with this purchase.
- */
-+ (void)logStartCheckoutWithPrice:(nullable NSDecimalNumber *)totalPriceOrNil
-                         currency:(nullable NSString *)currencyOrNil
-                        itemCount:(nullable NSNumber *)itemCountOrNil
-                 customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Rating event to see users rating content within your app in real-time and understand what
- *  content is most engaging, from the type or genre down to the specific id.
- *
- *  @param ratingOrNil           The integer rating given by the user.
- *  @param contentNameOrNil      The human readable name for this piece of content.
- *  @param contentTypeOrNil      The type of content shared.
- *  @param contentIdOrNil        The unique identifier for this piece of content. Useful for finding the top shared item.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
- */
-+ (void)logRating:(nullable NSNumber *)ratingOrNil
-      contentName:(nullable NSString *)contentNameOrNil
-      contentType:(nullable NSString *)contentTypeOrNil
-        contentId:(nullable NSString *)contentIdOrNil
- customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Content View event to see users viewing content within your app in real-time and
- *  understand what content is most engaging, from the type or genre down to the specific id.
- *
- *  @param contentNameOrNil      The human readable name for this piece of content.
- *  @param contentTypeOrNil      The type of content shared.
- *  @param contentIdOrNil        The unique identifier for this piece of content. Useful for finding the top shared item.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
- */
-+ (void)logContentViewWithName:(nullable NSString *)contentNameOrNil
-                   contentType:(nullable NSString *)contentTypeOrNil
-                     contentId:(nullable NSString *)contentIdOrNil
-              customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Search event allows you to see users searching within your app in real-time and understand
- *  exactly what they're searching for.
- *
- *  @param queryOrNil            The user's query.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
- */
-+ (void)logSearchWithQuery:(nullable NSString *)queryOrNil
-          customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-/**
- *  Log a Custom Event to see user actions that are uniquely important for your app in real-time, to see how often
- *  they're performing these actions with breakdowns by different categories you add. Use a human-readable name for
- *  the name of the event, since this is how the event will appear in Answers.
- *
- *  @param eventName             The human-readable name for the event.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this purchase. Attribute keys
- *                               must be <code>NSString</code> and and values must be <code>NSNumber</code> or <code>NSString</code>.
- *  @discussion                  How we treat <code>NSNumbers</code>:
- *                               We will provide information about the distribution of values over time.
- *
- *                               How we treat <code>NSStrings</code>:
- *                               NSStrings are used as categorical data, allowing comparison across different category values.
- *                               Strings are limited to a maximum length of 100 characters, attributes over this length will be
- *                               truncated.
- *
- *                               When tracking the Tweet views to better understand user engagement, sending the tweet's length
- *                               and the type of media present in the tweet allows you to track how tweet length and the type of media influence
- *                               engagement.
- */
-+ (void)logCustomEventWithName:(NSString *)eventName
-              customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
-
-@end
-
-NS_ASSUME_NONNULL_END

External/iOS/Crashlytics.framework/Headers/CLSAttributes.h

@@ -1,33 +0,0 @@
-//
-//  CLSAttributes.h
-//  Crashlytics
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#pragma once
-
-#define CLS_DEPRECATED(x)  __attribute__ ((deprecated(x)))
-
-#if !__has_feature(nullability)
-    #define nonnull
-    #define nullable
-    #define _Nullable
-    #define _Nonnull
-#endif
-
-#ifndef NS_ASSUME_NONNULL_BEGIN
-    #define NS_ASSUME_NONNULL_BEGIN
-#endif
-
-#ifndef NS_ASSUME_NONNULL_END
-    #define NS_ASSUME_NONNULL_END
-#endif
-
-#if __has_feature(objc_generics)
-    #define CLS_GENERIC_NSARRAY(type) NSArray<type>
-    #define CLS_GENERIC_NSDICTIONARY(key_type,object_key) NSDictionary<key_type, object_key>
-#else
-    #define CLS_GENERIC_NSARRAY(type) NSArray
-    #define CLS_GENERIC_NSDICTIONARY(key_type,object_key) NSDictionary
-#endif

External/iOS/Crashlytics.framework/Headers/CLSLogging.h

@@ -1,64 +0,0 @@
-//
-//  CLSLogging.h
-//  Crashlytics
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-#ifdef __OBJC__
-#import "CLSAttributes.h"
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-#endif
-
-
-
-/**
- *
- * The CLS_LOG macro provides as easy way to gather more information in your log messages that are
- * sent with your crash data. CLS_LOG prepends your custom log message with the function name and
- * line number where the macro was used. If your app was built with the DEBUG preprocessor macro
- * defined CLS_LOG uses the CLSNSLog function which forwards your log message to NSLog and CLSLog.
- * If the DEBUG preprocessor macro is not defined CLS_LOG uses CLSLog only.
- *
- * Example output:
- * -[AppDelegate login:] line 134 $ login start
- *
- * If you would like to change this macro, create a new header file, unset our define and then define
- * your own version. Make sure this new header file is imported after the Crashlytics header file.
- *
- * #undef CLS_LOG
- * #define CLS_LOG(__FORMAT__, ...) CLSNSLog...
- *
- **/
-#ifdef __OBJC__
-#ifdef DEBUG
-#define CLS_LOG(__FORMAT__, ...) CLSNSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
-#else
-#define CLS_LOG(__FORMAT__, ...) CLSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
-#endif
-#endif
-
-/**
- *
- * Add logging that will be sent with your crash data. This logging will not show up in the system.log
- * and will only be visible in your Crashlytics dashboard.
- *
- **/
-
-#ifdef __OBJC__
-OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
-OBJC_EXTERN void CLSLogv(NSString *format, va_list ap) NS_FORMAT_FUNCTION(1,0);
-
-/**
- *
- * Add logging that will be sent with your crash data. This logging will show up in the system.log
- * and your Crashlytics dashboard. It is not recommended for Release builds.
- *
- **/
-OBJC_EXTERN void CLSNSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
-OBJC_EXTERN void CLSNSLogv(NSString *format, va_list ap) NS_FORMAT_FUNCTION(1,0);
-
-
-NS_ASSUME_NONNULL_END
-#endif

External/iOS/Crashlytics.framework/Headers/CLSReport.h

@@ -1,103 +0,0 @@
-//
-//  CLSReport.h
-//  Crashlytics
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "CLSAttributes.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * The CLSCrashReport protocol is deprecated. See the CLSReport class and the CrashyticsDelegate changes for details.
- **/
-@protocol CLSCrashReport <NSObject>
-
-@property (nonatomic, copy, readonly) NSString *identifier;
-@property (nonatomic, copy, readonly) NSDictionary *customKeys;
-@property (nonatomic, copy, readonly) NSString *bundleVersion;
-@property (nonatomic, copy, readonly) NSString *bundleShortVersionString;
-@property (nonatomic, copy, readonly) NSDate *crashedOnDate;
-@property (nonatomic, copy, readonly) NSString *OSVersion;
-@property (nonatomic, copy, readonly) NSString *OSBuildVersion;
-
-@end
-
-/**
- * The CLSReport exposes an interface to the phsyical report that Crashlytics has created. You can
- * use this class to get information about the event, and can also set some values after the
- * event has occured.
- **/
-@interface CLSReport : NSObject <CLSCrashReport>
-
-- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
-
-/**
- * Returns the session identifier for the report.
- **/
-@property (nonatomic, copy, readonly) NSString *identifier;
-
-/**
- * Returns the custom key value data for the report.
- **/
-@property (nonatomic, copy, readonly) NSDictionary *customKeys;
-
-/**
- * Returns the CFBundleVersion of the application that generated the report.
- **/
-@property (nonatomic, copy, readonly) NSString *bundleVersion;
-
-/**
- * Returns the CFBundleShortVersionString of the application that generated the report.
- **/
-@property (nonatomic, copy, readonly) NSString *bundleShortVersionString;
-
-/**
- * Returns the date that the report was created.
- **/
-@property (nonatomic, copy, readonly) NSDate *dateCreated;
-
-/**
- * Returns the os version that the application crashed on.
- **/
-@property (nonatomic, copy, readonly) NSString *OSVersion;
-
-/**
- * Returns the os build version that the application crashed on.
- **/
-@property (nonatomic, copy, readonly) NSString *OSBuildVersion;
-
-/**
- * Returns YES if the report contains any crash information, otherwise returns NO.
- **/
-@property (nonatomic, assign, readonly) BOOL isCrash;
-
-/**
- * You can use this method to set, after the event, additional custom keys. The rules
- * and semantics for this method are the same as those documented in Crashlytics.h. Be aware
- * that the maximum size and count of custom keys is still enforced, and you can overwrite keys
- * and/or cause excess keys to be deleted by using this method.
- **/
-- (void)setObjectValue:(nullable id)value forKey:(NSString *)key;
-
-/**
- * Record an application-specific user identifier. See Crashlytics.h for details.
- **/
-@property (nonatomic, copy, nullable) NSString * userIdentifier;
-
-/**
- * Record a user name. See Crashlytics.h for details.
- **/
-@property (nonatomic, copy, nullable) NSString * userName;
-
-/**
- * Record a user email. See Crashlytics.h for details.
- **/
-@property (nonatomic, copy, nullable) NSString * userEmail;
-
-@end
-
-NS_ASSUME_NONNULL_END

External/iOS/Crashlytics.framework/Headers/CLSStackFrame.h

@@ -1,37 +0,0 @@
-//
-//  CLSStackFrame.h
-//  Crashlytics
-//
-//  Copyright 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "CLSAttributes.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- *
- * This class is used in conjunction with -[Crashlytics recordCustomExceptionName:reason:frameArray:] to
- * record information about non-ObjC/C++ exceptions. All information included here will be displayed 
- * in the Crashlytics UI, and can influence crash grouping. Be particularly careful with the use of the 
- * address property. If set, Crashlytics will attempt symbolication and could overwrite other properities 
- * in the process.
- *
- **/
-@interface CLSStackFrame : NSObject
-
-+ (instancetype)stackFrame;
-+ (instancetype)stackFrameWithAddress:(NSUInteger)address;
-+ (instancetype)stackFrameWithSymbol:(NSString *)symbol;
-
-@property (nonatomic, copy, nullable) NSString *symbol;
-@property (nonatomic, copy, nullable) NSString *library;
-@property (nonatomic, copy, nullable) NSString *fileName;
-@property (nonatomic, assign) uint32_t lineNumber;
-@property (nonatomic, assign) uint64_t offset;
-@property (nonatomic, assign) uint64_t address;
-
-@end
-
-NS_ASSUME_NONNULL_END

External/iOS/Crashlytics.framework/Headers/Crashlytics.h

@@ -1,248 +0,0 @@
-//
-//  Crashlytics.h
-//  Crashlytics
-//
-//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-#import "CLSAttributes.h"
-#import "CLSLogging.h"
-#import "CLSReport.h"
-#import "CLSStackFrame.h"
-#import "Answers.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol CrashlyticsDelegate;
-
-/**
- *  Crashlytics. Handles configuration and initialization of Crashlytics.
- */
-@interface Crashlytics : NSObject
-
-@property (nonatomic, readonly, copy) NSString *APIKey;
-@property (nonatomic, readonly, copy) NSString *version;
-@property (nonatomic, assign)         BOOL      debugMode;
-
-/**
- *
- * The delegate can be used to influence decisions on reporting and behavior, as well as reacting
- * to previous crashes.
- *
- * Make certain that the delegate is setup before starting Crashlytics with startWithAPIKey:... or
- * via +[Fabric with:...]. Failure to do will result in missing any delegate callbacks that occur
- * synchronously during start.
- *
- **/
-@property (nonatomic, assign, nullable) id <CrashlyticsDelegate> delegate;
-
-/**
- *  The recommended way to install Crashlytics into your application is to place a call to +startWithAPIKey: 
- *  in your -application:didFinishLaunchingWithOptions: or -applicationDidFinishLaunching:
- *  method.
- *
- *  Note: Starting with 3.0, the submission process has been significantly improved. The delay parameter
- *  is no longer required to throttle submissions on launch, performance will be great without it.
- *
- *  @param apiKey The Crashlytics API Key for this app
- *
- *  @return The singleton Crashlytics instance
- */
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey;
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey afterDelay:(NSTimeInterval)delay CLS_DEPRECATED("Crashlytics no longer needs or uses the delay parameter.  Please use +startWithAPIKey: instead.");
-
-/**
- *  If you need the functionality provided by the CrashlyticsDelegate protocol, you can use
- *  these convenience methods to activate the framework and set the delegate in one call.
- *  
- *  @param apiKey   The Crashlytics API Key for this app
- *  @param delegate A delegate object which conforms to CrashlyticsDelegate.
- *
- *  @return The singleton Crashlytics instance
- */
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(nullable id<CrashlyticsDelegate>)delegate;
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(nullable id<CrashlyticsDelegate>)delegate afterDelay:(NSTimeInterval)delay CLS_DEPRECATED("Crashlytics no longer needs or uses the delay parameter.  Please use +startWithAPIKey:delegate: instead.");
-
-/**
- *  Access the singleton Crashlytics instance.
- *
- *  @return The singleton Crashlytics instance
- */
-+ (Crashlytics *)sharedInstance;
-
-/**
- *  The easiest way to cause a crash - great for testing!
- */
-- (void)crash;
-
-/**
- *  The easiest way to cause a crash with an exception - great for testing.
- */
-- (void)throwException;
-
-/**
- *  Specify a user identifier which will be visible in the Crashlytics UI.
- *
- *  Many of our customers have requested the ability to tie crashes to specific end-users of their
- *  application in order to facilitate responses to support requests or permit the ability to reach
- *  out for more information. We allow you to specify up to three separate values for display within
- *  the Crashlytics UI - but please be mindful of your end-user's privacy.
- *
- *  We recommend specifying a user identifier - an arbitrary string that ties an end-user to a record
- *  in your system. This could be a database id, hash, or other value that is meaningless to a
- *  third-party observer but can be indexed and queried by you.
- *
- *  Optionally, you may also specify the end-user's name or username, as well as email address if you
- *  do not have a system that works well with obscured identifiers.
- *
- *  Pursuant to our EULA, this data is transferred securely throughout our system and we will not
- *  disseminate end-user data unless required to by law. That said, if you choose to provide end-user
- *  contact information, we strongly recommend that you disclose this in your application's privacy
- *  policy. Data privacy is of our utmost concern.
- *
- *  @param identifier An arbitrary user identifier string which ties an end-user to a record in your system.
- */
-- (void)setUserIdentifier:(nullable NSString *)identifier;
-
-/**
- *  Specify a user name which will be visible in the Crashlytics UI.
- *  Please be mindful of your end-user's privacy and see if setUserIdentifier: can fulfil your needs.
- *  @see setUserIdentifier:
- *
- *  @param name An end user's name.
- */
-- (void)setUserName:(nullable NSString *)name;
-
-/**
- *  Specify a user email which will be visible in the Crashlytics UI.
- *  Please be mindful of your end-user's privacy and see if setUserIdentifier: can fulfil your needs.
- *  
- *  @see setUserIdentifier:
- *
- *  @param email An end user's email address.
- */
-- (void)setUserEmail:(nullable NSString *)email;
-
-+ (void)setUserIdentifier:(nullable NSString *)identifier CLS_DEPRECATED("Please access this method via +sharedInstance");
-+ (void)setUserName:(nullable NSString *)name CLS_DEPRECATED("Please access this method via +sharedInstance");
-+ (void)setUserEmail:(nullable NSString *)email CLS_DEPRECATED("Please access this method via +sharedInstance");
-
-/**
- *  Set a value for a for a key to be associated with your crash data which will be visible in the Crashlytics UI.
- *  When setting an object value, the object is converted to a string. This is typically done by calling 
- *  -[NSObject description].
- *
- *  @param value The object to be associated with the key
- *  @param key   The key with which to associate the value
- */
-- (void)setObjectValue:(nullable id)value forKey:(NSString *)key;
-
-/**
- *  Set an int value for a key to be associated with your crash data which will be visible in the Crashlytics UI.
- *
- *  @param value The integer value to be set
- *  @param key   The key with which to associate the value
- */
-- (void)setIntValue:(int)value forKey:(NSString *)key;
-
-/**
- *  Set an BOOL value for a key to be associated with your crash data which will be visible in the Crashlytics UI.
- *
- *  @param value The BOOL value to be set
- *  @param key   The key with which to associate the value
- */
-- (void)setBoolValue:(BOOL)value forKey:(NSString *)key;
-
-/**
- *  Set an float value for a key to be associated with your crash data which will be visible in the Crashlytics UI.
- *
- *  @param value The float value to be set
- *  @param key   The key with which to associate the value
- */
-- (void)setFloatValue:(float)value forKey:(NSString *)key;
-
-+ (void)setObjectValue:(nullable id)value forKey:(NSString *)key CLS_DEPRECATED("Please access this method via +sharedInstance");
-+ (void)setIntValue:(int)value forKey:(NSString *)key CLS_DEPRECATED("Please access this method via +sharedInstance");
-+ (void)setBoolValue:(BOOL)value forKey:(NSString *)key CLS_DEPRECATED("Please access this method via +sharedInstance");
-+ (void)setFloatValue:(float)value forKey:(NSString *)key CLS_DEPRECATED("Please access this method via +sharedInstance");
-
-/**
- *  This method can be used to record a single exception structure in a report. This is particularly useful
- *  when your code interacts with non-native languages like Lua, C#, or Javascript. This call can be
- *  expensive and should only be used shortly before process termination. This API is not intended be to used
- *  to log NSException objects. All safely-reportable NSExceptions are automatically captured by
- *  Crashlytics.
- *
- *  @param name       The name of the custom exception
- *  @param reason     The reason this exception occured
- *  @param frameArray An array of CLSStackFrame objects
- */
-- (void)recordCustomExceptionName:(NSString *)name reason:(nullable NSString *)reason frameArray:(CLS_GENERIC_NSARRAY(CLSStackFrame *) *)frameArray;
-
-- (void)logEvent:(NSString *)eventName CLS_DEPRECATED("Please refer to Answers +logCustomEventWithName:");
-- (void)logEvent:(NSString *)eventName attributes:(nullable NSDictionary *) attributes CLS_DEPRECATED("Please refer to Answers +logCustomEventWithName:");
-+ (void)logEvent:(NSString *)eventName CLS_DEPRECATED("Please refer to Answers +logCustomEventWithName:");
-+ (void)logEvent:(NSString *)eventName attributes:(nullable NSDictionary *) attributes CLS_DEPRECATED("Please refer to Answers +logCustomEventWithName:");
-
-@end
-
-/**
- *
- * The CrashlyticsDelegate protocol provides a mechanism for your application to take
- * action on events that occur in the Crashlytics crash reporting system.  You can make
- * use of these calls by assigning an object to the Crashlytics' delegate property directly,
- * or through the convenience +startWithAPIKey:delegate: method.
- *
- */
-@protocol CrashlyticsDelegate <NSObject>
-@optional
-
-
-- (void)crashlyticsDidDetectCrashDuringPreviousExecution:(Crashlytics *)crashlytics CLS_DEPRECATED("Please refer to -crashlyticsDidDetectReportForLastExecution:");
-- (void)crashlytics:(Crashlytics *)crashlytics didDetectCrashDuringPreviousExecution:(id <CLSCrashReport>)crash CLS_DEPRECATED("Please refer to -crashlyticsDidDetectReportForLastExecution:");
-
-/**
- *
- *  Called when a Crashlytics instance has determined that the last execution of the
- *  application ended in a crash.  This is called synchronously on Crashlytics
- *  initialization. Your delegate must invoke the completionHandler, but does not need to do so
- *  synchronously, or even on the main thread. Invoking completionHandler with NO will cause the
- *  detected report to be deleted and not submitted to Crashlytics. This is useful for
- *  implementing permission prompts, or other more-complex forms of logic around submitting crashes.
- *
- *  @warning Failure to invoke the completionHandler will prevent submissions from being reported. Watch out.
- *
- *  @warning Just implementing this delegate method will disable all forms of synchronous report submission. This can
- *           impact the reliability of reporting crashes very early in application launch.
- *
- *  @param report            The CLSReport object representing the last detected crash
- *  @param completionHandler The completion handler to call when your logic has completed.
- *
- */
-- (void)crashlyticsDidDetectReportForLastExecution:(CLSReport *)report completionHandler:(void (^)(BOOL submit))completionHandler;
-
-/**
- *  If your app is running on an OS that supports it (OS X 10.9+, iOS 7.0+), Crashlytics will submit
- *  most reports using out-of-process background networking operations. This results in a significant
- *  improvement in reliability of reporting, as well as power and performance wins for your users.
- *  If you don't want this functionality, you can disable by returning NO from this method.
- *
- *  @warning Background submission is not supported for extensions on iOS or OS X.
- *
- *  @param crashlytics The Crashlytics singleton instance
- *
- *  @return Return NO if you don't want out-of-process background network operations.
- *
- */
-- (BOOL)crashlyticsCanUseBackgroundSessions:(Crashlytics *)crashlytics;
-
-@end
-
-/**
- *  `CrashlyticsKit` can be used as a parameter to `[Fabric with:@[CrashlyticsKit]];` in Objective-C. In Swift, use Crashlytics.sharedInstance()
- */
-#define CrashlyticsKit [Crashlytics sharedInstance]
-
-NS_ASSUME_NONNULL_END

External/iOS/Crashlytics.framework/Info.plist

@@ -1,55 +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>BuildMachineOSBuild</key>
-	<string>14F1021</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>Crashlytics</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.twitter.crashlytics.ios</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Crashlytics</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>iPhoneOS</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>92</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>13B137</string>
-	<key>DTPlatformName</key>
-	<string>iphoneos</string>
-	<key>DTPlatformVersion</key>
-	<string>9.1</string>
-	<key>DTSDKBuild</key>
-	<string>13B137</string>
-	<key>DTSDKName</key>
-	<string>iphoneos9.1</string>
-	<key>DTXcode</key>
-	<string>0710</string>
-	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
-	<key>MinimumOSVersion</key>
-	<string>6.0</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2015 Crashlytics, Inc. All rights reserved.</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-</dict>
-</plist>

External/iOS/Crashlytics.framework/Modules/module.modulemap

@@ -1,14 +0,0 @@
-framework module Crashlytics {
-    header "Crashlytics.h"
-    header "Answers.h"
-    header "ANSCompatibility.h"
-    header "CLSLogging.h"
-    header "CLSReport.h"
-    header "CLSStackFrame.h"
-    header "CLSAttributes.h"
-
-    export *
-
-    link "z"
-    link "c++"
-}

External/iOS/Crashlytics.framework/run

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-#  run
-#
-#  Copyright (c) 2015 Crashlytics. All rights reserved.
-
-#  Figure out where we're being called from
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-
-#  Quote path in case of spaces or special chars
-DIR="\"${DIR}"
-
-PATH_SEP="/"
-VALIDATE_COMMAND="uploadDSYM\" $@ validate"
-UPLOAD_COMMAND="uploadDSYM\" $@"
-
-#  Ensure params are as expected, run in sync mode to validate
-eval $DIR$PATH_SEP$VALIDATE_COMMAND
-return_code=$?
-
-if [[ $return_code != 0 ]]; then
-  exit $return_code
-fi
-
-#  Verification passed, upload dSYM in background to prevent Xcode from waiting
-#  Note: Validation is performed again before upload.
-#  Output can still be found in Console.app
-eval $DIR$PATH_SEP$UPLOAD_COMMAND > /dev/null 2>&1 &

External/iOS/Fabric.framework/Headers/FABAttributes.h

@@ -1,48 +0,0 @@
-//
-//  FABAttributes.h
-//  Fabric
-//
-//  Copyright (c) 2015 Twitter. All rights reserved.
-//
-
-#pragma once
-
-#define FAB_UNAVAILABLE(x) __attribute__((unavailable(x)))
-
-#if __has_feature(nullability)
-    #define fab_nullable           nullable
-    #define fab_nonnull            nonnull
-    #define fab_null_unspecified   null_unspecified
-    #define fab_null_resettable    null_resettable
-    #define __fab_nullable         __nullable
-    #define __fab_nonnull          __nonnull
-    #define __fab_null_unspecified __null_unspecified
-#else
-    #define fab_nullable
-    #define fab_nonnull
-    #define fab_null_unspecified
-    #define fab_null_resettable
-    #define __fab_nullable
-    #define __fab_nonnull
-    #define __fab_null_unspecified
-#endif
-
-#ifndef NS_ASSUME_NONNULL_BEGIN
-    #define NS_ASSUME_NONNULL_BEGIN
-#endif
-
-#ifndef NS_ASSUME_NONNULL_END
-    #define NS_ASSUME_NONNULL_END
-#endif
-
-
-/**
- * The following macros are defined here to provide
- * backwards compatability. If you are still using
- * them you should migrate to the new versions that
- * are defined above.
- */
-#define FAB_NONNULL       __fab_nonnull
-#define FAB_NULLABLE      __fab_nullable
-#define FAB_START_NONNULL NS_ASSUME_NONNULL_BEGIN
-#define FAB_END_NONNULL   NS_ASSUME_NONNULL_END

External/iOS/Fabric.framework/Headers/Fabric.h

@@ -1,64 +0,0 @@
-//
-//  Fabric.h
-//
-//  Copyright (c) 2015 Twitter. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "FABAttributes.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-#if TARGET_OS_IPHONE
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 60000
-    #error "Fabric's minimum iOS version is 6.0"
-#endif
-#else
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
-    #error "Fabric's minimum OS X version is 10.7"
-#endif
-#endif
-
-/**
- *  Fabric Base. Coordinates configuration and starts all provided kits.
- */
-@interface Fabric : NSObject
-
-/**
- * Initialize Fabric and all provided kits. Call this method within your App Delegate's `application:didFinishLaunchingWithOptions:` and provide the kits you wish to use.
- *
- * For example, in Objective-C:
- *
- *      `[Fabric with:@[[Crashlytics class], [Twitter class], [Digits class], [MoPub class]]];`
- *
- * Swift:
- *
- *      `Fabric.with([Crashlytics.self(), Twitter.self(), Digits.self(), MoPub.self()])`
- *
- * Only the first call to this method is honored. Subsequent calls are no-ops.
- *
- * @param kitClasses An array of kit Class objects
- *
- * @return Returns the shared Fabric instance. In most cases this can be ignored.
- */
-+ (instancetype)with:(NSArray *)kitClasses;
-
-/**
- *  Returns the Fabric singleton object.
- */
-+ (instancetype)sharedSDK;
-
-/**
- *  This BOOL enables or disables debug logging, such as kit version information. The default value is NO.
- */
-@property (nonatomic, assign) BOOL debug;
-
-/**
- *  Unavailable. Use `+sharedSDK` to retrieve the shared Fabric instance.
- */
-- (id)init FAB_UNAVAILABLE("Use +sharedSDK to retrieve the shared Fabric instance.");
-
-@end
-
-NS_ASSUME_NONNULL_END
-

External/iOS/Fabric.framework/Info.plist

@@ -1,55 +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>BuildMachineOSBuild</key>
-	<string>14F1021</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>Fabric</string>
-	<key>CFBundleIdentifier</key>
-	<string>io.fabric.sdk.ios</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Fabric</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.6.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>iPhoneOS</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>37</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>13B137</string>
-	<key>DTPlatformName</key>
-	<string>iphoneos</string>
-	<key>DTPlatformVersion</key>
-	<string>9.1</string>
-	<key>DTSDKBuild</key>
-	<string>13B137</string>
-	<key>DTSDKName</key>
-	<string>iphoneos9.1</string>
-	<key>DTXcode</key>
-	<string>0710</string>
-	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
-	<key>MinimumOSVersion</key>
-	<string>6.0</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2015 Twitter. All rights reserved.</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-</dict>
-</plist>

External/iOS/Fabric.framework/Modules/module.modulemap

@@ -1,6 +0,0 @@
-framework module Fabric {
-    umbrella header "Fabric.h"
-
-    export *
-    module * { export * }
-}

External/iOS/Fabric.framework/run

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-#  run
-#
-#  Copyright (c) 2015 Crashlytics. All rights reserved.
-
-#  Figure out where we're being called from
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-
-#  Quote path in case of spaces or special chars
-DIR="\"${DIR}"
-
-PATH_SEP="/"
-VALIDATE_COMMAND="uploadDSYM\" $@ validate"
-UPLOAD_COMMAND="uploadDSYM\" $@"
-
-#  Ensure params are as expected, run in sync mode to validate
-eval $DIR$PATH_SEP$VALIDATE_COMMAND
-return_code=$?
-
-if [[ $return_code != 0 ]]; then
-  exit $return_code
-fi
-
-#  Verification passed, upload dSYM in background to prevent Xcode from waiting
-#  Note: Validation is performed again before upload.
-#  Output can still be found in Console.app
-eval $DIR$PATH_SEP$UPLOAD_COMMAND > /dev/null 2>&1 &

External/iOS/Reveal.framework

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

External/jrswizzle

@@ -1 +0,0 @@
-Subproject commit 98d18aee73329321c320a2df85bacdb9f08a34a6

External/uicolor-utilities

@@ -1 +0,0 @@
-Subproject commit ae96212a4903a2b9e1df1e3542c9962f0d64a74b

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/build

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

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/lib/bcrypt/.source

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

MasterPassword/C/lib/bcrypt/arm.patch

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

MasterPassword/C/lib/scrypt/.source

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

MasterPassword/C/lib/scrypt/osx.patch

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

MasterPassword/C/mpw-algorithm.c

@@ -1,53 +0,0 @@
-//
-//  mpw-algorithm.c
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#include "mpw-algorithm.h"
-#include "mpw-algorithm_v0.c"
-#include "mpw-algorithm_v1.c"
-#include "mpw-algorithm_v2.c"
-#include "mpw-algorithm_v3.c"
-
-#define MP_N                32768
-#define MP_r                8
-#define MP_p                2
-#define MP_hash             PearlHashSHA256
-
-const uint8_t *mpw_masterKeyForUser(const char *fullName, const char *masterPassword, const MPAlgorithmVersion algorithmVersion) {
-
-    switch (algorithmVersion) {
-        case MPAlgorithmVersion0:
-            return mpw_masterKeyForUser_v0( fullName, masterPassword );
-        case MPAlgorithmVersion1:
-            return mpw_masterKeyForUser_v1( fullName, masterPassword );
-        case MPAlgorithmVersion2:
-            return mpw_masterKeyForUser_v2( fullName, masterPassword );
-        case MPAlgorithmVersion3:
-            return mpw_masterKeyForUser_v3( fullName, masterPassword );
-        default:
-            ftl( "Unsupported version: %d", algorithmVersion );
-            return NULL;
-    }
-}
-
-const char *mpw_passwordForSite(const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
-        const MPSiteVariant siteVariant, const char *siteContext, const MPAlgorithmVersion algorithmVersion) {
-
-    switch (algorithmVersion) {
-        case MPAlgorithmVersion0:
-            return mpw_passwordForSite_v0( masterKey, siteName, siteType, siteCounter, siteVariant, siteContext );
-        case MPAlgorithmVersion1:
-            return mpw_passwordForSite_v1( masterKey, siteName, siteType, siteCounter, siteVariant, siteContext );
-        case MPAlgorithmVersion2:
-            return mpw_passwordForSite_v2( masterKey, siteName, siteType, siteCounter, siteVariant, siteContext );
-        case MPAlgorithmVersion3:
-            return mpw_passwordForSite_v3( masterKey, siteName, siteType, siteCounter, siteVariant, siteContext );
-        default:
-            ftl( "Unsupported version: %d", algorithmVersion );
-            return NULL;
-    }
-}

MasterPassword/C/mpw-algorithm.h

@@ -1,33 +0,0 @@
-//
-//  mpw-algorithm.h
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-// NOTE: mpw is currently NOT thread-safe.
-#include "mpw-types.h"
-
-typedef enum(unsigned int, MPAlgorithmVersion) {
-    /** V0 did math with chars whose signedness was platform-dependent. */
-            MPAlgorithmVersion0,
-    /** V1 miscounted the byte-length of multi-byte site names. */
-            MPAlgorithmVersion1,
-    /** V2 miscounted the byte-length of multi-byte user names. */
-            MPAlgorithmVersion2,
-    /** V3 is the current version. */
-            MPAlgorithmVersion3,
-};
-#define MPAlgorithmVersionCurrent MPAlgorithmVersion3
-
-/** Derive the master key for a user based on their name and master password.
- * @return A new MP_dkLen-byte allocated buffer or NULL if an allocation error occurred. */
-const uint8_t *mpw_masterKeyForUser(
-        const char *fullName, const char *masterPassword, const MPAlgorithmVersion algorithmVersion);
-
-/** Encode a password for the site from the given master key and site parameters.
- * @return A newly allocated string or NULL if an allocation error occurred. */
-const char *mpw_passwordForSite(
-        const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
-        const MPSiteVariant siteVariant, const char *siteContext, const MPAlgorithmVersion algorithmVersion);

MasterPassword/C/mpw-algorithm_v0.c

@@ -1,131 +0,0 @@
-//
-//  mpw-algorithm.c
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#include <string.h>
-#include <errno.h>
-#include <arpa/inet.h>
-
-#include "mpw-types.h"
-#include "mpw-util.h"
-
-#define MP_N                32768
-#define MP_r                8
-#define MP_p                2
-#define MP_hash             PearlHashSHA256
-
-static const char *mpw_templateForType_v0(MPSiteType type, uint16_t seedByte) {
-
-    size_t count = 0;
-    const char **templates = mpw_templatesForType( type, &count );
-    if (!count)
-        return NULL;
-
-    return templates[seedByte % count];
-}
-
-static const char mpw_characterFromClass_v0(char characterClass, uint16_t seedByte) {
-
-    const char *classCharacters = mpw_charactersInClass( characterClass );
-    return classCharacters[seedByte % strlen( classCharacters )];
-}
-
-static const uint8_t *mpw_masterKeyForUser_v0(const char *fullName, const char *masterPassword) {
-
-    const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
-    trc( "algorithm: v%d\n", 0 );
-    trc( "fullName: %s (%zu)\n", fullName, mpw_charlen( fullName ) );
-    trc( "masterPassword: %s\n", masterPassword );
-    trc( "key scope: %s\n", mpKeyScope );
-
-    // Calculate the master key salt.
-    // masterKeySalt = mpKeyScope . #fullName . fullName
-    size_t masterKeySaltSize = 0;
-    uint8_t *masterKeySalt = NULL;
-    mpw_pushString( &masterKeySalt, &masterKeySaltSize, mpKeyScope );
-    mpw_pushInt( &masterKeySalt, &masterKeySaltSize, htonl( mpw_charlen( fullName ) ) );
-    mpw_pushString( &masterKeySalt, &masterKeySaltSize, fullName );
-    if (!masterKeySalt) {
-        ftl( "Could not allocate master key salt: %d\n", errno );
-        return NULL;
-    }
-    trc( "masterKeySalt ID: %s\n", mpw_idForBuf( masterKeySalt, masterKeySaltSize ) );
-
-    // Calculate the master key.
-    // masterKey = scrypt( masterPassword, masterKeySalt )
-    const uint8_t *masterKey = mpw_scrypt( MP_dkLen, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
-    mpw_free( masterKeySalt, masterKeySaltSize );
-    if (!masterKey) {
-        ftl( "Could not allocate master key: %d\n", errno );
-        return NULL;
-    }
-    trc( "masterKey ID: %s\n", mpw_idForBuf( masterKey, MP_dkLen ) );
-
-    return masterKey;
-}
-
-static const char *mpw_passwordForSite_v0(const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
-        const MPSiteVariant siteVariant, const char *siteContext) {
-
-    const char *siteScope = mpw_scopeForVariant( siteVariant );
-    trc( "algorithm: v%d\n", 0 );
-    trc( "siteName: %s\n", siteName );
-    trc( "siteCounter: %d\n", siteCounter );
-    trc( "siteVariant: %d\n", siteVariant );
-    trc( "siteType: %d\n", siteType );
-    trc( "site scope: %s, context: %s\n", siteScope, siteContext? "<empty>": siteContext );
-    trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)\n",
-            siteScope, mpw_hex_l( htonl( strlen( siteName ) ) ), siteName,
-            mpw_hex_l( htonl( siteCounter ) ),
-            mpw_hex_l( htonl( siteContext? strlen( siteContext ): 0 ) ), siteContext? "(null)": siteContext );
-
-    // Calculate the site seed.
-    // sitePasswordSeed = hmac-sha256( masterKey, siteScope . #siteName . siteName . siteCounter . #siteContext . siteContext )
-    size_t sitePasswordInfoSize = 0;
-    uint8_t *sitePasswordInfo = NULL;
-    mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteScope );
-    mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( mpw_charlen( siteName ) ) );
-    mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteName );
-    mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( siteCounter ) );
-    if (siteContext) {
-        mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( mpw_charlen( siteContext ) ) );
-        mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteContext );
-    }
-    if (!sitePasswordInfo) {
-        ftl( "Could not allocate site seed info: %d\n", errno );
-        return NULL;
-    }
-    trc( "sitePasswordInfo ID: %s\n", mpw_idForBuf( sitePasswordInfo, sitePasswordInfoSize ) );
-
-    const char *sitePasswordSeed = (const char *)mpw_hmac_sha256( masterKey, MP_dkLen, sitePasswordInfo, sitePasswordInfoSize );
-    mpw_free( sitePasswordInfo, sitePasswordInfoSize );
-    if (!sitePasswordSeed) {
-        ftl( "Could not allocate site seed: %d\n", errno );
-        return NULL;
-    }
-    trc( "sitePasswordSeed ID: %s\n", mpw_idForBuf( sitePasswordSeed, 32 ) );
-
-    // Determine the template.
-    const char *template = mpw_templateForType_v0( siteType, htons( sitePasswordSeed[0] ) );
-    trc( "type %d, template: %s\n", siteType, template );
-    if (strlen( template ) > 32) {
-        ftl( "Template too long for password seed: %lu", strlen( template ) );
-        mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
-        return NULL;
-    }
-
-    // Encode the password from the seed using the template.
-    char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
-    for (size_t c = 0; c < strlen( template ); ++c) {
-        sitePassword[c] = mpw_characterFromClass_v0( template[c], htons( sitePasswordSeed[c + 1] ) );
-        trc( "class %c, index %u (0x%02X) -> character: %c\n",
-                template[c], htons( sitePasswordSeed[c + 1] ), htons( sitePasswordSeed[c + 1] ), sitePassword[c] );
-    }
-    mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
-
-    return sitePassword;
-}

MasterPassword/C/mpw-algorithm_v1.c

@@ -1,115 +0,0 @@
-//
-//  mpw-algorithm.c
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#include <string.h>
-#include <errno.h>
-#include <arpa/inet.h>
-
-#include "mpw-types.h"
-#include "mpw-util.h"
-
-#define MP_N                32768
-#define MP_r                8
-#define MP_p                2
-#define MP_hash             PearlHashSHA256
-
-static const uint8_t *mpw_masterKeyForUser_v1(const char *fullName, const char *masterPassword) {
-
-    const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
-    trc( "algorithm: v%d\n", 1 );
-    trc( "fullName: %s (%zu)\n", fullName, mpw_charlen( fullName ) );
-    trc( "masterPassword: %s\n", masterPassword );
-    trc( "key scope: %s\n", mpKeyScope );
-
-    // Calculate the master key salt.
-    // masterKeySalt = mpKeyScope . #fullName . fullName
-    size_t masterKeySaltSize = 0;
-    uint8_t *masterKeySalt = NULL;
-    mpw_pushString( &masterKeySalt, &masterKeySaltSize, mpKeyScope );
-    mpw_pushInt( &masterKeySalt, &masterKeySaltSize, htonl( mpw_charlen( fullName ) ) );
-    mpw_pushString( &masterKeySalt, &masterKeySaltSize, fullName );
-    if (!masterKeySalt) {
-        ftl( "Could not allocate master key salt: %d\n", errno );
-        return NULL;
-    }
-    trc( "masterKeySalt ID: %s\n", mpw_idForBuf( masterKeySalt, masterKeySaltSize ) );
-
-    // Calculate the master key.
-    // masterKey = scrypt( masterPassword, masterKeySalt )
-    const uint8_t *masterKey = mpw_scrypt( MP_dkLen, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
-    mpw_free( masterKeySalt, masterKeySaltSize );
-    if (!masterKey) {
-        ftl( "Could not allocate master key: %d\n", errno );
-        return NULL;
-    }
-    trc( "masterKey ID: %s\n", mpw_idForBuf( masterKey, MP_dkLen ) );
-
-    return masterKey;
-}
-
-static const char *mpw_passwordForSite_v1(const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
-        const MPSiteVariant siteVariant, const char *siteContext) {
-
-    const char *siteScope = mpw_scopeForVariant( siteVariant );
-    trc( "algorithm: v%d\n", 1 );
-    trc( "siteName: %s\n", siteName );
-    trc( "siteCounter: %d\n", siteCounter );
-    trc( "siteVariant: %d\n", siteVariant );
-    trc( "siteType: %d\n", siteType );
-    trc( "site scope: %s, context: %s\n", siteScope, siteContext? "<empty>": siteContext );
-    trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)\n",
-            siteScope, mpw_hex_l( htonl( strlen( siteName ) ) ), siteName,
-            mpw_hex_l( htonl( siteCounter ) ),
-            mpw_hex_l( htonl( siteContext? strlen( siteContext ): 0 ) ), siteContext? "(null)": siteContext );
-
-    // Calculate the site seed.
-    // sitePasswordSeed = hmac-sha256( masterKey, siteScope . #siteName . siteName . siteCounter . #siteContext . siteContext )
-    size_t sitePasswordInfoSize = 0;
-    uint8_t *sitePasswordInfo = NULL;
-    mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteScope );
-    mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( mpw_charlen( siteName ) ) );
-    mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteName );
-    mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( siteCounter ) );
-    if (siteContext) {
-        mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( mpw_charlen( siteContext ) ) );
-        mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteContext );
-    }
-    if (!sitePasswordInfo) {
-        ftl( "Could not allocate site seed info: %d\n", errno );
-        return NULL;
-    }
-    trc( "sitePasswordInfo ID: %s\n", mpw_idForBuf( sitePasswordInfo, sitePasswordInfoSize ) );
-
-    const uint8_t *sitePasswordSeed = mpw_hmac_sha256( masterKey, MP_dkLen, sitePasswordInfo, sitePasswordInfoSize );
-    mpw_free( sitePasswordInfo, sitePasswordInfoSize );
-    if (!sitePasswordSeed) {
-        ftl( "Could not allocate site seed: %d\n", errno );
-        return NULL;
-    }
-    trc( "sitePasswordSeed ID: %s\n", mpw_idForBuf( sitePasswordSeed, 32 ) );
-
-    // Determine the template.
-    const char *template = mpw_templateForType( siteType, sitePasswordSeed[0] );
-    trc( "type %d, template: %s\n", siteType, template );
-    if (strlen( template ) > 32) {
-        ftl( "Template too long for password seed: %lu", strlen( template ) );
-        mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
-        return NULL;
-    }
-
-    // Encode the password from the seed using the template.
-    char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
-    for (size_t c = 0; c < strlen( template ); ++c) {
-        sitePassword[c] = mpw_characterFromClass( template[c], sitePasswordSeed[c + 1] );
-        trc( "class %c, index %u (0x%02X) -> character: %c\n", template[c], sitePasswordSeed[c + 1], sitePasswordSeed[c + 1],
-                sitePassword[c] );
-    }
-    mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
-
-    return sitePassword;
-}

MasterPassword/C/mpw-algorithm_v2.c

@@ -1,115 +0,0 @@
-//
-//  mpw-algorithm.c
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#include <string.h>
-#include <errno.h>
-#include <arpa/inet.h>
-
-#include "mpw-types.h"
-#include "mpw-util.h"
-
-#define MP_N                32768
-#define MP_r                8
-#define MP_p                2
-#define MP_hash             PearlHashSHA256
-
-static const uint8_t *mpw_masterKeyForUser_v2(const char *fullName, const char *masterPassword) {
-
-    const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
-    trc( "algorithm: v%d\n", 2 );
-    trc( "fullName: %s (%zu)\n", fullName, mpw_charlen( fullName ) );
-    trc( "masterPassword: %s\n", masterPassword );
-    trc( "key scope: %s\n", mpKeyScope );
-
-    // Calculate the master key salt.
-    // masterKeySalt = mpKeyScope . #fullName . fullName
-    size_t masterKeySaltSize = 0;
-    uint8_t *masterKeySalt = NULL;
-    mpw_pushString( &masterKeySalt, &masterKeySaltSize, mpKeyScope );
-    mpw_pushInt( &masterKeySalt, &masterKeySaltSize, htonl( mpw_charlen( fullName ) ) );
-    mpw_pushString( &masterKeySalt, &masterKeySaltSize, fullName );
-    if (!masterKeySalt) {
-        ftl( "Could not allocate master key salt: %d\n", errno );
-        return NULL;
-    }
-    trc( "masterKeySalt ID: %s\n", mpw_idForBuf( masterKeySalt, masterKeySaltSize ) );
-
-    // Calculate the master key.
-    // masterKey = scrypt( masterPassword, masterKeySalt )
-    const uint8_t *masterKey = mpw_scrypt( MP_dkLen, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
-    mpw_free( masterKeySalt, masterKeySaltSize );
-    if (!masterKey) {
-        ftl( "Could not allocate master key: %d\n", errno );
-        return NULL;
-    }
-    trc( "masterKey ID: %s\n", mpw_idForBuf( masterKey, MP_dkLen ) );
-
-    return masterKey;
-}
-
-static const char *mpw_passwordForSite_v2(const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
-        const MPSiteVariant siteVariant, const char *siteContext) {
-
-    const char *siteScope = mpw_scopeForVariant( siteVariant );
-    trc( "algorithm: v%d\n", 2 );
-    trc( "siteName: %s\n", siteName );
-    trc( "siteCounter: %d\n", siteCounter );
-    trc( "siteVariant: %d\n", siteVariant );
-    trc( "siteType: %d\n", siteType );
-    trc( "site scope: %s, context: %s\n", siteScope, siteContext? "<empty>": siteContext );
-    trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)\n",
-            siteScope, mpw_hex_l( htonl( strlen( siteName ) ) ), siteName,
-            mpw_hex_l( htonl( siteCounter ) ),
-            mpw_hex_l( htonl( siteContext? strlen( siteContext ): 0 ) ), siteContext? "(null)": siteContext );
-
-    // Calculate the site seed.
-    // sitePasswordSeed = hmac-sha256( masterKey, siteScope . #siteName . siteName . siteCounter . #siteContext . siteContext )
-    size_t sitePasswordInfoSize = 0;
-    uint8_t *sitePasswordInfo = NULL;
-    mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteScope );
-    mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( strlen( siteName ) ) );
-    mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteName );
-    mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( siteCounter ) );
-    if (siteContext) {
-        mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( strlen( siteContext ) ) );
-        mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteContext );
-    }
-    if (!sitePasswordInfo) {
-        ftl( "Could not allocate site seed info: %d\n", errno );
-        return NULL;
-    }
-    trc( "sitePasswordInfo ID: %s\n", mpw_idForBuf( sitePasswordInfo, sitePasswordInfoSize ) );
-
-    const uint8_t *sitePasswordSeed = mpw_hmac_sha256( masterKey, MP_dkLen, sitePasswordInfo, sitePasswordInfoSize );
-    mpw_free( sitePasswordInfo, sitePasswordInfoSize );
-    if (!sitePasswordSeed) {
-        ftl( "Could not allocate site seed: %d\n", errno );
-        return NULL;
-    }
-    trc( "sitePasswordSeed ID: %s\n", mpw_idForBuf( sitePasswordSeed, 32 ) );
-
-    // Determine the template.
-    const char *template = mpw_templateForType( siteType, sitePasswordSeed[0] );
-    trc( "type %d, template: %s\n", siteType, template );
-    if (strlen( template ) > 32) {
-        ftl( "Template too long for password seed: %lu", strlen( template ) );
-        mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
-        return NULL;
-    }
-
-    // Encode the password from the seed using the template.
-    char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
-    for (size_t c = 0; c < strlen( template ); ++c) {
-        sitePassword[c] = mpw_characterFromClass( template[c], sitePasswordSeed[c + 1] );
-        trc( "class %c, index %u (0x%02X) -> character: %c\n", template[c], sitePasswordSeed[c + 1], sitePasswordSeed[c + 1],
-                sitePassword[c] );
-    }
-    mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
-
-    return sitePassword;
-}

MasterPassword/C/mpw-algorithm_v3.c

@@ -1,115 +0,0 @@
-//
-//  mpw-algorithm.c
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#include <string.h>
-#include <errno.h>
-#include <arpa/inet.h>
-
-#include "mpw-types.h"
-#include "mpw-util.h"
-
-#define MP_N                32768
-#define MP_r                8
-#define MP_p                2
-#define MP_hash             PearlHashSHA256
-
-static const uint8_t *mpw_masterKeyForUser_v3(const char *fullName, const char *masterPassword) {
-
-    const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
-    trc( "algorithm: v%d\n", 3 );
-    trc( "fullName: %s (%zu)\n", fullName, strlen( fullName ) );
-    trc( "masterPassword: %s\n", masterPassword );
-    trc( "key scope: %s\n", mpKeyScope );
-
-    // Calculate the master key salt.
-    // masterKeySalt = mpKeyScope . #fullName . fullName
-    size_t masterKeySaltSize = 0;
-    uint8_t *masterKeySalt = NULL;
-    mpw_pushString( &masterKeySalt, &masterKeySaltSize, mpKeyScope );
-    mpw_pushInt( &masterKeySalt, &masterKeySaltSize, htonl( strlen( fullName ) ) );
-    mpw_pushString( &masterKeySalt, &masterKeySaltSize, fullName );
-    if (!masterKeySalt) {
-        ftl( "Could not allocate master key salt: %d\n", errno );
-        return NULL;
-    }
-    trc( "masterKeySalt ID: %s\n", mpw_idForBuf( masterKeySalt, masterKeySaltSize ) );
-
-    // Calculate the master key.
-    // masterKey = scrypt( masterPassword, masterKeySalt )
-    const uint8_t *masterKey = mpw_scrypt( MP_dkLen, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
-    mpw_free( masterKeySalt, masterKeySaltSize );
-    if (!masterKey) {
-        ftl( "Could not allocate master key: %d\n", errno );
-        return NULL;
-    }
-    trc( "masterKey ID: %s\n", mpw_idForBuf( masterKey, MP_dkLen ) );
-
-    return masterKey;
-}
-
-static const char *mpw_passwordForSite_v3(const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
-        const MPSiteVariant siteVariant, const char *siteContext) {
-
-    const char *siteScope = mpw_scopeForVariant( siteVariant );
-    trc( "algorithm: v%d\n", 3 );
-    trc( "siteName: %s\n", siteName );
-    trc( "siteCounter: %d\n", siteCounter );
-    trc( "siteVariant: %d\n", siteVariant );
-    trc( "siteType: %d\n", siteType );
-    trc( "site scope: %s, context: %s\n", siteScope, siteContext? "<empty>": siteContext );
-    trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)\n",
-            siteScope, mpw_hex_l( htonl( strlen( siteName ) ) ), siteName,
-            mpw_hex_l( htonl( siteCounter ) ),
-            mpw_hex_l( htonl( siteContext? strlen( siteContext ): 0 ) ), siteContext? "(null)": siteContext );
-
-    // Calculate the site seed.
-    // sitePasswordSeed = hmac-sha256( masterKey, siteScope . #siteName . siteName . siteCounter . #siteContext . siteContext )
-    size_t sitePasswordInfoSize = 0;
-    uint8_t *sitePasswordInfo = NULL;
-    mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteScope );
-    mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( strlen( siteName ) ) );
-    mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteName );
-    mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( siteCounter ) );
-    if (siteContext) {
-        mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( strlen( siteContext ) ) );
-        mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteContext );
-    }
-    if (!sitePasswordInfo) {
-        ftl( "Could not allocate site seed info: %d\n", errno );
-        return NULL;
-    }
-    trc( "sitePasswordInfo ID: %s\n", mpw_idForBuf( sitePasswordInfo, sitePasswordInfoSize ) );
-
-    const uint8_t *sitePasswordSeed = mpw_hmac_sha256( masterKey, MP_dkLen, sitePasswordInfo, sitePasswordInfoSize );
-    mpw_free( sitePasswordInfo, sitePasswordInfoSize );
-    if (!sitePasswordSeed) {
-        ftl( "Could not allocate site seed: %d\n", errno );
-        return NULL;
-    }
-    trc( "sitePasswordSeed ID: %s\n", mpw_idForBuf( sitePasswordSeed, 32 ) );
-
-    // Determine the template.
-    const char *template = mpw_templateForType( siteType, sitePasswordSeed[0] );
-    trc( "type %d, template: %s\n", siteType, template );
-    if (strlen( template ) > 32) {
-        ftl( "Template too long for password seed: %lu", strlen( template ) );
-        mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
-        return NULL;
-    }
-
-    // Encode the password from the seed using the template.
-    char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
-    for (size_t c = 0; c < strlen( template ); ++c) {
-        sitePassword[c] = mpw_characterFromClass( template[c], sitePasswordSeed[c + 1] );
-        trc( "class %c, index %u (0x%02X) -> character: %c\n", template[c], sitePasswordSeed[c + 1], sitePasswordSeed[c + 1],
-                sitePassword[c] );
-    }
-    mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
-
-    return sitePassword;
-}

MasterPassword/C/mpw-bench.c

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

MasterPassword/C/mpw-cli.c

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

MasterPassword/C/mpw-tests-util.h

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

MasterPassword/C/mpw-tests.c

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

MasterPassword/C/mpw-types.c

@@ -1,195 +0,0 @@
-//
-//  mpw-types.c
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 2012-02-01.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifdef COLOR
-#include <curses.h>
-#include <term.h>
-#endif
-
-#include "mpw-types.h"
-#include "mpw-util.h"
-
-const MPSiteType mpw_typeWithName(const char *typeName) {
-
-    // Lower-case and trim optionally leading "Generated" string from typeName to standardize it.
-    size_t stdTypeNameOffset = 0;
-    size_t stdTypeNameSize = strlen( typeName );
-    if (strstr(typeName, "Generated" ) == typeName)
-        stdTypeNameSize -= (stdTypeNameOffset = strlen( "Generated" ));
-    char stdTypeName[stdTypeNameSize + 1];
-    for (size_t c = 0; c < stdTypeNameSize; ++c)
-        stdTypeName[c] = (char)tolower( typeName[c + stdTypeNameOffset] );
-    stdTypeName[stdTypeNameSize] = '\0';
-
-    // Find what site type is represented by the type name.
-    if (0 == strcmp( stdTypeName, "x" ) || 0 == strcmp( stdTypeName, "max" ) || 0 == strcmp( stdTypeName, "maximum" ))
-        return MPSiteTypeGeneratedMaximum;
-    if (0 == strcmp( stdTypeName, "l" ) || 0 == strcmp( stdTypeName, "long" ))
-        return MPSiteTypeGeneratedLong;
-    if (0 == strcmp( stdTypeName, "m" ) || 0 == strcmp( stdTypeName, "med" ) || 0 == strcmp( stdTypeName, "medium" ))
-        return MPSiteTypeGeneratedMedium;
-    if (0 == strcmp( stdTypeName, "b" ) || 0 == strcmp( stdTypeName, "basic" ))
-        return MPSiteTypeGeneratedBasic;
-    if (0 == strcmp( stdTypeName, "s" ) || 0 == strcmp( stdTypeName, "short" ))
-        return MPSiteTypeGeneratedShort;
-    if (0 == strcmp( stdTypeName, "i" ) || 0 == strcmp( stdTypeName, "pin" ))
-        return MPSiteTypeGeneratedPIN;
-    if (0 == strcmp( stdTypeName, "n" ) || 0 == strcmp( stdTypeName, "name" ))
-        return MPSiteTypeGeneratedName;
-    if (0 == strcmp( stdTypeName, "p" ) || 0 == strcmp( stdTypeName, "phrase" ))
-        return MPSiteTypeGeneratedPhrase;
-
-    ftl( "Not a generated type name: %s", stdTypeName );
-}
-
-const char **mpw_templatesForType(MPSiteType type, size_t *count) {
-
-    if (!(type & MPSiteTypeClassGenerated)) {
-        ftl( "Not a generated type: %d", type );
-        *count = 0;
-        return NULL;
-    }
-
-    switch (type) {
-        case MPSiteTypeGeneratedMaximum: {
-            return alloc_array( *count, const char *,
-                    "anoxxxxxxxxxxxxxxxxx", "axxxxxxxxxxxxxxxxxno" );
-        }
-        case MPSiteTypeGeneratedLong: {
-            return alloc_array( *count, const char *,
-                    "CvcvnoCvcvCvcv", "CvcvCvcvnoCvcv", "CvcvCvcvCvcvno",
-                    "CvccnoCvcvCvcv", "CvccCvcvnoCvcv", "CvccCvcvCvcvno",
-                    "CvcvnoCvccCvcv", "CvcvCvccnoCvcv", "CvcvCvccCvcvno",
-                    "CvcvnoCvcvCvcc", "CvcvCvcvnoCvcc", "CvcvCvcvCvccno",
-                    "CvccnoCvccCvcv", "CvccCvccnoCvcv", "CvccCvccCvcvno",
-                    "CvcvnoCvccCvcc", "CvcvCvccnoCvcc", "CvcvCvccCvccno",
-                    "CvccnoCvcvCvcc", "CvccCvcvnoCvcc", "CvccCvcvCvccno" );
-        }
-        case MPSiteTypeGeneratedMedium: {
-            return alloc_array( *count, const char *,
-                    "CvcnoCvc", "CvcCvcno" );
-        }
-        case MPSiteTypeGeneratedBasic: {
-            return alloc_array( *count, const char *,
-                    "aaanaaan", "aannaaan", "aaannaaa" );
-        }
-        case MPSiteTypeGeneratedShort: {
-            return alloc_array( *count, const char *,
-                    "Cvcn" );
-        }
-        case MPSiteTypeGeneratedPIN: {
-            return alloc_array( *count, const char *,
-                    "nnnn" );
-        }
-        case MPSiteTypeGeneratedName: {
-            return alloc_array( *count, const char *,
-                    "cvccvcvcv" );
-        }
-        case MPSiteTypeGeneratedPhrase: {
-            return alloc_array( *count, const char *,
-                    "cvcc cvc cvccvcv cvc", "cvc cvccvcvcv cvcv", "cv cvccv cvc cvcvccv" );
-        }
-        default: {
-            ftl( "Unknown generated type: %d", type );
-            *count = 0;
-            return NULL;
-        }
-    }
-}
-
-const char *mpw_templateForType(MPSiteType type, uint8_t seedByte) {
-
-    size_t count = 0;
-    const char **templates = mpw_templatesForType( type, &count );
-    if (!count)
-        return NULL;
-
-    char const *template = templates[seedByte % count];
-    free( templates );
-    return template;
-}
-
-const MPSiteVariant mpw_variantWithName(const char *variantName) {
-
-    // Lower-case and trim optionally leading "generated" string from typeName to standardize it.
-    size_t stdVariantNameSize = strlen( variantName );
-    char stdVariantName[stdVariantNameSize + 1];
-    for (size_t c = 0; c < stdVariantNameSize; ++c)
-        stdVariantName[c] = (char)tolower( variantName[c] );
-    stdVariantName[stdVariantNameSize] = '\0';
-
-    if (0 == strcmp( stdVariantName, "p" ) || 0 == strcmp( stdVariantName, "password" ))
-        return MPSiteVariantPassword;
-    if (0 == strcmp( stdVariantName, "l" ) || 0 == strcmp( stdVariantName, "login" ))
-        return MPSiteVariantLogin;
-    if (0 == strcmp( stdVariantName, "a" ) || 0 == strcmp( stdVariantName, "answer" ))
-        return MPSiteVariantAnswer;
-
-    fprintf( stderr, "Not a variant name: %s", stdVariantName );
-    abort();
-}
-
-const char *mpw_scopeForVariant(MPSiteVariant variant) {
-
-    switch (variant) {
-        case MPSiteVariantPassword: {
-            return "com.lyndir.masterpassword";
-        }
-        case MPSiteVariantLogin: {
-            return "com.lyndir.masterpassword.login";
-        }
-        case MPSiteVariantAnswer: {
-            return "com.lyndir.masterpassword.answer";
-        }
-        default: {
-            fprintf( stderr, "Unknown variant: %d", variant );
-            abort();
-        }
-    }
-}
-
-const char *mpw_charactersInClass(char characterClass) {
-
-    switch (characterClass) {
-        case 'V':
-            return "AEIOU";
-        case 'C':
-            return "BCDFGHJKLMNPQRSTVWXYZ";
-        case 'v':
-            return "aeiou";
-        case 'c':
-            return "bcdfghjklmnpqrstvwxyz";
-        case 'A':
-            return "AEIOUBCDFGHJKLMNPQRSTVWXYZ";
-        case 'a':
-            return "AEIOUaeiouBCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz";
-        case 'n':
-            return "0123456789";
-        case 'o':
-            return "@&%?,=[]_:-+*$#!'^~;()/.";
-        case 'x':
-            return "AEIOUaeiouBCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz0123456789!@#$%^&*()";
-        case ' ':
-            return " ";
-        default: {
-            fprintf( stderr, "Unknown character class: %c", characterClass );
-            abort();
-        }
-    }
-}
-
-const char mpw_characterFromClass(char characterClass, uint8_t seedByte) {
-
-    const char *classCharacters = mpw_charactersInClass( characterClass );
-    return classCharacters[seedByte % strlen( classCharacters )];
-}

MasterPassword/C/mpw-types.h

@@ -1,99 +0,0 @@
-//
-//  mpw-types.h
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 2012-02-01.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#ifndef _MPW_TYPES_H
-#define _MPW_TYPES_H
-#include <stdlib.h>
-#include <stdint.h>
-
-#ifdef NS_ENUM
-#define enum(_type, _name) NS_ENUM(_type, _name)
-#else
-#define enum(_type, _name) _type _name; enum
-#endif
-
-#define MP_dkLen            64
-
-//// Types.
-
-typedef enum( unsigned int, MPSiteVariant ) {
-    /** Generate the password to log in with. */
-            MPSiteVariantPassword,
-    /** Generate the login name to log in as. */
-            MPSiteVariantLogin,
-    /** Generate the answer to a security question. */
-            MPSiteVariantAnswer,
-};
-
-typedef enum( unsigned int, MPSiteTypeClass ) {
-    /** Generate the password. */
-            MPSiteTypeClassGenerated = 1 << 4,
-    /** Store the password. */
-            MPSiteTypeClassStored = 1 << 5,
-};
-
-typedef enum( unsigned int, MPSiteFeature ) {
-    /** Export the key-protected content data. */
-            MPSiteFeatureExportContent = 1 << 10,
-    /** Never export content. */
-            MPSiteFeatureDevicePrivate = 1 << 11,
-};
-
-typedef enum( unsigned int, MPSiteType) {
-    MPSiteTypeGeneratedMaximum = 0x0 | MPSiteTypeClassGenerated | 0x0,
-    MPSiteTypeGeneratedLong = 0x1 | MPSiteTypeClassGenerated | 0x0,
-    MPSiteTypeGeneratedMedium = 0x2 | MPSiteTypeClassGenerated | 0x0,
-    MPSiteTypeGeneratedBasic = 0x4 | MPSiteTypeClassGenerated | 0x0,
-    MPSiteTypeGeneratedShort = 0x3 | MPSiteTypeClassGenerated | 0x0,
-    MPSiteTypeGeneratedPIN = 0x5 | MPSiteTypeClassGenerated | 0x0,
-    MPSiteTypeGeneratedName = 0xE | MPSiteTypeClassGenerated | 0x0,
-    MPSiteTypeGeneratedPhrase = 0xF | MPSiteTypeClassGenerated | 0x0,
-
-    MPSiteTypeStoredPersonal = 0x0 | MPSiteTypeClassStored | MPSiteFeatureExportContent,
-    MPSiteTypeStoredDevicePrivate = 0x1 | MPSiteTypeClassStored | MPSiteFeatureDevicePrivate,
-};
-
-//// Type utilities.
-
-/**
- * @return The variant represented by the given name.
- */
-const MPSiteVariant mpw_variantWithName(const char *variantName);
-/**
- * @return An internal string containing the scope identifier to apply when encoding for the given variant.
- */
-const char *mpw_scopeForVariant(MPSiteVariant variant);
-
-/**
- * @return The type represented by the given name.
- */
-const MPSiteType mpw_typeWithName(const char *typeName);
-
-/**
- * @return A newly allocated array of internal strings that express the templates to use for the given type.
- *         The amount of elements in the array is stored in count.
- *         If an unsupported type is given, count will be 0 and will return NULL.
-*          The array needs to be free'ed, the strings themselves must not be free'ed or modified.
- */
-const char **mpw_templatesForType(MPSiteType type, size_t *count);
-/**
- * @return An internal string that contains the password encoding template of the given type
- *         for a seed that starts with the given byte.
- */
-const char *mpw_templateForType(MPSiteType type, uint8_t seedByte);
-
-/**
- * @return An internal string that contains all the characters that occur in the given character class.
- */
-const char *mpw_charactersInClass(char characterClass);
-/**
- * @return A character from given character class that encodes the given byte.
- */
-const char mpw_characterFromClass(char characterClass, uint8_t seedByte);
-
-#endif // _MPW_TYPES_H

MasterPassword/C/mpw-util.c

@@ -1,218 +0,0 @@
-//
-//  mpw-util.c
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef COLOR
-#include <unistd.h>
-#include <curses.h>
-#include <term.h>
-#endif
-
-#include <scrypt/sha256.h>
-#include <scrypt/crypto_scrypt.h>
-
-#include "mpw-util.h"
-
-void mpw_pushBuf(uint8_t **const buffer, size_t *const bufferSize, const void *pushBuffer, const size_t pushSize) {
-
-    if (*bufferSize == (size_t)-1)
-        // The buffer was marked as broken, it is missing a previous push.  Abort to avoid corrupt content.
-        return;
-
-    *bufferSize += pushSize;
-    uint8_t *resizedBuffer = realloc( *buffer, *bufferSize );
-    if (!resizedBuffer) {
-        // realloc failed, we can't push.  Mark the buffer as broken.
-        mpw_free( *buffer, *bufferSize - pushSize );
-        *bufferSize = (size_t)-1;
-        *buffer = NULL;
-        return;
-    }
-
-    *buffer = resizedBuffer;
-    uint8_t *pushDst = *buffer + *bufferSize - pushSize;
-    memcpy( pushDst, pushBuffer, pushSize );
-}
-
-void mpw_pushString(uint8_t **buffer, size_t *const bufferSize, const char *pushString) {
-
-    mpw_pushBuf( buffer, bufferSize, pushString, strlen( pushString ) );
-}
-
-void mpw_pushInt(uint8_t **const buffer, size_t *const bufferSize, const uint32_t pushInt) {
-
-    mpw_pushBuf( buffer, bufferSize, &pushInt, sizeof( pushInt ) );
-}
-
-void mpw_free(const void *buffer, const size_t bufferSize) {
-
-    memset( (void *)buffer, 0, bufferSize );
-    free( (void *)buffer );
-}
-
-void mpw_freeString(const char *string) {
-
-    mpw_free( string, strlen( string ) );
-}
-
-uint8_t const *mpw_scrypt(const size_t keySize, const char *secret, const uint8_t *salt, const size_t saltSize,
-        uint64_t N, uint32_t r, uint32_t p) {
-
-    uint8_t *key = malloc( keySize );
-    if (!key)
-        return NULL;
-
-    if (crypto_scrypt( (const uint8_t *)secret, strlen( secret ), salt, saltSize, N, r, p, key, keySize ) < 0) {
-        mpw_free( key, keySize );
-        return NULL;
-    }
-
-    return key;
-}
-
-uint8_t const *mpw_hmac_sha256(const uint8_t *key, const size_t keySize, const uint8_t *salt, const size_t saltSize) {
-
-    uint8_t *const buffer = malloc( 32 );
-    if (!buffer)
-        return NULL;
-
-    HMAC_SHA256_Buf( key, keySize, salt, saltSize, buffer );
-    return buffer;
-}
-
-const char *mpw_idForBuf(const void *buf, size_t length) {
-
-    uint8_t hash[32];
-    SHA256_Buf( buf, length, hash );
-
-    return mpw_hex( hash, 32 );
-}
-
-static char **mpw_hex_buf = NULL;
-static unsigned int mpw_hex_buf_i = 0;
-
-const char *mpw_hex(const void *buf, size_t length) {
-
-    // FIXME
-    if (!mpw_hex_buf) {
-        mpw_hex_buf = malloc( 10 * sizeof( char * ) );
-        for (uint8_t i = 0; i < 10; ++i)
-            mpw_hex_buf[i] = NULL;
-    }
-    mpw_hex_buf_i = (mpw_hex_buf_i + 1) % 10;
-
-    mpw_hex_buf[mpw_hex_buf_i] = realloc( mpw_hex_buf[mpw_hex_buf_i], length * 2 + 1 );
-    for (size_t kH = 0; kH < length; kH++)
-        sprintf( &(mpw_hex_buf[mpw_hex_buf_i][kH * 2]), "%02X", ((const uint8_t *)buf)[kH] );
-
-    return mpw_hex_buf[mpw_hex_buf_i];
-}
-
-const char *mpw_hex_l(uint32_t number) {
-
-    return mpw_hex( &number, sizeof( number ) );
-}
-
-#ifdef COLOR
-static int putvari;
-static char *putvarc = NULL;
-static int istermsetup = 0;
-static void initputvar() {
-    if (putvarc)
-        free(putvarc);
-    putvarc=(char *)calloc(256, sizeof(char));
-    putvari=0;
-
-    if (!istermsetup)
-        istermsetup = (OK == setupterm(NULL, STDERR_FILENO, NULL));
-}
-static int putvar(int c) {
-    putvarc[putvari++]=c;
-    return 0;
-}
-#endif
-
-const char *mpw_identicon(const char *fullName, const char *masterPassword) {
-
-    const char *leftArm[] = { "╔", "╚", "╰", "═" };
-    const char *rightArm[] = { "╗", "╝", "╯", "═" };
-    const char *body[] = { "█", "░", "▒", "▓", "☺", "☻" };
-    const char *accessory[] = {
-            "◈", "◎", "◐", "◑", "◒", "◓", "☀", "☁", "☂", "☃", "☄", "★", "☆", "☎", "☏", "⎈", "⌂", "☘", "☢", "☣",
-            "☕", "⌚", "⌛", "⏰", "⚡", "⛄", "⛅", "☔", "♔", "♕", "♖", "♗", "♘", "♙", "♚", "♛", "♜", "♝", "♞", "♟",
-            "♨", "♩", "♪", "♫", "⚐", "⚑", "⚔", "⚖", "⚙", "⚠", "⌘", "⏎", "✄", "✆", "✈", "✉", "✌"
-    };
-
-    uint8_t identiconSeed[32];
-    HMAC_SHA256_Buf( masterPassword, strlen( masterPassword ), fullName, strlen( fullName ), identiconSeed );
-
-    char *colorString, *resetString;
-#ifdef COLOR
-    if (isatty( STDERR_FILENO )) {
-        uint8_t colorIdentifier = (uint8_t)(identiconSeed[4] % 7 + 1);
-        initputvar();
-        tputs(tparm(tgetstr("AF", NULL), colorIdentifier), 1, putvar);
-        colorString = calloc(strlen(putvarc) + 1, sizeof(char));
-        strcpy(colorString, putvarc);
-        tputs(tgetstr("me", NULL), 1, putvar);
-        resetString = calloc(strlen(putvarc) + 1, sizeof(char));
-        strcpy(resetString, putvarc);
-    } else
-#endif
-    {
-        colorString = calloc( 1, sizeof( char ) );
-        resetString = calloc( 1, sizeof( char ) );
-    }
-
-    char *identicon = (char *)calloc( 256, sizeof( char ) );
-    snprintf( identicon, 256, "%s%s%s%s%s%s",
-            colorString,
-            leftArm[identiconSeed[0] % (sizeof( leftArm ) / sizeof( leftArm[0] ))],
-            body[identiconSeed[1] % (sizeof( body ) / sizeof( body[0] ))],
-            rightArm[identiconSeed[2] % (sizeof( rightArm ) / sizeof( rightArm[0] ))],
-            accessory[identiconSeed[3] % (sizeof( accessory ) / sizeof( accessory[0] ))],
-            resetString );
-
-    free( colorString );
-    free( resetString );
-    return identicon;
-}
-
-/**
-* @return the amount of bytes used by UTF-8 to encode a single character that starts with the given byte.
-*/
-static int mpw_charByteSize(unsigned char utf8Byte) {
-
-    if (!utf8Byte)
-        return 0;
-    if ((utf8Byte & 0x80) == 0)
-        return 1;
-    if ((utf8Byte & 0xC0) != 0xC0)
-        return 0;
-    if ((utf8Byte & 0xE0) == 0xC0)
-        return 2;
-    if ((utf8Byte & 0xF0) == 0xE0)
-        return 3;
-    if ((utf8Byte & 0xF8) == 0xF0)
-        return 4;
-
-    return 0;
-}
-
-const size_t mpw_charlen(const char *utf8String) {
-
-    size_t charlen = 0;
-    char *remainingString = (char *)utf8String;
-    for (int charByteSize; (charByteSize = mpw_charByteSize( (unsigned char)*remainingString )); remainingString += charByteSize)
-        ++charlen;
-
-    return charlen;
-}

MasterPassword/C/mpw-util.h

@@ -1,109 +0,0 @@
-//
-//  mpw-util.h
-//  MasterPassword
-//
-//  Created by Maarten Billemont on 2014-12-20.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#include <stdio.h>
-#include <stdint.h>
-
-//// Logging.
-
-#ifndef trc
-int mpw_verbosity;
-    #define trc_level 3
-    #define trc(...) \
-        if (mpw_verbosity >= 3) \
-            fprintf( stderr, __VA_ARGS__ )
-#endif
-#ifndef dbg
-    #define dbg_level 2
-    #define dbg(...) \
-        if (mpw_verbosity >= 2) \
-            fprintf( stderr, __VA_ARGS__ )
-#endif
-#ifndef inf
-    #define inf_level 1
-    #define inf(...) \
-        if (mpw_verbosity >= 1) \
-            fprintf( stderr, __VA_ARGS__ )
-#endif
-#ifndef wrn
-    #define wrn_level 0
-    #define wrn(...) \
-        if (mpw_verbosity >= 0) \
-            fprintf( stderr, __VA_ARGS__ )
-#endif
-#ifndef err
-    #define err_level -1
-    #define err(...) \
-        if (mpw_verbosity >= -1) \
-            fprintf( stderr, __VA_ARGS__ )
-#endif
-#ifndef ftl
-    #define ftl_level -2
-    #define ftl(...) \
-        do { \
-            if (mpw_verbosity >= -2) \
-                fprintf( stderr, __VA_ARGS__ ); \
-            exit( 2 ); \
-        } while (0)
-#endif
-
-//// Buffers and memory.
-
-#define alloc_array(_count, _type, ...) ({ \
-    _type stackElements[] = { __VA_ARGS__ }; \
-    _count = sizeof( stackElements ) / sizeof( _type ); \
-    _type *allocElements = malloc( sizeof( stackElements ) ); \
-    memcpy( allocElements, stackElements, sizeof( stackElements ) ); \
-    allocElements; \
- })
-
-/** Push a buffer onto a buffer.  reallocs the given buffer and appends the given buffer. */
-void mpw_pushBuf(
-        uint8_t **const buffer, size_t *const bufferSize, const void *pushBuffer, const size_t pushSize);
-/** Push a string onto a buffer.  reallocs the given buffer and appends the given string. */
-void mpw_pushString(
-        uint8_t **buffer, size_t *const bufferSize, const char *pushString);
-/** Push an integer onto a buffer.  reallocs the given buffer and appends the given integer. */
-void mpw_pushInt(
-        uint8_t **const buffer, size_t *const bufferSize, const uint32_t pushInt);
-/** Free a buffer after zero'ing its contents. */
-void mpw_free(
-        const void *buffer, const size_t bufferSize);
-/** Free a string after zero'ing its contents. */
-void mpw_freeString(
-        const char *string);
-
-//// Cryptographic functions.
-
-/** Perform a scrypt-based key derivation on the given key using the given salt and scrypt parameters.
-  * @return A new keySize-size allocated buffer. */
-uint8_t const *mpw_scrypt(
-        const size_t keySize, const char *secret, const uint8_t *salt, const size_t saltSize,
-        uint64_t N, uint32_t r, uint32_t p);
-/** Calculate a SHA256-based HMAC by encrypting the given salt with the given key.
-  * @return A new 32-byte allocated buffer. */
-uint8_t const *mpw_hmac_sha256(
-        const uint8_t *key, const size_t keySize, const uint8_t *salt, const size_t saltSize);
-
-//// Visualizers.
-
-/** Encode a buffer as a string of hexadecimal characters.
-  * @return A C-string in a reused buffer, do not free or store it. */
-const char *mpw_hex(const void *buf, size_t length);
-const char *mpw_hex_l(uint32_t number);
-/** Encode a fingerprint for a buffer.
-  * @return A C-string in a reused buffer, do not free or store it. */
-const char *mpw_idForBuf(const void *buf, size_t length);
-/** Encode a visual fingerprint for a user.
-  * @return A newly allocated string. */
-const char *mpw_identicon(const char *fullName, const char *masterPassword);
-
-//// String utilities.
-
-/** @return The amount of display characters in the given UTF-8 string. */
-const size_t mpw_charlen(const char *utf8String);

MasterPassword/C/mpw_tests.xml

@@ -1 +0,0 @@
-../Java/masterpassword-algorithm/src/test/resources/mpw_tests.xml

MasterPassword/Java/.gitignore

@@ -1,2 +0,0 @@
-target
-dependency-reduced-pom.xml

MasterPassword/Java/masterpassword-algorithm/pom.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <!-- PROJECT METADATA -->
-    <parent>
-        <groupId>com.lyndir.masterpassword</groupId>
-        <artifactId>masterpassword</artifactId>
-        <version>2.4-java</version>
-    </parent>
-
-    <name>Master Password Algorithm Implementation</name>
-    <description>The implementation of the Master Password algorithm</description>
-
-    <artifactId>masterpassword-algorithm</artifactId>
-    <packaging>jar</packaging>
-
-    <!-- DEPENDENCY MANAGEMENT -->
-    <dependencies>
-
-        <!-- PROJECT REFERENCES -->
-        <dependency>
-            <groupId>com.lyndir.lhunath.opal</groupId>
-            <artifactId>opal-system</artifactId>
-            <version>1.6-p9</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>joda-time</groupId>
-                    <artifactId>joda-time</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- EXTERNAL DEPENDENCIES -->
-        <dependency>
-            <groupId>com.lambdaworks</groupId>
-            <artifactId>scrypt</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-
-    </dependencies>
-
-</project>

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

@@ -1,79 +0,0 @@
-package com.lyndir.masterpassword;
-
-import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
-
-import com.google.common.base.Charsets;
-import com.lyndir.lhunath.opal.system.MessageAuthenticationDigests;
-import com.lyndir.lhunath.opal.system.logging.Logger;
-import java.nio.*;
-import java.nio.charset.Charset;
-import java.util.Arrays;
-
-
-/**
- * @author lhunath, 15-03-29
- */
-public class MPIdenticon {
-
-    @SuppressWarnings("UnusedDeclaration")
-    private static final Logger logger = Logger.get( MPIdenticon.class );
-
-    private static final Charset charset   = Charsets.UTF_8;
-    private static final Color[] colors    = new Color[]{
-            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 final String fullName;
-    private final Color  color;
-    private final String text;
-
-    public MPIdenticon(String fullName, String masterPassword) {
-        this( fullName, masterPassword.toCharArray() );
-    }
-
-    public MPIdenticon(String fullName, char[] masterPassword) {
-        this.fullName = fullName;
-
-        byte[] masterPasswordBytes = charset.encode( CharBuffer.wrap( masterPassword ) ).array();
-        ByteBuffer identiconSeedBytes = ByteBuffer.wrap(
-                MessageAuthenticationDigests.HmacSHA256.of( masterPasswordBytes, fullName.getBytes( charset ) ) );
-        Arrays.fill( masterPasswordBytes, (byte) 0 );
-
-        IntBuffer identiconSeedBuffer = IntBuffer.allocate( identiconSeedBytes.capacity() );
-        while (identiconSeedBytes.hasRemaining())
-            identiconSeedBuffer.put( identiconSeedBytes.get() & 0xFF );
-        int[] identiconSeed = identiconSeedBuffer.array();
-
-        color = colors[identiconSeed[4] % colors.length];
-        text = strf( "%c%c%c%c", leftArm[identiconSeed[0] % leftArm.length], body[identiconSeed[1] % body.length],
-                     rightArm[identiconSeed[2] % rightArm.length], accessory[identiconSeed[3] % accessory.length] );
-    }
-
-    public String getFullName() {
-        return fullName;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public Color getColor() {
-        return color;
-    }
-
-    public enum Color {
-        RED,
-        GREEN,
-        YELLOW,
-        BLUE,
-        MAGENTA,
-        CYAN,
-        MONO
-    }
-}

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

@@ -1,218 +0,0 @@
-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 javax.annotation.Nullable;
-import org.jetbrains.annotations.Contract;
-
-
-/**
- * <i>07 04, 2012</i>
- *
- * @author lhunath
- */
-public enum MPSiteType {
-
-    GeneratedMaximum( "Max", "20 characters, contains symbols.", //
-                      ImmutableList.of( "x", "max", "maximum" ), //
-                      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( new MPTemplate( "CvcvnoCvcvCvcv" ), new MPTemplate( "CvcvCvcvnoCvcv" ),
-                                     new MPTemplate( "CvcvCvcvCvcvno" ), new MPTemplate( "CvccnoCvcvCvcv" ),
-                                     new MPTemplate( "CvccCvcvnoCvcv" ), new MPTemplate( "CvccCvcvCvcvno" ),
-                                     new MPTemplate( "CvcvnoCvccCvcv" ), new MPTemplate( "CvcvCvccnoCvcv" ),
-                                     new MPTemplate( "CvcvCvccCvcvno" ), new MPTemplate( "CvcvnoCvcvCvcc" ),
-                                     new MPTemplate( "CvcvCvcvnoCvcc" ), new MPTemplate( "CvcvCvcvCvccno" ),
-                                     new MPTemplate( "CvccnoCvccCvcv" ), new MPTemplate( "CvccCvccnoCvcv" ),
-                                     new MPTemplate( "CvccCvccCvcvno" ), new MPTemplate( "CvcvnoCvccCvcc" ),
-                                     new MPTemplate( "CvcvCvccnoCvcc" ), new MPTemplate( "CvcvCvccCvccno" ),
-                                     new MPTemplate( "CvccnoCvcvCvcc" ), new MPTemplate( "CvccCvcvnoCvcc" ),
-                                     new MPTemplate( "CvccCvcvCvccno" ) ), //
-                   MPSiteTypeClass.Generated, 0x1 ),
-
-    GeneratedMedium( "Medium", "Copy-friendly, 8 characters, contains symbols.", //
-                     ImmutableList.of( "m", "med", "medium" ), //
-                     ImmutableList.of( new MPTemplate( "CvcnoCvc" ), new MPTemplate( "CvcCvcno" ) ), //
-                     MPSiteTypeClass.Generated, 0x2 ),
-
-    GeneratedBasic( "Basic", "8 characters, no symbols.", //
-                    ImmutableList.of( "b", "basic" ), //
-                    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( new MPTemplate( "Cvcn" ) ), //
-                    MPSiteTypeClass.Generated, 0x4 ),
-
-    GeneratedPIN( "PIN", "4 numbers.", //
-                  ImmutableList.of( "i", "pin" ), //
-                  ImmutableList.of( new MPTemplate( "nnnn" ) ), //
-                  MPSiteTypeClass.Generated, 0x5 ),
-
-    GeneratedName( "Name", "9 letter name.", //
-                   ImmutableList.of( "n", "name" ), //
-                   ImmutableList.of( new MPTemplate( "cvccvcvcv" ) ), //
-                   MPSiteTypeClass.Generated, 0xE ),
-
-    GeneratedPhrase( "Phrase", "20 character sentence.", //
-                     ImmutableList.of( "p", "phrase" ), //
-                     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.<MPTemplate>of(), //
-                    MPSiteTypeClass.Stored, 0x0, MPSiteFeature.ExportContent ),
-
-    StoredDevicePrivate( "Device", "AES-encrypted, not exported.", //
-                         ImmutableList.of( "device" ), //
-                         ImmutableList.<MPTemplate>of(), //
-                         MPSiteTypeClass.Stored, 0x1, MPSiteFeature.DevicePrivate );
-
-    static final Logger logger = Logger.get( MPSiteType.class );
-
-    private final String             shortName;
-    private final String             description;
-    private final List<String>       options;
-    private final List<MPTemplate>   templates;
-    private final MPSiteTypeClass    typeClass;
-    private final int                typeIndex;
-    private final Set<MPSiteFeature> typeFeatures;
-
-    MPSiteType(final String shortName, final String description, final List<String> options, final List<MPTemplate> templates,
-               final MPSiteTypeClass typeClass, final int typeIndex, final MPSiteFeature... typeFeatures) {
-
-        this.shortName = shortName;
-        this.description = description;
-        this.options = options;
-        this.templates = templates;
-        this.typeClass = typeClass;
-        this.typeIndex = typeIndex;
-
-        ImmutableSet.Builder<MPSiteFeature> typeFeaturesBuilder = ImmutableSet.builder();
-        for (final MPSiteFeature typeFeature : typeFeatures) {
-            typeFeaturesBuilder.add( typeFeature );
-        }
-        this.typeFeatures = typeFeaturesBuilder.build();
-    }
-
-    public String getShortName() {
-        return shortName;
-    }
-
-    public String getDescription() {
-
-        return description;
-    }
-
-    public List<String> getOptions() {
-        return options;
-    }
-
-    public MPSiteTypeClass getTypeClass() {
-
-        return typeClass;
-    }
-
-    public Set<MPSiteFeature> getTypeFeatures() {
-
-        return typeFeatures;
-    }
-
-    public int getType() {
-        int mask = typeIndex | typeClass.getMask();
-        for (MPSiteFeature typeFeature : typeFeatures)
-            mask |= typeFeature.getMask();
-
-        return mask;
-    }
-
-    /**
-     * @param option The option to select a type with.  It is matched case insensitively.
-     *
-     * @return The type registered for the given option.
-     */
-    public static MPSiteType forOption(final String option) {
-
-        for (final MPSiteType type : values())
-            if (type.getOptions().contains( option.toLowerCase() ))
-                return type;
-
-        throw logger.bug( "No type for option: %s", option );
-    }
-
-    /**
-     * @param name The name fromInt the type to look up.  It is matched case insensitively.
-     *
-     * @return The type registered with the given name.
-     */
-    @Contract("!null -> !null, null -> null")
-    public static MPSiteType forName(@Nullable final String name) {
-
-        if (name == null)
-            return null;
-
-        for (final MPSiteType type : values())
-            if (type.name().equalsIgnoreCase( name ))
-                return type;
-
-        throw logger.bug( "No type for name: %s", name );
-    }
-
-    /**
-     * @param typeClass The class for which we look up types.
-     *
-     * @return All types that support the given class.
-     */
-    public static ImmutableList<MPSiteType> forClass(final MPSiteTypeClass typeClass) {
-
-        ImmutableList.Builder<MPSiteType> types = ImmutableList.builder();
-        for (final MPSiteType type : values())
-            if (type.getTypeClass() == typeClass)
-                types.add( type );
-
-        return types.build();
-    }
-
-    /**
-     * @param type The type for which we look up types.
-     *
-     * @return The type registered with the given type.
-     */
-    public static MPSiteType forType(final int type) {
-
-        for (MPSiteType siteType : values())
-            if (siteType.getType() == type)
-                return siteType;
-
-        throw logger.bug( "No type: %s", type );
-    }
-
-    /**
-     * @param mask The mask for which we look up types.
-     *
-     * @return All types that support the given mask.
-     */
-    public static ImmutableList<MPSiteType> forMask(final int mask) {
-
-        int typeMask = mask & ~0xF;
-        ImmutableList.Builder<MPSiteType> types = ImmutableList.builder();
-        for (MPSiteType siteType : values())
-            if (((siteType.getType() & ~0xF) & typeMask) != 0)
-                types.add( siteType );
-
-        return types.build();
-    }
-
-    public MPTemplate getTemplateAtRollingIndex(final int templateIndex) {
-        return templates.get( templateIndex % templates.size() );
-    }
-}

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

@@ -1,83 +0,0 @@
-package com.lyndir.masterpassword;
-
-import com.google.common.collect.ImmutableList;
-import com.lyndir.lhunath.opal.system.logging.Logger;
-import java.util.List;
-import javax.annotation.Nullable;
-import org.jetbrains.annotations.Contract;
-
-
-/**
- * @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" );
-
-    static final Logger logger = Logger.get( MPSiteType.class );
-
-    private final String       description;
-    private final String       contextDescription;
-    private final List<String> options;
-    private final String       scope;
-
-    MPSiteVariant(final String description, final String contextDescription, final List<String> options, final String scope) {
-        this.contextDescription = contextDescription;
-
-        this.options = options;
-        this.description = description;
-        this.scope = scope;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public String getContextDescription() {
-        return contextDescription;
-    }
-
-    public List<String> getOptions() {
-        return options;
-    }
-
-    public String getScope() {
-        return scope;
-    }
-
-    /**
-     * @param option The option to select a variant with.  It is matched case insensitively.
-     *
-     * @return The variant registered for the given option.
-     */
-    public static MPSiteVariant forOption(final String option) {
-
-        for (final MPSiteVariant variant : values())
-            if (variant.getOptions().contains( option.toLowerCase() ))
-                return variant;
-
-        throw logger.bug( "No variant for option: %s", option );
-    }
-    /**
-     * @param name The name fromInt the variant to look up.  It is matched case insensitively.
-     *
-     * @return The variant registered with the given name.
-     */
-    @Contract("!null -> !null, null -> null")
-    public static MPSiteVariant forName(@Nullable final String name) {
-
-        if (name == null)
-            return null;
-
-        for (final MPSiteVariant type : values())
-            if (type.name().equalsIgnoreCase( name ))
-                return type;
-
-        throw logger.bug( "No variant for name: %s", name );
-    }
-
-}

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

@@ -1,196 +0,0 @@
-package com.lyndir.masterpassword;
-
-import com.google.common.base.Preconditions;
-import com.google.common.primitives.UnsignedInteger;
-import com.lyndir.lhunath.opal.system.*;
-import com.lyndir.lhunath.opal.system.logging.Logger;
-import java.util.Arrays;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.jetbrains.annotations.NotNull;
-
-
-/**
- * @author lhunath, 2014-08-30
- */
-public abstract class MasterKey {
-
-    @SuppressWarnings("UnusedDeclaration")
-    private static final Logger  logger               = Logger.get( MasterKey.class );
-    private static       boolean allowNativeByDefault = true;
-
-    @Nonnull
-    private final String fullName;
-    private boolean allowNative = allowNativeByDefault;
-
-    @Nullable
-    private byte[] masterKey;
-
-    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) {
-
-        switch (version) {
-            case V0:
-                return new MasterKeyV0( fullName ).revalidate( masterPassword );
-            case V1:
-                return new MasterKeyV1( fullName ).revalidate( masterPassword );
-            case V2:
-                return new MasterKeyV2( fullName ).revalidate( masterPassword );
-            case V3:
-                return new MasterKeyV3( fullName ).revalidate( masterPassword );
-        }
-
-        throw new UnsupportedOperationException( "Unsupported version: " + version );
-    }
-
-    public static boolean isAllowNativeByDefault() {
-        return allowNativeByDefault;
-    }
-
-    /**
-     * Native libraries are useful for speeding up the performance of cryptographical functions.
-     * Sometimes, however, we may prefer to use Java-only code.
-     * For instance, for auditability / trust or because the native code doesn't work on our CPU/platform.
-     * <p/>
-     * This setter affects the default setting for any newly created {@link MasterKey}s.
-     *
-     * @param allowNative false to disallow the use of native libraries.
-     */
-    public static void setAllowNativeByDefault(final boolean allowNative) {
-        allowNativeByDefault = allowNative;
-    }
-
-    protected MasterKey(@NotNull final String fullName) {
-
-        this.fullName = fullName;
-        logger.trc( "fullName: %s", fullName );
-    }
-
-    @Nullable
-    protected abstract byte[] deriveKey(final char[] masterPassword);
-
-    public abstract Version getAlgorithmVersion();
-
-    @NotNull
-    public String getFullName() {
-
-        return fullName;
-    }
-
-    public boolean isAllowNative() {
-        return allowNative;
-    }
-
-    public MasterKey setAllowNative(final boolean allowNative) {
-        this.allowNative = allowNative;
-        return this;
-    }
-
-    @Nonnull
-    protected byte[] getKey() {
-
-        Preconditions.checkState( isValid() );
-        return Preconditions.checkNotNull( masterKey );
-    }
-
-    public byte[] getKeyID() {
-
-        return idForBytes( getKey() );
-    }
-
-    public abstract String encode(@Nonnull final String siteName, final MPSiteType siteType, @Nonnull final UnsignedInteger siteCounter,
-                                  final MPSiteVariant siteVariant, @Nullable final String siteContext);
-
-    public boolean isValid() {
-        return masterKey != null;
-    }
-
-    public void invalidate() {
-
-        if (masterKey != null) {
-            Arrays.fill( masterKey, (byte) 0 );
-            masterKey = null;
-        }
-    }
-
-    public MasterKey revalidate(final char[] masterPassword) {
-        invalidate();
-
-        logger.trc( "masterPassword: %s", new String( masterPassword ) );
-
-        long start = System.currentTimeMillis();
-        masterKey = deriveKey( masterPassword );
-
-        if (masterKey == null)
-            logger.dbg( "masterKey calculation failed after %.2fs.", (System.currentTimeMillis() - start) / 1000D );
-        else
-            logger.trc( "masterKey ID: %s (derived in %.2fs)", CodeUtils.encodeHex( idForBytes( masterKey ) ),
-                        (System.currentTimeMillis() - start) / 1000D );
-
-        return this;
-    }
-
-    protected abstract byte[] bytesForInt(final int number);
-
-    protected abstract byte[] bytesForInt(@Nonnull final UnsignedInteger number);
-
-    protected abstract byte[] idForBytes(final byte[] bytes);
-
-    public enum Version {
-        /**
-         * bugs:
-         * - does math with chars whose signedness was platform-dependent.
-         * - miscounted the byte-length fromInt multi-byte site names.
-         * - miscounted the byte-length fromInt multi-byte full names.
-         */
-        V0,
-        /**
-         * bugs:
-         * - miscounted the byte-length fromInt multi-byte site names.
-         * - miscounted the byte-length fromInt multi-byte full names.
-         */
-        V1,
-        /**
-         * bugs:
-         * - miscounted the byte-length fromInt multi-byte full names.
-         */
-        V2,
-        /**
-         * bugs:
-         * - no known issues.
-         */
-        V3;
-
-        public static final Version CURRENT = V3;
-
-        public static Version fromInt(final int algorithmVersion) {
-
-            return values()[algorithmVersion];
-        }
-
-        public int toInt() {
-
-            return ordinal();
-        }
-
-        public String toBundleVersion() {
-            switch (this) {
-                case V0:
-                    return "1.0";
-                case V1:
-                    return "2.0";
-                case V2:
-                    return "2.1";
-                case V3:
-                    return "2.2";
-            }
-
-            throw new UnsupportedOperationException( "Unsupported version: " + this );
-        }
-    }
-}