[maven-release-plugin] prepare release 2.4-java

[IMPROVED]  Type of Master Password counter is unsigned int; Guava's
            UnsignedInteger allows us to better enforce that in code,
            fixing a few places where ints were treated badly, limiting
            counter support.
[ADDED]     An integrity test activity to the Android app to ensure the
            Android device properly generates the expected passwords
            before allowing the user to rely on it.
[UPDATED]   Made standard test suite available for all without needing
            JAXB; implemented SAX reading of mpw_tests.xml + a good API
            for running the tests and getting feedback at runtime.

.gitignore

@@ -1,5 +1,6 @@
 # OS-Specific junk.
 .DS_Store
+Thumbs.db
 
 # IntelliJ
 /MasterPassword/Java/.idea
@@ -35,5 +36,7 @@ MasterPassword/C/mpw-*.tar.gz
 MasterPassword/C/mpw
 MasterPassword/C/mpw-bench
 MasterPassword/C/mpw-tests
-MasterPassword/C/lib/*/*
-!MasterPassword/C/lib/*/.source
+MasterPassword/C/lib/*/.unpacked
+MasterPassword/C/lib/*/.patched
+MasterPassword/C/lib/*/src
+MasterPassword/C/lib/include

.idea/encodings.xml

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
+  <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

@@ -5,7 +5,6 @@
     <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="LossyEncoding" enabled="true" level="WARNING" enabled_by_default="true" />
     <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" />

.travis.yml

@@ -1,6 +1,7 @@
 language: objective-c
-xcode_project: MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj
-xcode_scheme: MasterPassword iOS (Development)
+osx_image: xcode7
+xcode_scheme: MasterPassword iOS (App Store)
+xcode_workspace: MasterPassword.xcworkspace
 xcode_sdk: iphonesimulator
 env: TERM=dumb
 git:

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

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

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

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

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

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

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

@@ -2,186 +2,204 @@
 //  Crashlytics.h
 //  Crashlytics
 //
-//  Copyright 2013 Crashlytics, Inc. All rights reserved.
+//  Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
 
-/**
- *
- * 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 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
-
-/**
- *
- * 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.
- *
- **/
-OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
-OBJC_EXTERN void CLSLogv(NSString *format, va_list args) 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 args) NS_FORMAT_FUNCTION(1,0);
+#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 *APIKey;
 @property (nonatomic, readonly, copy) NSString *version;
 @property (nonatomic, assign)         BOOL      debugMode;
 
-@property (nonatomic, assign)         NSObject <CrashlyticsDelegate> *delegate;
-
 /**
  *
- * The recommended way to install Crashlytics into your application is to place a call
- * to +startWithAPIKey: in your -application:didFinishLaunchingWithOptions: method.
+ * The delegate can be used to influence decisions on reporting and behavior, as well as reacting
+ * to previous crashes.
  *
- * This delay defaults to 1 second in order to generally give the application time to
- * fully finish launching.
+ * 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;
++ (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.
  *
- * 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.
- *
- **/
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(NSObject <CrashlyticsDelegate> *)delegate;
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(NSObject <CrashlyticsDelegate> *)delegate afterDelay:(NSTimeInterval)delay;
+ *  @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.
  *
- * Access the singleton Crashlytics instance.
- *
- **/
+ *  @return The singleton Crashlytics instance
+ */
 + (Crashlytics *)sharedInstance;
 
 /**
- *
- * The easiest way to cause a crash - great for testing!
- *
- **/
+ *  The easiest way to cause a crash - great for testing!
+ */
 - (void)crash;
 
 /**
- *
- * 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.
- *
- **/
-- (void)setUserIdentifier:(NSString *)identifier;
-- (void)setUserName:(NSString *)name;
-- (void)setUserEmail:(NSString *)email;
-
-+ (void)setUserIdentifier:(NSString *)identifier;
-+ (void)setUserName:(NSString *)name;
-+ (void)setUserEmail:(NSString *)email;
+ *  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.
  *
- * Set a value for a key to be associated with your crash data.
+ *  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.
  *
- **/
-- (void)setObjectValue:(id)value forKey:(NSString *)key;
+ *  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:(id)value forKey:(NSString *)key;
-+ (void)setIntValue:(int)value forKey:(NSString *)key;
-+ (void)setBoolValue:(BOOL)value forKey:(NSString *)key;
-+ (void)setFloatValue:(float)value forKey:(NSString *)key;
-
-@end
++ (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");
 
 /**
- * The CLSCrashReport protocol exposes methods that you can call on crash report objects passed
- * to delegate methods. If you want these values or the entire object to stay in memory retain
- * them or copy them.
- **/
-@protocol CLSCrashReport <NSObject>
-@required
+ *  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;
 
 /**
- * Returns the session identifier for the crash report.
+ *
+ * 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.
+ *
  **/
-@property (nonatomic, readonly) NSString *identifier;
+- (void)recordError:(NSError *)error;
+- (void)recordError:(NSError *)error withAdditionalUserInfo:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)userInfo;
 
-/**
- * Returns the custom key value data for the crash report.
- **/
-@property (nonatomic, readonly) NSDictionary *customKeys;
-
-/**
- * Returns the CFBundleVersion of the application that crashed.
- **/
-@property (nonatomic, readonly) NSString *bundleVersion;
-
-/**
- * Returns the CFBundleShortVersionString of the application that crashed.
- **/
-@property (nonatomic, readonly) NSString *bundleShortVersionString;
-
-/**
- * Returns the date that the application crashed at.
- **/
-@property (nonatomic, readonly) NSDate *crashedOnDate;
-
-/**
- * Returns the os version that the application crashed on.
- **/
-@property (nonatomic, readonly) NSString *OSVersion;
-
-/**
- * Returns the os build version that the application crashed on.
- **/
-@property (nonatomic, readonly) NSString *OSBuildVersion;
+- (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
 
@@ -190,31 +208,56 @@ OBJC_EXTERN void CLSNSLogv(NSString *format, va_list args) NS_FORMAT_FUNCTION(1,
  * 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:... methods.
+ * or through the convenience +startWithAPIKey:delegate: method.
  *
- **/
+ */
 @protocol CrashlyticsDelegate <NSObject>
 @optional
 
-/**
- *
- * Called once a Crashlytics instance has determined that the last execution of the
- * application ended in a crash.  This is called some time after the crash reporting
- * process has begun.  If you have specified a delay in one of the
- * startWithAPIKey:... calls, this will take at least that long to be invoked.
- *
- **/
-- (void)crashlyticsDidDetectCrashDuringPreviousExecution:(Crashlytics *)crashlytics;
+
+- (void)crashlyticsDidDetectCrashDuringPreviousExecution:(Crashlytics *)crashlytics CLS_DEPRECATED("Please refer to -crashlyticsDidDetectReportForLastExecution:");
+- (void)crashlytics:(Crashlytics *)crashlytics didDetectCrashDuringPreviousExecution:(id <CLSCrashReport>)crash CLS_DEPRECATED("Please refer to -crashlyticsDidDetectReportForLastExecution:");
 
 /**
  *
- * Just like crashlyticsDidDetectCrashDuringPreviousExecution this delegate method is
- * called once a Crashlytics instance has determined that the last execution of the
- * application ended in a crash. A CLSCrashReport is passed back that contains data about
- * the last crash report that was generated. See the CLSCrashReport protocol for method details.
- * This method is called after crashlyticsDidDetectCrashDuringPreviousExecution.
+ *  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.
  *
- **/
-- (void)crashlytics:(Crashlytics *)crashlytics didDetectCrashDuringPreviousExecution:(id <CLSCrashReport>)crash;
+ *  @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,6 +1,14 @@
 framework module Crashlytics {
-  umbrella header "Crashlytics.h"
+    header "Crashlytics.h"
+    header "Answers.h"
+    header "ANSCompatibility.h"
+    header "CLSLogging.h"
+    header "CLSReport.h"
+    header "CLSStackFrame.h"
+    header "CLSAttributes.h"
 
-  export *
-  module * { export * }
+    export *
+
+    link "z"
+    link "c++"
 }

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

@@ -2,12 +2,14 @@
 <!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.crashlytics.sdk.mac</string>
+	<string>com.twitter.crashlytics.mac</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -15,16 +17,35 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.5</string>
+	<string>3.6.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
-		<string>macosx</string>
+		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>39</string>
-	<key>DTPlatformName</key>
-	<string>macosx</string>
-	<key>MinimumOSVersion</key>
-	<string>10.6</string>
+	<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/Fabric.framework/Fabric

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

External/Mac/Fabric.framework/Modules

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

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

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

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

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

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

@@ -0,0 +1,51 @@
+<?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/run

@@ -0,0 +1,28 @@
+#!/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/iOS/Crashlytics.framework/Crashlytics

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,55 @@
+<?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,6 +1,14 @@
 framework module Crashlytics {
-  umbrella header "Crashlytics.h"
+    header "Crashlytics.h"
+    header "Answers.h"
+    header "ANSCompatibility.h"
+    header "CLSLogging.h"
+    header "CLSReport.h"
+    header "CLSStackFrame.h"
+    header "CLSAttributes.h"
 
-  export *
-  module * { export * }
+    export *
+
+    link "z"
+    link "c++"
 }

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

@@ -1,220 +0,0 @@
-//
-//  Crashlytics.h
-//  Crashlytics
-//
-//  Copyright 2013 Crashlytics, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-/**
- *
- * 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 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
-
-/**
- *
- * 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.
- *
- **/
-OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
-OBJC_EXTERN void CLSLogv(NSString *format, va_list args) 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 args) NS_FORMAT_FUNCTION(1,0);
-
-
-@protocol CrashlyticsDelegate;
-
-@interface Crashlytics : NSObject
-
-@property (nonatomic, readonly, copy) NSString *apiKey;
-@property (nonatomic, readonly, copy) NSString *version;
-@property (nonatomic, assign)         BOOL      debugMode;
-
-@property (nonatomic, assign)         NSObject <CrashlyticsDelegate> *delegate;
-
-/**
- *
- * The recommended way to install Crashlytics into your application is to place a call
- * to +startWithAPIKey: in your -application:didFinishLaunchingWithOptions: method.
- *
- * This delay defaults to 1 second in order to generally give the application time to
- * fully finish launching.
- *
- **/
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey;
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey afterDelay:(NSTimeInterval)delay;
-
-/**
- *
- * 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.
- *
- **/
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(NSObject <CrashlyticsDelegate> *)delegate;
-+ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(NSObject <CrashlyticsDelegate> *)delegate afterDelay:(NSTimeInterval)delay;
-
-/**
- *
- * Access the singleton Crashlytics instance.
- *
- **/
-+ (Crashlytics *)sharedInstance;
-
-/**
- *
- * The easiest way to cause a crash - great for testing!
- *
- **/
-- (void)crash;
-
-/**
- *
- * 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.
- *
- **/
-- (void)setUserIdentifier:(NSString *)identifier;
-- (void)setUserName:(NSString *)name;
-- (void)setUserEmail:(NSString *)email;
-
-+ (void)setUserIdentifier:(NSString *)identifier;
-+ (void)setUserName:(NSString *)name;
-+ (void)setUserEmail:(NSString *)email;
-
-/**
- *
- * Set a value for a key to be associated with your crash data.
- *
- **/
-- (void)setObjectValue:(id)value forKey:(NSString *)key;
-- (void)setIntValue:(int)value forKey:(NSString *)key;
-- (void)setBoolValue:(BOOL)value forKey:(NSString *)key;
-- (void)setFloatValue:(float)value forKey:(NSString *)key;
-
-+ (void)setObjectValue:(id)value forKey:(NSString *)key;
-+ (void)setIntValue:(int)value forKey:(NSString *)key;
-+ (void)setBoolValue:(BOOL)value forKey:(NSString *)key;
-+ (void)setFloatValue:(float)value forKey:(NSString *)key;
-
-@end
-
-/**
- * The CLSCrashReport protocol exposes methods that you can call on crash report objects passed
- * to delegate methods. If you want these values or the entire object to stay in memory retain
- * them or copy them.
- **/
-@protocol CLSCrashReport <NSObject>
-@required
-
-/**
- * Returns the session identifier for the crash report.
- **/
-@property (nonatomic, readonly) NSString *identifier;
-
-/**
- * Returns the custom key value data for the crash report.
- **/
-@property (nonatomic, readonly) NSDictionary *customKeys;
-
-/**
- * Returns the CFBundleVersion of the application that crashed.
- **/
-@property (nonatomic, readonly) NSString *bundleVersion;
-
-/**
- * Returns the CFBundleShortVersionString of the application that crashed.
- **/
-@property (nonatomic, readonly) NSString *bundleShortVersionString;
-
-/**
- * Returns the date that the application crashed at.
- **/
-@property (nonatomic, readonly) NSDate *crashedOnDate;
-
-/**
- * Returns the os version that the application crashed on.
- **/
-@property (nonatomic, readonly) NSString *OSVersion;
-
-/**
- * Returns the os build version that the application crashed on.
- **/
-@property (nonatomic, readonly) NSString *OSBuildVersion;
-
-@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:... methods.
- *
- **/
-@protocol CrashlyticsDelegate <NSObject>
-@optional
-
-/**
- *
- * Called once a Crashlytics instance has determined that the last execution of the
- * application ended in a crash.  This is called some time after the crash reporting
- * process has begun.  If you have specified a delay in one of the
- * startWithAPIKey:... calls, this will take at least that long to be invoked.
- *
- **/
-- (void)crashlyticsDidDetectCrashDuringPreviousExecution:(Crashlytics *)crashlytics;
-
-/**
- *
- * Just like crashlyticsDidDetectCrashDuringPreviousExecution this delegate method is
- * called once a Crashlytics instance has determined that the last execution of the
- * application ended in a crash. A CLSCrashReport is passed back that contains data about
- * the last crash report that was generated. See the CLSCrashReport protocol for method details.
- * This method is called after crashlyticsDidDetectCrashDuringPreviousExecution.
- *
- **/
-- (void)crashlytics:(Crashlytics *)crashlytics didDetectCrashDuringPreviousExecution:(id <CLSCrashReport>)crash;
-
-@end

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

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>Crashlytics</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.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>2.2.5</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>iPhoneOS</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>40</string>
-	<key>DTPlatformName</key>
-	<string>iphoneos</string>
-	<key>MinimumOSVersion</key>
-	<string>4.0</string>
-</dict>
-</plist>

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

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

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

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

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

External/iOS/Fabric.framework/run

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

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

External/iOS/Reveal.framework/Headers

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

External/iOS/Reveal.framework/Reveal

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

External/iOS/Reveal.framework/Versions/A/Headers/IBARevealLoader.h

@@ -1,17 +0,0 @@
-//
-// Copyright (c) 2013 Itty Bitty Apps. All rights reserved.
-
-#import <Foundation/Foundation.h>
-
-extern NSString * const IBARevealLoaderRequestStartNotification;
-extern NSString * const IBARevealLoaderRequestStopNotification;
-
-extern NSString * const IBARevealLoaderSetOptionsNotification;
-extern NSString * const IBARevealLoaderOptionsLogLevelMaskKey;
-
-@interface IBARevealLoader : NSObject
-
-+ (void)startServer;
-+ (void)stopServer;
-
-@end

External/iOS/Reveal.framework/Versions/A/Headers/IBARevealLogger.h

@@ -1,57 +0,0 @@
-//  Copyright (c) 2013 Itty Bitty Apps Pty Ltd. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-CF_EXTERN_C_BEGIN
-
-/*!
- \brief         The Reveal Log level bit flags.
- \discussion    These flags are additive.  i.e. you should bitwise OR them together.  
-
- \seealso       IBARevealLoggerSetLevelMask
- \seealso       IBARevealLoggerGetLevelMask
- 
-    Example:
- 
-    // Enable Error, Warning and Info logger levels.
-    IBARevealLoggerSetLevelMask(IBARevealLogLevelError|IBARevealLogLevelWarn|IBARevealLogLevelInfo);
- 
- */
-typedef NS_OPTIONS(int32_t, IBARevealLogLevel)
-{
-    IBARevealLogLevelNone  = 0,
-    IBARevealLogLevelDebug = (1 << 0),
-    IBARevealLogLevelInfo  = (1 << 1),
-    IBARevealLogLevelWarn  = (1 << 2),
-    IBARevealLogLevelError = (1 << 3)
-};
-
-/*!
- \brief         Set the Reveal logger level mask.
- \param         mask    A bit mask which is a combination of the IBARevealLogLevel enum options.
- 
- \discussion    If you do not wish to see log messages from Reveal you should call this function with an appropriate level mask as early in your application's lifecycle as possible. For example in your application's main() function.
- 
-        Example:
- 
-        // Enable Error, Warning and Info logger levels.
-        IBARevealLoggerSetLevelMask(IBARevealLogLevelError|IBARevealLogLevelWarn|IBARevealLogLevelInfo);
- 
- */
-CF_EXPORT void IBARevealLoggerSetLevelMask(int32_t mask);
-
-/*!
- \brief         Get the current Reveal logger level mask.
- \return        A bit mask representing the levels at which Reveal is currently logging.
- \discussion    The default Reveal Logger level mask is IBARevealLogLevelError|IBARevealLogLevelWarn|IBARevealLogLevelInfo.
- 
-        Example:
- 
-        // Turn off the Info log level.
-        IBARevealLoggerSetLevelMask(IBARevealLoggerGetLevelMask() & ~IBARevealLogLevelInfo);
- 
- */
-CF_EXPORT int32_t IBARevealLoggerGetLevelMask(void);
-
-CF_EXTERN_C_END

External/iOS/Reveal.framework/Versions/A/Headers/Reveal.h

@@ -1,5 +0,0 @@
-//  Copyright (c) 2013 Itty Bitty Apps Pty Ltd. All rights reserved.
-//
-
-#import "IBARevealLogger.h"
-#import "IBARevealLoader.h"

External/iOS/Reveal.framework/Versions/Current

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

MasterPassword.xcworkspace/xcshareddata/MasterPassword.xcscmblueprint

@@ -0,0 +1,93 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "F788B28042EDBEF29EFE34687DA79A778C2CC260",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "304AD0F97EA7B4893D91DFB8C3413D4E627B9472" : 0,
+    "2A70319CE0F91B35406CA7D970AE7CB4957B0A75" : 0,
+    "8A15A8EA0B3D0B497C4883425BC74DF995224BB3" : 0,
+    "1712FC0BC3C9AABD8B7B5376E310E93FBDB3BCFA" : 0,
+    "1AA8C0BE-EEC3-4FBC-A801-8939A1AC093A" : 0,
+    "3E67FB08419C920516AAC3B00DAAF23073B8CF77" : 0,
+    "3ED8592497DB6A564366943C9AAD5A46341B5076" : 0,
+    "4DDCFFD91B41F00326AD14553BD66CFD366ABD91" : 0,
+    "E47DEC29CB0D0FDE3560EF46E1808FA1C723D657" : 0,
+    "2FE140B36B7D26140DC8D5E5C639DC5900EFCF35" : 0,
+    "F788B28042EDBEF29EFE34687DA79A778C2CC260" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "1DC75A27-0030-4493-ACE8-E1D49AB9A549",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "304AD0F97EA7B4893D91DFB8C3413D4E627B9472" : "MasterPassword\/External\/KCOrderedAccessorFix",
+    "2A70319CE0F91B35406CA7D970AE7CB4957B0A75" : "",
+    "8A15A8EA0B3D0B497C4883425BC74DF995224BB3" : "MasterPassword\/External\/Pearl\/External\/jrswizzle",
+    "1712FC0BC3C9AABD8B7B5376E310E93FBDB3BCFA" : "MasterPassword\/External\/InAppSettingsKit",
+    "1AA8C0BE-EEC3-4FBC-A801-8939A1AC093A" : "MasterPassword\/External\/LoveLyndir",
+    "3E67FB08419C920516AAC3B00DAAF23073B8CF77" : "MasterPassword\/External\/RHStatusItemView",
+    "3ED8592497DB6A564366943C9AAD5A46341B5076" : "MasterPassword\/External\/AttributedMarkdown",
+    "4DDCFFD91B41F00326AD14553BD66CFD366ABD91" : "MasterPassword\/External\/Pearl",
+    "E47DEC29CB0D0FDE3560EF46E1808FA1C723D657" : "MasterPassword\/External\/UbiquityStoreManager",
+    "2FE140B36B7D26140DC8D5E5C639DC5900EFCF35" : "MasterPassword\/External\/Pearl\/External\/uicolor-utilities",
+    "F788B28042EDBEF29EFE34687DA79A778C2CC260" : "MasterPassword"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "MasterPassword",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "MasterPassword.xcworkspace",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/lhunath\/InAppSettingsKit.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "1712FC0BC3C9AABD8B7B5376E310E93FBDB3BCFA"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/Lyndir\/love-lyndir.client.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "1AA8C0BE-EEC3-4FBC-A801-8939A1AC093A"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:Lyndir\/Lyndir.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "2A70319CE0F91B35406CA7D970AE7CB4957B0A75"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/lhunath\/uicolor-utilities.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "2FE140B36B7D26140DC8D5E5C639DC5900EFCF35"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/CFKevinRef\/KCOrderedAccessorFix.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "304AD0F97EA7B4893D91DFB8C3413D4E627B9472"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/lhunath\/RHStatusItemView.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "3E67FB08419C920516AAC3B00DAAF23073B8CF77"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/dreamwieber\/AttributedMarkdown.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "3ED8592497DB6A564366943C9AAD5A46341B5076"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/github.com\/Lyndir\/Pearl.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4DDCFFD91B41F00326AD14553BD66CFD366ABD91"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/jonmarimba\/jrswizzle.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8A15A8EA0B3D0B497C4883425BC74DF995224BB3"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git:\/\/github.com\/lhunath\/UbiquityStoreManager.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "E47DEC29CB0D0FDE3560EF46E1808FA1C723D657"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/github.com\/Lyndir\/MasterPassword.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "F788B28042EDBEF29EFE34687DA79A778C2CC260"
+    }
+  ]
+}

MasterPassword/C/bashcomplib

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+# FIXME
+#   partials are currently readline words, but these can't be reliably compared against literal data.  We need to make them literal first.. in a safe way.  Currently using xargs' quote parser as a hack.
+
+# Process literal completion options in COMPREPLY
+#
+# 1. Filter COMPREPLY by excluding the options that do not match the word that is being completed.
+# 2. Shell-escape the COMPREPLY words so they remain syntactical words when injected into the completed command.
+# 3. Add a space after the words so successful completions advance to the next word
+#    (we disabled this default behavior with -o nospace so we can do completions that don't want this, eg. directory names)
+_comp_finish_completions() {
+    local partial=$(xargs <<< "${COMP_WORDS[COMP_CWORD]}") # FIXME
+    local word words=( "${COMPREPLY[@]}" )
+
+    COMPREPLY=()
+    for word in "${words[@]}"; do
+        ( shopt -s nocasematch; [[ $word = $partial* ]] ) && COMPREPLY+=( "$(printf '%q ' "$word")" )
+    done
+
+    if (( ${#COMPREPLY[@]} > 1 )) && [[ $_comp_title ]]; then
+        printf '\n%s:' "$_comp_title"
+        unset _comp_title
+    fi
+}
+
+# Perform pathname completion.
+#
+# 1. Populate COMPREPLY with pathnames.
+# 2. Shell-escape the COMPREPLY words so they remain syntactical words when injected into the completed command.
+# 3. Add a space after file names so successful completions advance to the next word.
+#    Directory names are suffixed with a / instead so we can keep completing the files inside.
+_comp_complete_path() {
+    local partial=$(xargs <<< "${COMP_WORDS[COMP_CWORD]}")
+    local path
+
+    COMPREPLY=()
+    for path in "$partial"*; do
+        if [[ -d $path ]]; then
+            COMPREPLY+=( "$(printf '%q/' "$path")" )
+
+        elif [[ -e $path ]]; then
+            COMPREPLY+=( "$(printf '%q ' "$path")" )
+
+        fi
+    done
+}
+
+_show_args() {
+    echo
+    local i=0
+    for arg; do
+        printf "arg %d: %s\n" "$((i++))" "$arg"
+    done
+
+    i=0
+    for word in "${COMP_WORDS[@]}"; do
+        printf "word %d: %s -> %s %s\n" "$i" "$word" "$(xargs <<< "$word")" "$( ((i == $COMP_CWORD)) && echo '<CWORD>' )"
+        let i++
+    done
+}

MasterPassword/C/build

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 #
 # TROUBLESHOOTING
-#   - To enable verbose algorithm/implementation debugging, use ./build -DDEBUG
 #   - 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]
@@ -39,8 +38,15 @@ else
 fi
 
 # Optional features.
-mpw_color=0 # Colorized Identicon, requires libncurses-dev
+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
 
@@ -55,6 +61,14 @@ fetch() {
     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"
 
@@ -68,66 +82,58 @@ unpack() {
         echo 2>&1 "Don't know how to unpack: $1"
     fi
 
-    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'
-
-    files=( !("$1") )
+    files=( * )
     if [[ -d $files ]] && (( ${#files[@]} == 1 )); then
         mv "$files"/* .
         rmdir "$files"
     fi
-    touch .unpacked
 }
 fetchSource() (
+    local name=${PWD##*/}
     source .source
 
     if [[ -e .unpacked ]]; then
         true
 
     elif [[ $pkg && -e "${pkg##*/}" ]]; then
-        files=( !("${pkg##*/}") )
-        [[ -e $files ]] || {
+        [[ -e src ]] || {
             echo
-            echo "Unpacking: ${PWD##*/}, using package..."
-            unpack "${pkg##*/}" "$pkg_sha256"
+            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: ${PWD##*/}, using git..."
-            git clone "$svn" .
-            printf '%s' "$(git describe --always)" > "${PWD##*/}-version"
+            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: ${PWD##*/}, using git-svn..."
-            git svn clone --prefix=origin/ --stdlayout "$svn" .
-            printf '%s' "$(git describe --always)" > "${PWD##*/}-version"
+            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: ${PWD##*/}, using svn..."
-            svn checkout "$svn/trunk" .
-            printf 'r%s' "$(svn info | awk '/^Revision:/{ print $2 }')" > "${PWD##*/}-version"
+            echo "Fetching: $name, using svn..."
+            svn checkout "$svn/trunk" src
+            touch .unpacked
         }
 
     elif [[ $pkg ]]; then
-        files=( !("${pkg##*/}") )
-        [[ -e $files ]] || {
+        [[ -e src ]] || {
             echo
-            echo "Fetching: ${PWD##*/}, using package..."
+            echo "Fetching: $name, using package..."
             fetch "$pkg"
-            unpack "${pkg##*/}" "$pkg_sha256"
+            ( mkdir src && cd src && unpack "../${pkg##*/}" "$pkg_sha256" )
+            touch .unpacked
         }
 
     else
@@ -135,35 +141,39 @@ fetchSource() (
         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"
+        echo >&2 "error: into: $PWD/src"
         exit 1
     fi
 
     if [[ ! -e .patched ]] && (( ${#patches[@]} )); then
+        pushd src
         for patch in "${patches[@]}"; do
             echo
-            echo "Patching: ${PWD##*/}, for $patch..."
-            patch -p0 < ../"${PWD##*/}-$patch.patch"
+            echo "Patching: $name, for $patch..."
+            patch -p0 < "../$patch.patch"
         done
+        popd
         touch .patched
     fi
 )
 depend() {
+    local name=$1
 
     echo
-    echo "Checking dependency: $1..."
-    [[ -e "lib/include/$1" ]] && return
+    echo "Checking dependency: $name..."
+    [[ -e "lib/include/$name" ]] && return
 
-    pushd "lib/$1"
+    pushd "lib/$name"
     fetchSource
+    pushd "src"
 
     echo
-    echo "Configuring dependency: $1..."
+    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 $1.  Please install automake and autoconf."
+                echo >&2 "Need autotools to build $name.  Please install automake and autoconf."
                 exit 1
             fi
 
@@ -180,21 +190,22 @@ depend() {
     fi
 
     echo
-    echo "Building dependency: $1..."
+    echo "Building dependency: $name..."
     if [[ -e Makefile ]]; then
         if ! hash make; then
-            echo >&2 "Need make to build $1.  Please install GNU make."
+            echo >&2 "Need make to build $name.  Please install GNU make."
             exit 1
         fi
 
         make
-        install -d "../include/$1/"
-        find . -name '*.h' -exec install -m 444 {} "../include/$1/" \;
+        install -d "../../include/$name/"
+        find . -name '*.h' -exec install -m 444 {} "../../include/$name/" \;
     else
-        echo >&2 "error: Don't know how to build: $1"
+        echo >&2 "error: Don't know how to build: $name"
         exit 1
     fi
     popd
+    popd
 }
 
 
@@ -204,20 +215,16 @@ mpw() {
 
     echo
     echo "Building target: $target..."
-    CFLAGS=(
+    local CFLAGS=(
         # include paths
         -I"lib/include"
     )
-    LDFLAGS=(
+    local LDFLAGS=(
         # scrypt
-        "lib/scrypt/scrypt-crypto_aesctr.o"
-        "lib/scrypt/scrypt-sha256.o"
-        "lib/scrypt/scrypt-crypto_scrypt-nosse.o"
-        "lib/scrypt/scrypt-memlimit.o"
-        "lib/scrypt/scrypt-scryptenc_cpuperf.o"
-        "lib/scrypt/scrypt-scryptenc.o"
+        "lib/scrypt/src/libcperciva/"*/*.o
+        "lib/scrypt/src/lib/crypto/"*.o
         # library paths
-        -L"." -L"lib/scrypt"
+        -L"." -L"lib/scrypt/src"
         # link libraries
         -l"crypto"
     )
@@ -240,30 +247,29 @@ mpw-bench() {
 
     echo
     echo "Building target: $target..."
-    CFLAGS=(
+    local CFLAGS=(
         # include paths
         -I"lib/include"
     )
-    LDFLAGS=(
+    local LDFLAGS=(
         # scrypt
-        "lib/scrypt/scrypt-crypto_aesctr.o"
-        "lib/scrypt/scrypt-sha256.o"
-        "lib/scrypt/scrypt-crypto_scrypt-nosse.o"
-        "lib/scrypt/scrypt-memlimit.o"
-        "lib/scrypt/scrypt-scryptenc_cpuperf.o"
-        "lib/scrypt/scrypt-scryptenc.o"
+        "lib/scrypt/src/libcperciva/"*/*.o
+        "lib/scrypt/src/lib/crypto/"*.o
         # bcrypt
-        "lib/bcrypt/crypt_blowfish.o"
-        "lib/bcrypt/crypt_gensalt.o"
-        "lib/bcrypt/wrapper.o"
-        "lib/bcrypt/x86.o"
+        "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"
-        -L"lib/bcrypt"
+        -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"
@@ -276,27 +282,26 @@ mpw-tests() {
 
     echo
     echo "Building target: $target..."
-    CFLAGS=(
+    local CFLAGS=(
         # include paths
         -I"lib/include"
         -I"/usr/include/libxml2"
         -I"/usr/local/include/libxml2"
     )
-    LDFLAGS=(
+    local LDFLAGS=(
         # scrypt
-        "lib/scrypt/scrypt-crypto_aesctr.o"
-        "lib/scrypt/scrypt-sha256.o"
-        "lib/scrypt/scrypt-crypto_scrypt-nosse.o"
-        "lib/scrypt/scrypt-memlimit.o"
-        "lib/scrypt/scrypt-scryptenc_cpuperf.o"
-        "lib/scrypt/scrypt-scryptenc.o"
+        "lib/scrypt/src/libcperciva/"*/*.o
+        "lib/scrypt/src/lib/crypto/"*.o
         # library paths
-        -L"." -L"lib/scrypt"
+        -L"." -L"lib/scrypt/src"
         # link libraries
         -l"crypto" -l"xml2"
     )
 
-    cc "${CFLAGS[@]}" "$@" -c mpw-tests-util.c -o mpw-tests-util.o
+    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"

MasterPassword/C/clean

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+#
+# Clean all generated build files.
+set -e
+cd "${BASH_SOURCE%/*}"
+
+rm -vfr lib/*/{.unpacked,.patched,src} lib/include

MasterPassword/C/lib/scrypt/.source

@@ -1,4 +1,4 @@
-home=https://code.google.com/p/scrypt/
-svn=http://scrypt.googlecode.com/svn
-pkg=http://masterpasswordapp.com/libscrypt-b12b554.tar.gz
-pkg_sha256=c726daec68a345e420896f005394a948dc5a6924713ed94b684c856d4c247f0b
+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/mpw-algorithm.h

@@ -6,6 +6,7 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
+// NOTE: mpw is currently NOT thread-safe.
 #include "mpw-types.h"
 
 typedef enum(unsigned int, MPAlgorithmVersion) {

MasterPassword/C/mpw-algorithm_v0.c

@@ -6,11 +6,11 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <arpa/inet.h>
 
+#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768
@@ -37,7 +37,8 @@ static const char mpw_characterFromClass_v0(char characterClass, uint16_t seedBy
 static const uint8_t *mpw_masterKeyForUser_v0(const char *fullName, const char *masterPassword) {
 
     const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
-    trc( "fullName: %s\n", fullName );
+    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 );
 
@@ -71,11 +72,16 @@ static const char *mpw_passwordForSite_v0(const uint8_t *masterKey, const char *
         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 == NULL? "<empty>": siteContext );
+    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 )

MasterPassword/C/mpw-algorithm_v1.c

@@ -6,11 +6,11 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <arpa/inet.h>
 
+#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768
@@ -21,7 +21,8 @@
 static const uint8_t *mpw_masterKeyForUser_v1(const char *fullName, const char *masterPassword) {
 
     const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
-    trc( "fullName: %s\n", fullName );
+    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 );
 
@@ -55,11 +56,16 @@ static const char *mpw_passwordForSite_v1(const uint8_t *masterKey, const char *
         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 == NULL? "<empty>": siteContext );
+    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 )

MasterPassword/C/mpw-algorithm_v2.c

@@ -6,11 +6,11 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <arpa/inet.h>
 
+#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768
@@ -21,7 +21,8 @@
 static const uint8_t *mpw_masterKeyForUser_v2(const char *fullName, const char *masterPassword) {
 
     const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
-    trc( "fullName: %s\n", fullName );
+    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 );
 
@@ -55,11 +56,16 @@ static const char *mpw_passwordForSite_v2(const uint8_t *masterKey, const char *
         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 == NULL? "<empty>": siteContext );
+    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 )

MasterPassword/C/mpw-algorithm_v3.c

@@ -6,11 +6,11 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <arpa/inet.h>
 
+#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768
@@ -21,7 +21,8 @@
 static const uint8_t *mpw_masterKeyForUser_v3(const char *fullName, const char *masterPassword) {
 
     const char *mpKeyScope = mpw_scopeForVariant( MPSiteVariantPassword );
-    trc( "fullName: %s\n", fullName );
+    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 );
 
@@ -55,11 +56,16 @@ static const char *mpw_passwordForSite_v3(const uint8_t *masterKey, const char *
         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 == NULL? "<empty>": siteContext );
+    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 )

MasterPassword/C/mpw-bench.c

@@ -69,39 +69,39 @@ int main(int argc, char *const argv[]) {
                 masterKey, siteName, siteType, siteCounter, siteVariant, siteContext, MPAlgorithmVersionCurrent ) );
         free( (void *)masterKey );
 
-        if (i % 1 == 0)
-            fprintf( stderr, "\rmpw: iteration %d / %d..", i, iterations );
+        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 = 50000000;
+    iterations = 45000000;
     uint8_t hash[32];
     mpw_getTime( &startTime );
     for (int i = 0; i < iterations; ++i) {
         SHA256_Buf( masterPassword, strlen( masterPassword ), hash );
 
-        if (i % 1000 == 0)
-            fprintf( stderr, "\rsha256: iteration %d / %d..", i, iterations );
+        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 = 600;
+    iterations = 1000;
     mpw_getTime( &startTime );
     for (int i = 0; i < iterations; ++i) {
         crypt( masterPassword, crypt_gensalt( "$2b$", bcrypt_cost, fullName, strlen( fullName ) ) );
 
-        if (i % 10 == 0)
-            fprintf( stderr, "\rbcrypt (cost %d): iteration %d / %d..", bcrypt_cost, i, iterations );
+        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.\n", sha256Speed / mpwSpeed );
-    fprintf( stdout, " - mpw is %f times slower than bcrypt (cost 9).\n", bcrypt9Speed / mpwSpeed );
+    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

@@ -13,8 +13,6 @@
 #include <histedit.h>
 #endif
 
-#define ftl(...) do { fprintf( stderr, __VA_ARGS__ ); exit(2); } while (0)
-
 #include "mpw-algorithm.h"
 #include "mpw-util.h"
 
@@ -25,9 +23,9 @@
 
 static void usage() {
 
-    fprintf( stderr, "Usage: mpw [-u name] [-t type] [-c counter] site\n\n" );
+    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.\n\n", MP_env_fullname );
+            "                 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"
@@ -40,23 +38,27 @@ static void usage() {
             "                     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, "    -V version   The algorithm version to use.\n"
+    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"
+    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"
+            "                  -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"
-            "        MP_FULLNAME    | The full name of the user.\n"
-            "        MP_SITETYPE    | The default password template.\n"
-            "        MP_SITECOUNTER | The default counter value.\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 );
 }
 
@@ -111,7 +113,7 @@ int main(int argc, char *const argv[]) {
             ftl( "Invalid %s: %s\n", MP_env_algorithm, algorithmVersionString );
 
     // Read the options.
-    for (int opt; (opt = getopt( argc, argv, "u:P:t:c:v:V:C:h" )) != -1;)
+    for (int opt; (opt = getopt( argc, argv, "u:P:t:c:V:a:C:vqh" )) != -1;)
         switch (opt) {
             case 'u':
                 fullName = optarg;
@@ -127,16 +129,22 @@ int main(int argc, char *const argv[]) {
             case 'c':
                 siteCounterString = optarg;
                 break;
-            case 'v':
+            case 'V':
                 siteVariantString = optarg;
                 break;
-            case 'V':
+            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;

MasterPassword/C/mpw-tests-util.c

@@ -69,7 +69,7 @@ xmlChar *mpw_xmlTestCaseString(xmlNodePtr context, const char *nodeName) {
 uint32_t mpw_xmlTestCaseInteger(xmlNodePtr context, const char *nodeName) {
 
     xmlChar *string = mpw_xmlTestCaseString( context, nodeName );
-    uint32_t integer = atol( (char *)string );
+    uint32_t integer = (uint32_t)atol( (char *)string );
     xmlFree( string );
 
     return integer;

MasterPassword/C/mpw-tests.c

@@ -21,6 +21,7 @@ int main(int argc, char *const argv[]) {
 
         // 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" );
@@ -36,16 +37,20 @@ int main(int argc, char *const argv[]) {
 
         // 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, MPAlgorithmVersionCurrent );
+                (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, MPAlgorithmVersionCurrent );
+                masterKey, (char *)siteName, siteType, siteCounter, siteVariant, (char *)siteContext, algorithm );
         mpw_free( masterKey, MP_dkLen );
         if (!sitePassword)
             ftl( "Couldn't derive site password." );
@@ -56,7 +61,7 @@ int main(int argc, char *const argv[]) {
 
         else {
             ++failedTests;
-            fprintf( stdout, "FAILED!  (result %s != expected %s)\n", result, sitePassword );
+            fprintf( stdout, "FAILED!  (got %s != expected %s)\n", sitePassword, result );
         }
 
         // Free test case.

MasterPassword/C/mpw-types.c

@@ -21,15 +21,17 @@
 
 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 );
-    char stdTypeName[strlen( typeName )];
-    if (stdTypeNameSize > strlen( "generated" ))
-        strcpy( stdTypeName, typeName + strlen( "generated" ) );
-    else
-        strcpy( stdTypeName, typeName );
-    for (char *tN = stdTypeName; *tN; ++tN)
-        *tN = (char)tolower( *tN );
+    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" ))
@@ -47,11 +49,10 @@ const MPSiteType mpw_typeWithName(const char *typeName) {
     if (0 == strcmp( stdTypeName, "p" ) || 0 == strcmp( stdTypeName, "phrase" ))
         return MPSiteTypeGeneratedPhrase;
 
-    fprintf( stderr, "Not a generated type name: %s", stdTypeName );
-    abort();
+    ftl( "Not a generated type name: %s", stdTypeName );
 }
 
-inline const char **mpw_templatesForType(MPSiteType type, size_t *count) {
+const char **mpw_templatesForType(MPSiteType type, size_t *count) {
 
     if (!(type & MPSiteTypeClassGenerated)) {
         ftl( "Not a generated type: %d", type );
@@ -61,42 +62,42 @@ inline const char **mpw_templatesForType(MPSiteType type, size_t *count) {
 
     switch (type) {
         case MPSiteTypeGeneratedMaximum: {
-            *count = 2;
-            return (const char *[]){ "anoxxxxxxxxxxxxxxxxx", "axxxxxxxxxxxxxxxxxno" };
+            return alloc_array( *count, const char *,
+                    "anoxxxxxxxxxxxxxxxxx", "axxxxxxxxxxxxxxxxxno" );
         }
         case MPSiteTypeGeneratedLong: {
-            *count = 21;
-            return (const char *[]){ "CvcvnoCvcvCvcv", "CvcvCvcvnoCvcv", "CvcvCvcvCvcvno",
-                                        "CvccnoCvcvCvcv", "CvccCvcvnoCvcv", "CvccCvcvCvcvno",
-                                        "CvcvnoCvccCvcv", "CvcvCvccnoCvcv", "CvcvCvccCvcvno",
-                                        "CvcvnoCvcvCvcc", "CvcvCvcvnoCvcc", "CvcvCvcvCvccno",
-                                        "CvccnoCvccCvcv", "CvccCvccnoCvcv", "CvccCvccCvcvno",
-                                        "CvcvnoCvccCvcc", "CvcvCvccnoCvcc", "CvcvCvccCvccno",
-                                        "CvccnoCvcvCvcc", "CvccCvcvnoCvcc", "CvccCvcvCvccno" };
+            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: {
-            *count = 2;
-            return (const char *[]){ "CvcnoCvc", "CvcCvcno" };
+            return alloc_array( *count, const char *,
+                    "CvcnoCvc", "CvcCvcno" );
         }
         case MPSiteTypeGeneratedBasic: {
-            *count = 3;
-            return (const char *[]){ "aaanaaan", "aannaaan", "aaannaaa" };
+            return alloc_array( *count, const char *,
+                    "aaanaaan", "aannaaan", "aaannaaa" );
         }
         case MPSiteTypeGeneratedShort: {
-            *count = 1;
-            return (const char *[]){"Cvcn"};
+            return alloc_array( *count, const char *,
+                    "Cvcn" );
         }
         case MPSiteTypeGeneratedPIN: {
-            *count = 1;
-            return (const char *[]){ "nnnn" };
+            return alloc_array( *count, const char *,
+                    "nnnn" );
         }
         case MPSiteTypeGeneratedName: {
-            *count = 1;
-            return (const char *[]) {"cvccvcvcv"};
+            return alloc_array( *count, const char *,
+                    "cvccvcvcv" );
         }
         case MPSiteTypeGeneratedPhrase: {
-            *count = 3;
-            return (const char *[]){ "cvcc cvc cvccvcv cvc", "cvc cvccvcvcv cvcv", "cv cvccv cvc cvcvccv" };
+            return alloc_array( *count, const char *,
+                    "cvcc cvc cvccvcv cvc", "cvc cvccvcvcv cvcv", "cv cvccv cvc cvcvccv" );
         }
         default: {
             ftl( "Unknown generated type: %d", type );
@@ -113,15 +114,19 @@ const char *mpw_templateForType(MPSiteType type, uint8_t seedByte) {
     if (!count)
         return NULL;
 
-    return templates[seedByte % count];
+    char const *template = templates[seedByte % count];
+    free( templates );
+    return template;
 }
 
 const MPSiteVariant mpw_variantWithName(const char *variantName) {
 
-    char stdVariantName[strlen( variantName )];
-    strcpy( stdVariantName, variantName );
-    for (char *vN = stdVariantName; *vN; ++vN)
-        *vN = (char)tolower( *vN );
+    // 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;

MasterPassword/C/mpw-types.h

@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
+#ifndef _MPW_TYPES_H
+#define _MPW_TYPES_H
 #include <stdlib.h>
 #include <stdint.h>
 
@@ -73,9 +75,10 @@ const char *mpw_scopeForVariant(MPSiteVariant variant);
 const MPSiteType mpw_typeWithName(const char *typeName);
 
 /**
- * @return An array of internal strings that express the templates to use for the given type.
+ * @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);
 /**
@@ -93,3 +96,4 @@ const char *mpw_charactersInClass(char characterClass);
  */
 const char mpw_characterFromClass(char characterClass, uint8_t seedByte);
 
+#endif // _MPW_TYPES_H

MasterPassword/C/mpw-util.c

@@ -9,7 +9,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <locale.h>
+
+#ifdef COLOR
+#include <unistd.h>
+#include <curses.h>
+#include <term.h>
+#endif
 
 #include <scrypt/sha256.h>
 #include <scrypt/crypto_scrypt.h>
@@ -75,7 +80,7 @@ uint8_t const *mpw_scrypt(const size_t keySize, const char *secret, const uint8_
 
 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);
+    uint8_t *const buffer = malloc( 32 );
     if (!buffer)
         return NULL;
 
@@ -91,20 +96,35 @@ const char *mpw_idForBuf(const void *buf, size_t length) {
     return mpw_hex( hash, 32 );
 }
 
-static char *mpw_hex_buf = NULL;
+static char **mpw_hex_buf = NULL;
+static unsigned int mpw_hex_buf_i = 0;
+
 const char *mpw_hex(const void *buf, size_t length) {
 
-    mpw_hex_buf = realloc( mpw_hex_buf, length * 2 + 1 );
-    for (size_t kH = 0; kH < length; kH++)
-        sprintf( &(mpw_hex_buf[kH * 2]), "%02X", ((const uint8_t *)buf)[kH] );
+    // 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;
 
-    return mpw_hex_buf;
+    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 bool istermsetup = false;
+static int istermsetup = 0;
 static void initputvar() {
     if (putvarc)
         free(putvarc);
@@ -128,7 +148,8 @@ const char *mpw_identicon(const char *fullName, const char *masterPassword) {
     const char *accessory[] = {
             "◈", "◎", "◐", "◑", "◒", "◓", "☀", "☁", "☂", "☃", "☄", "★", "☆", "☎", "☏", "⎈", "⌂", "☘", "☢", "☣",
             "☕", "⌚", "⌛", "⏰", "⚡", "⛄", "⛅", "☔", "♔", "♕", "♖", "♗", "♘", "♙", "♚", "♛", "♜", "♝", "♞", "♟",
-            "♨", "♩", "♪", "♫", "⚐", "⚑", "⚔", "⚖", "⚙", "⚠", "⌘", "⏎", "✄", "✆", "✈", "✉", "✌" };
+            "♨", "♩", "♪", "♫", "⚐", "⚑", "⚔", "⚖", "⚙", "⚠", "⌘", "⏎", "✄", "✆", "✈", "✉", "✌"
+    };
 
     uint8_t identiconSeed[32];
     HMAC_SHA256_Buf( masterPassword, strlen( masterPassword ), fullName, strlen( fullName ), identiconSeed );
@@ -165,8 +186,33 @@ const char *mpw_identicon(const char *fullName, const char *masterPassword) {
     return identicon;
 }
 
-const size_t mpw_charlen(const char *string) {
+/**
+* @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) {
 
-    setlocale( LC_ALL, "en_US.UTF-8" );
-    return mbstowcs( NULL, string, strlen( string ) );
+    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

@@ -6,25 +6,62 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
+#include <stdio.h>
 #include <stdint.h>
 
 //// Logging.
 
-#ifdef DEBUG
 #ifndef trc
-#define trc(...) fprintf( stderr, __VA_ARGS__ )
+int mpw_verbosity;
+    #define trc_level 3
+    #define trc(...) \
+        if (mpw_verbosity >= 3) \
+            fprintf( stderr, __VA_ARGS__ )
 #endif
-#else
-#ifndef trc
-#define trc(...) do {} while (0)
+#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(...) do { fprintf( stderr, __VA_ARGS__ ); abort(); } while (0)
+    #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);
@@ -58,6 +95,7 @@ uint8_t const *mpw_hmac_sha256(
 /** 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);
@@ -67,4 +105,5 @@ const char *mpw_identicon(const char *fullName, const char *masterPassword);
 
 //// String utilities.
 
-const size_t mpw_charlen(const char *string);
+/** @return The amount of display characters in the given UTF-8 string. */
+const size_t mpw_charlen(const char *utf8String);

MasterPassword/C/mpw.completion.bash

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+source bashcomplib
+
+# completing the 'mpw' command.
+_comp_mpw() {
+    local optarg= cword=${COMP_WORDS[COMP_CWORD]} pcword=
+    (( COMP_CWORD )) && pcword=${COMP_WORDS[COMP_CWORD - 1]} 
+
+    case $pcword in
+        -u) # complete full names.
+            COMPREPLY=( ~/.mpw.d/*.mpsites )
+            [[ -e $COMPREPLY ]] || COMPREPLY=()
+            COMPREPLY=( "${COMPREPLY[@]##*/}" ) COMPREPLY=( "${COMPREPLY[@]%.mpsites}" )
+            ;;
+        -t) # complete types.
+            COMPREPLY=( maximum long medium basic short pin name phrase )
+            ;;
+        -c) # complete counter.
+            COMPREPLY=( 1 )
+            ;;
+        -V) # complete versions.
+            COMPREPLY=( 0 1 2 3 )
+            ;;
+        -v) # complete variants.
+            COMPREPLY=( password login answer )
+            ;;
+        -C) # complete context.
+            ;;
+        *)
+            # previous word is not an option we can complete, complete site name (or option if leading -)
+            if [[ $cword = -* ]]; then
+                COMPREPLY=( -u -t -c -V -v -C )
+            else
+                local w fullName=$MP_FULLNAME
+                for (( w = 0; w < ${#COMP_WORDS[@]}; ++w )); do
+                    [[ ${COMP_WORDS[w]} = -u ]] && fullName=$(xargs <<< "${COMP_WORDS[w + 1]}") && break
+                done
+                if [[ -e ~/.mpw.d/"$fullName.mpsites" ]]; then
+                    IFS=$'\n' read -d '' -ra COMPREPLY < <(awk -F$'\t' '!/^ *#/{sub(/^ */, "", $2); print $2}' ~/.mpw.d/"$fullName.mpsites")
+                    printf -v _comp_title 'Sites for %s' "$fullName"
+                else
+                    # Default list from the Alexa Top 500
+                    COMPREPLY=(
+                        163.com 360.cn 9gag.com adobe.com alibaba.com aliexpress.com amazon.com
+                        apple.com archive.org ask.com baidu.com battle.net booking.com buzzfeed.com
+                        chase.com cnn.com comcast.net craigslist.org dailymotion.com dell.com
+                        deviantart.com diply.com disqus.com dropbox.com ebay.com engadget.com
+                        espn.go.com evernote.com facebook.com fedex.com feedly.com flickr.com
+                        flipkart.com github.com gizmodo.com go.com goodreads.com google.com
+                        huffingtonpost.com hulu.com ign.com ikea.com imdb.com imgur.com
+                        indiatimes.com instagram.com jd.com kickass.to kickstarter.com linkedin.com
+                        live.com livedoor.com mail.ru mozilla.org naver.com netflix.com newegg.com
+                        nicovideo.jp nytimes.com pandora.com paypal.com pinterest.com pornhub.com
+                        qq.com rakuten.co.jp reddit.com redtube.com shutterstock.com skype.com
+                        soso.com spiegel.de spotify.com stackexchange.com steampowered.com
+                        stumbleupon.com taobao.com target.com thepiratebay.se tmall.com
+                        torrentz.eu tripadvisor.com tube8.com tubecup.com tudou.com tumblr.com
+                        twitter.com uol.com.br vimeo.com vk.com walmart.com weibo.com whatsapp.com
+                        wikia.com wikipedia.org wired.com wordpress.com xhamster.com xinhuanet.com
+                        xvideos.com yahoo.com yandex.ru yelp.com youku.com youporn.com ziddu.com
+                    )
+                fi
+            fi ;;
+    esac
+    _comp_finish_completions
+}
+
+#complete -F _show_args mpw
+complete -o nospace -F _comp_mpw mpw

MasterPassword/Java/masterpassword-algorithm/pom.xml

@@ -7,13 +7,12 @@
     <parent>
         <groupId>com.lyndir.masterpassword</groupId>
         <artifactId>masterpassword</artifactId>
-        <version>GIT-SNAPSHOT</version>
+        <version>2.4-java</version>
     </parent>
 
     <name>Master Password Algorithm Implementation</name>
     <description>The implementation of the Master Password algorithm</description>
 
-    <groupId>com.lyndir.masterpassword</groupId>
     <artifactId>masterpassword-algorithm</artifactId>
     <packaging>jar</packaging>
 
@@ -24,12 +23,13 @@
         <dependency>
             <groupId>com.lyndir.lhunath.opal</groupId>
             <artifactId>opal-system</artifactId>
-            <version>1.6-p7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.lyndir.lhunath.opal</groupId>
-            <artifactId>opal-crypto</artifactId>
-            <version>1.6-p7</version>
+            <version>1.6-p9</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>joda-time</groupId>
+                    <artifactId>joda-time</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- EXTERNAL DEPENDENCIES -->
@@ -39,18 +39,6 @@
             <version>1.4.0</version>
         </dependency>
 
-        <!-- TESTING -->
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
 </project>

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

@@ -0,0 +1,79 @@
+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/MPSiteType.java

@@ -6,6 +6,7 @@ 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;
 
 
 /**
@@ -15,12 +16,12 @@ import javax.annotation.Nullable;
  */
 public enum MPSiteType {
 
-    GeneratedMaximum( "20 characters, contains symbols.", //
+    GeneratedMaximum( "Max", "20 characters, contains symbols.", //
                       ImmutableList.of( "x", "max", "maximum" ), //
                       ImmutableList.of( new MPTemplate( "anoxxxxxxxxxxxxxxxxx" ), new MPTemplate( "axxxxxxxxxxxxxxxxxno" ) ), //
                       MPSiteTypeClass.Generated, 0x0 ),
 
-    GeneratedLong( "Copy-friendly, 14 characters, contains symbols.", //
+    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" ),
@@ -35,49 +36,50 @@ public enum MPSiteType {
                                      new MPTemplate( "CvccCvcvCvccno" ) ), //
                    MPSiteTypeClass.Generated, 0x1 ),
 
-    GeneratedMedium( "Copy-friendly, 8 characters, contains symbols.", //
+    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( "8 characters, no symbols.", //
+    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( "Copy-friendly, 4 characters, no symbols.", //
+    GeneratedShort( "Short", "Copy-friendly, 4 characters, no symbols.", //
                     ImmutableList.of( "s", "short" ), //
                     ImmutableList.of( new MPTemplate( "Cvcn" ) ), //
                     MPSiteTypeClass.Generated, 0x4 ),
 
-    GeneratedPIN( "4 numbers.", //
+    GeneratedPIN( "PIN", "4 numbers.", //
                   ImmutableList.of( "i", "pin" ), //
                   ImmutableList.of( new MPTemplate( "nnnn" ) ), //
                   MPSiteTypeClass.Generated, 0x5 ),
 
-    GeneratedName( "9 letter name.", //
+    GeneratedName( "Name", "9 letter name.", //
                    ImmutableList.of( "n", "name" ), //
                    ImmutableList.of( new MPTemplate( "cvccvcvcv" ) ), //
                    MPSiteTypeClass.Generated, 0xE ),
 
-    GeneratedPhrase( "20 character sentence.", //
+    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( "AES-encrypted, exportable.", //
+    StoredPersonal( "Personal", "AES-encrypted, exportable.", //
                     ImmutableList.of( "personal" ), //
                     ImmutableList.<MPTemplate>of(), //
                     MPSiteTypeClass.Stored, 0x0, MPSiteFeature.ExportContent ),
 
-    StoredDevicePrivate( "AES-encrypted, not exported.", //
+    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;
@@ -85,9 +87,10 @@ public enum MPSiteType {
     private final int                typeIndex;
     private final Set<MPSiteFeature> typeFeatures;
 
-    MPSiteType(final String description, final List<String> options, final List<MPTemplate> templates, final MPSiteTypeClass typeClass,
-               final int typeIndex, final 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;
@@ -101,6 +104,10 @@ public enum MPSiteType {
         this.typeFeatures = typeFeaturesBuilder.build();
     }
 
+    public String getShortName() {
+        return shortName;
+    }
+
     public String getDescription() {
 
         return description;
@@ -143,11 +150,12 @@ public enum MPSiteType {
     }
 
     /**
-     * @param name The name of the type to look up.  It is matched case insensitively.
+     * @param name The name fromInt the type to look up.  It is matched case insensitively.
      *
      * @return The type registered with the given name.
      */
-    public static MPSiteType forName(final String name) {
+    @Contract("!null -> !null, null -> null")
+    public static MPSiteType forName(@Nullable final String name) {
 
         if (name == null)
             return null;

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

@@ -3,6 +3,8 @@ 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;
 
 
 /**
@@ -61,11 +63,12 @@ public enum MPSiteVariant {
         throw logger.bug( "No variant for option: %s", option );
     }
     /**
-     * @param name The name of the variant to look up.  It is matched case insensitively.
+     * @param name The name fromInt the variant to look up.  It is matched case insensitively.
      *
      * @return The variant registered with the given name.
      */
-    public static MPSiteVariant forName(final String name) {
+    @Contract("!null -> !null, null -> null")
+    public static MPSiteVariant forName(@Nullable final String name) {
 
         if (name == null)
             return null;

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

@@ -3,10 +3,8 @@ package com.lyndir.masterpassword;
 import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.lyndir.lhunath.opal.system.util.MetaObject;
 import java.util.List;
-import java.util.Map;
 
 
 /**

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

@@ -1,8 +1,6 @@
 package com.lyndir.masterpassword;
 
 import com.lyndir.lhunath.opal.system.logging.Logger;
-import com.lyndir.lhunath.opal.system.util.MetaObject;
-import com.lyndir.lhunath.opal.system.util.ObjectMeta;
 
 
 /**

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

@@ -1,145 +1,196 @@
 package com.lyndir.masterpassword;
 
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
-import com.google.common.primitives.Bytes;
-import com.lambdaworks.crypto.SCrypt;
+import com.google.common.primitives.UnsignedInteger;
 import com.lyndir.lhunath.opal.system.*;
 import com.lyndir.lhunath.opal.system.logging.Logger;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.charset.Charset;
-import java.security.GeneralSecurityException;
 import java.util.Arrays;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 
 /**
  * @author lhunath, 2014-08-30
  */
-public class MasterKey {
-
-    public static final int    ALGORITHM = 1;
-    public static final String VERSION   = "2.1";
+public abstract class MasterKey {
 
     @SuppressWarnings("UnusedDeclaration")
-    private static final Logger                       logger       = Logger.get( MasterKey.class );
-    private static final int                          MP_N         = 32768;
-    private static final int                          MP_r         = 8;
-    private static final int                          MP_p         = 2;
-    private static final int                          MP_dkLen     = 64;
-    private static final int                          MP_intLen    = 32;
-    private static final Charset                      MP_charset   = Charsets.UTF_8;
-    private static final ByteOrder                    MP_byteOrder = ByteOrder.BIG_ENDIAN;
-    private static final MessageDigests               MP_hash      = MessageDigests.SHA256;
-    private static final MessageAuthenticationDigests MP_mac       = MessageAuthenticationDigests.HmacSHA256;
+    private static final Logger  logger               = Logger.get( MasterKey.class );
+    private static       boolean allowNativeByDefault = true;
 
+    @Nonnull
     private final String fullName;
-    private final byte[] masterKey;
+    private boolean allowNative = allowNativeByDefault;
 
-    private boolean valid;
+    @Nullable
+    private byte[] masterKey;
 
-    public MasterKey(final String fullName, final String masterPassword) {
+    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 );
-        logger.trc( "masterPassword: %s", masterPassword );
-
-        long start = System.currentTimeMillis();
-        byte[] userNameBytes = fullName.getBytes( MP_charset );
-        byte[] userNameLengthBytes = bytesForInt( userNameBytes.length );
-
-        String mpKeyScope = MPSiteVariant.Password.getScope();
-        byte[] masterKeySalt = Bytes.concat( mpKeyScope.getBytes( MP_charset ), userNameLengthBytes, userNameBytes );
-        logger.trc( "key scope: %s", mpKeyScope );
-        logger.trc( "masterKeySalt ID: %s", CodeUtils.encodeHex( idForBytes( masterKeySalt ) ) );
-
-        try {
-            masterKey = SCrypt.scrypt( masterPassword.getBytes( MP_charset ), masterKeySalt, MP_N, MP_r, MP_p, MP_dkLen );
-            valid = true;
-
-            logger.trc( "masterKey ID: %s (derived in %.2fs)", CodeUtils.encodeHex( idForBytes( masterKey ) ),
-                        (System.currentTimeMillis() - start) / 1000D );
-        }
-        catch (GeneralSecurityException e) {
-            throw logger.bug( e );
-        }
     }
 
+    @Nullable
+    protected abstract byte[] deriveKey(final char[] masterPassword);
+
+    public abstract Version getAlgorithmVersion();
+
+    @NotNull
     public String getFullName() {
 
         return fullName;
     }
 
-    public byte[] getKeyID() {
-
-        Preconditions.checkState( valid );
-        return idForBytes( masterKey );
+    public boolean isAllowNative() {
+        return allowNative;
     }
 
-    public String encode(final String siteName, final MPSiteType siteType, int siteCounter, final MPSiteVariant siteVariant,
-                         @Nullable final String siteContext) {
-        Preconditions.checkState( valid );
-        Preconditions.checkArgument( siteType.getTypeClass() == MPSiteTypeClass.Generated );
-        Preconditions.checkArgument( !siteName.isEmpty() );
+    public MasterKey setAllowNative(final boolean allowNative) {
+        this.allowNative = allowNative;
+        return this;
+    }
 
-        logger.trc( "siteName: %s", siteName );
-        logger.trc( "siteCounter: %d", siteCounter );
-        logger.trc( "siteVariant: %d (%s)", siteVariant.ordinal(), siteVariant );
-        logger.trc( "siteType: %d (%s)", siteType.ordinal(), siteType );
+    @Nonnull
+    protected byte[] getKey() {
 
-        if (siteCounter == 0)
-            siteCounter = (int) (System.currentTimeMillis() / (300 * 1000)) * 300;
+        Preconditions.checkState( isValid() );
+        return Preconditions.checkNotNull( masterKey );
+    }
 
-        String siteScope = siteVariant.getScope();
-        byte[] siteNameBytes = siteName.getBytes( MP_charset );
-        byte[] siteNameLengthBytes = bytesForInt( siteNameBytes.length );
-        byte[] siteCounterBytes = bytesForInt( siteCounter );
-        byte[] siteContextBytes = siteContext == null? null: siteContext.getBytes( MP_charset );
-        byte[] siteContextLengthBytes = bytesForInt( siteContextBytes == null? 0: siteContextBytes.length );
-        logger.trc( "site scope: %s, context: %s", siteScope, siteContext == null? "<empty>": siteContext );
-        logger.trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)", siteScope, CodeUtils.encodeHex( siteNameLengthBytes ),
-                    siteName, CodeUtils.encodeHex( siteCounterBytes ), CodeUtils.encodeHex( siteContextLengthBytes ),
-                    siteContext == null? "(null)": siteContext );
+    public byte[] getKeyID() {
 
-        byte[] sitePasswordInfo = Bytes.concat( siteScope.getBytes( MP_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes );
-        if (siteContextBytes != null)
-            sitePasswordInfo = Bytes.concat( sitePasswordInfo, siteContextLengthBytes, siteContextBytes );
-        logger.trc( "sitePasswordInfo ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordInfo ) ) );
+        return idForBytes( getKey() );
+    }
 
-        byte[] sitePasswordSeed = MP_mac.of( masterKey, sitePasswordInfo );
-        logger.trc( "sitePasswordSeed ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordSeed ) ) );
+    public abstract String encode(@Nonnull final String siteName, final MPSiteType siteType, @Nonnull final UnsignedInteger siteCounter,
+                                  final MPSiteVariant siteVariant, @Nullable final String siteContext);
 
-        Preconditions.checkState( sitePasswordSeed.length > 0 );
-        int templateIndex = sitePasswordSeed[0] & 0xFF; // Mask the integer's sign.
-        MPTemplate template = siteType.getTemplateAtRollingIndex( templateIndex );
-        logger.trc( "type %s, template: %s", siteType, template.getTemplateString() );
-
-        StringBuilder password = new StringBuilder( template.length() );
-        for (int i = 0; i < template.length(); ++i) {
-            int characterIndex = sitePasswordSeed[i + 1] & 0xFF; // Mask the integer's sign.
-            MPTemplateCharacterClass characterClass = template.getCharacterClassAtIndex( i );
-            char passwordCharacter = characterClass.getCharacterAtRollingIndex( characterIndex );
-            logger.trc( "class %c, index %d (0x%02X) -> character: %c", characterClass.getIdentifier(), characterIndex,
-                        sitePasswordSeed[i + 1], passwordCharacter );
-
-            password.append( passwordCharacter );
-        }
-
-        return password.toString();
+    public boolean isValid() {
+        return masterKey != null;
     }
 
     public void invalidate() {
 
-        valid = false;
-        Arrays.fill( masterKey, (byte) 0 );
+        if (masterKey != null) {
+            Arrays.fill( masterKey, (byte) 0 );
+            masterKey = null;
+        }
     }
 
-    private static byte[] bytesForInt(final int integer) {
-        return ByteBuffer.allocate( MP_intLen / Byte.SIZE ).order( MP_byteOrder ).putInt( integer ).array();
+    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;
     }
 
-    private static byte[] idForBytes(final byte[] bytes) {
-        return MP_hash.of( bytes );
+    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 );
+        }
     }
 }

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

@@ -0,0 +1,161 @@
+package com.lyndir.masterpassword;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Bytes;
+import com.google.common.primitives.UnsignedInteger;
+import com.lambdaworks.crypto.SCrypt;
+import com.lyndir.lhunath.opal.system.*;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.nio.*;
+import java.nio.charset.Charset;
+import java.security.GeneralSecurityException;
+import java.util.Arrays;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
+/**
+ * bugs:
+ * - V2: miscounted the byte-length fromInt multi-byte full names.
+ * - V1: miscounted the byte-length fromInt multi-byte site names.
+ * - V0: does math with chars whose signedness was platform-dependent.
+ *
+ * @author lhunath, 2014-08-30
+ */
+public class MasterKeyV0 extends MasterKey {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MasterKeyV0.class );
+
+    protected final int                          MP_N         = 32768;
+    protected final int                          MP_r         = 8;
+    protected final int                          MP_p         = 2;
+    protected final int                          MP_dkLen     = 64;
+    protected final int                          MP_intLen    = 32;
+    protected final Charset                      MP_charset   = Charsets.UTF_8;
+    protected final ByteOrder                    MP_byteOrder = ByteOrder.BIG_ENDIAN;
+    protected final MessageDigests               MP_hash      = MessageDigests.SHA256;
+    protected final MessageAuthenticationDigests MP_mac       = MessageAuthenticationDigests.HmacSHA256;
+
+    public MasterKeyV0(final String fullName) {
+        super( fullName );
+    }
+
+    @Override
+    public Version getAlgorithmVersion() {
+
+        return Version.V0;
+    }
+
+    @Nullable
+    @Override
+    protected byte[] deriveKey(final char[] masterPassword) {
+        String fullName = getFullName();
+        byte[] fullNameBytes = fullName.getBytes( MP_charset );
+        byte[] fullNameLengthBytes = bytesForInt( fullName.length() );
+
+        String mpKeyScope = MPSiteVariant.Password.getScope();
+        byte[] masterKeySalt = Bytes.concat( mpKeyScope.getBytes( MP_charset ), fullNameLengthBytes, fullNameBytes );
+        logger.trc( "key scope: %s", mpKeyScope );
+        logger.trc( "masterKeySalt ID: %s", CodeUtils.encodeHex( idForBytes( masterKeySalt ) ) );
+
+        ByteBuffer mpBytesBuf = MP_charset.encode( CharBuffer.wrap( masterPassword ) );
+        byte[] mpBytes = new byte[mpBytesBuf.remaining()];
+        mpBytesBuf.get( mpBytes, 0, mpBytes.length );
+        Arrays.fill( mpBytesBuf.array(), (byte) 0 );
+
+        return scrypt( masterKeySalt, mpBytes );
+    }
+
+    protected byte[] scrypt(final byte[] masterKeySalt, final byte[] mpBytes) {
+        try {
+            if (isAllowNative())
+                return SCrypt.scrypt( mpBytes, masterKeySalt, MP_N, MP_r, MP_p, MP_dkLen );
+            else
+                return SCrypt.scryptJ( mpBytes, masterKeySalt, MP_N, MP_r, MP_p, MP_dkLen );
+        }
+        catch (GeneralSecurityException e) {
+            logger.bug( e );
+            return null;
+        }
+        finally {
+            Arrays.fill( mpBytes, (byte) 0 );
+        }
+    }
+
+    @Override
+    public String encode(@Nonnull final String siteName, final MPSiteType siteType, @Nonnull UnsignedInteger siteCounter,
+                         final MPSiteVariant siteVariant, @Nullable final String siteContext) {
+        Preconditions.checkArgument( siteType.getTypeClass() == MPSiteTypeClass.Generated );
+        Preconditions.checkArgument( !siteName.isEmpty() );
+
+        logger.trc( "siteName: %s", siteName );
+        logger.trc( "siteCounter: %d", siteCounter.longValue() );
+        logger.trc( "siteVariant: %d (%s)", siteVariant.ordinal(), siteVariant );
+        logger.trc( "siteType: %d (%s)", siteType.ordinal(), siteType );
+
+        if (siteCounter.longValue() == 0)
+            siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (300 * 1000)) * 300 );
+
+        String siteScope = siteVariant.getScope();
+        byte[] siteNameBytes = siteName.getBytes( MP_charset );
+        byte[] siteNameLengthBytes = bytesForInt( siteName.length() );
+        byte[] siteCounterBytes = bytesForInt( siteCounter );
+        byte[] siteContextBytes = siteContext == null || siteContext.isEmpty()? null: siteContext.getBytes( MP_charset );
+        byte[] siteContextLengthBytes = bytesForInt( siteContextBytes == null? 0: siteContextBytes.length );
+        logger.trc( "site scope: %s, context: %s", siteScope, siteContextBytes == null? "<empty>": siteContext );
+        logger.trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)", siteScope, CodeUtils.encodeHex( siteNameLengthBytes ),
+                    siteName, CodeUtils.encodeHex( siteCounterBytes ), CodeUtils.encodeHex( siteContextLengthBytes ),
+                    siteContextBytes == null? "(null)": siteContext );
+
+        byte[] sitePasswordInfo = Bytes.concat( siteScope.getBytes( MP_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes );
+        if (siteContextBytes != null)
+            sitePasswordInfo = Bytes.concat( sitePasswordInfo, siteContextLengthBytes, siteContextBytes );
+        logger.trc( "sitePasswordInfo ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordInfo ) ) );
+
+        byte[] sitePasswordSeedBytes = MP_mac.of( getKey(), sitePasswordInfo );
+        int[] sitePasswordSeed = new int[sitePasswordSeedBytes.length];
+        for (int i = 0; i < sitePasswordSeedBytes.length; ++i) {
+            ByteBuffer buf = ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( ByteOrder.BIG_ENDIAN );
+            Arrays.fill( buf.array(), sitePasswordSeedBytes[i] > 0? (byte) 0x00: (byte) 0xFF );
+            buf.position( 2 );
+            buf.put( sitePasswordSeedBytes[i] ).rewind();
+            sitePasswordSeed[i] = buf.getInt() & 0xFFFF;
+        }
+        logger.trc( "sitePasswordSeed ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordSeedBytes ) ) );
+
+        Preconditions.checkState( sitePasswordSeed.length > 0 );
+        int templateIndex = sitePasswordSeed[0];
+        MPTemplate template = siteType.getTemplateAtRollingIndex( templateIndex );
+        logger.trc( "type %s, template: %s", siteType, template.getTemplateString() );
+
+        StringBuilder password = new StringBuilder( template.length() );
+        for (int i = 0; i < template.length(); ++i) {
+            int characterIndex = sitePasswordSeed[i + 1];
+            MPTemplateCharacterClass characterClass = template.getCharacterClassAtIndex( i );
+            char passwordCharacter = characterClass.getCharacterAtRollingIndex( characterIndex );
+            logger.trc( "class %c, index %d (0x%02X) -> character: %c", characterClass.getIdentifier(), characterIndex,
+                        sitePasswordSeed[i + 1], passwordCharacter );
+
+            password.append( passwordCharacter );
+        }
+
+        return password.toString();
+    }
+
+    @Override
+    protected byte[] bytesForInt(final int number) {
+        return ByteBuffer.allocate( MP_intLen / Byte.SIZE ).order( MP_byteOrder ).putInt( number ).array();
+    }
+
+    @Override
+    protected byte[] bytesForInt(@Nonnull final UnsignedInteger number) {
+        return ByteBuffer.allocate( MP_intLen / Byte.SIZE ).order( MP_byteOrder ).putInt( number.intValue() ).array();
+    }
+
+    @Override
+    protected byte[] idForBytes(final byte[] bytes) {
+        return MP_hash.of( bytes );
+    }
+}

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

@@ -0,0 +1,85 @@
+package com.lyndir.masterpassword;
+
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Bytes;
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.lhunath.opal.system.*;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
+/**
+ * bugs:
+ * - V2: miscounted the byte-length fromInt multi-byte full names.
+ * - V1: miscounted the byte-length fromInt multi-byte site names.
+ *
+ * @author lhunath, 2014-08-30
+ */
+public class MasterKeyV1 extends MasterKeyV0 {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MasterKeyV1.class );
+
+    public MasterKeyV1(final String fullName) {
+        super( fullName );
+    }
+
+    @Override
+    public Version getAlgorithmVersion() {
+
+        return Version.V1;
+    }
+
+    @Override
+    public String encode(@Nonnull final String siteName, final MPSiteType siteType, @Nonnull UnsignedInteger siteCounter,
+                         final MPSiteVariant siteVariant, @Nullable final String siteContext) {
+        Preconditions.checkArgument( siteType.getTypeClass() == MPSiteTypeClass.Generated );
+        Preconditions.checkArgument( !siteName.isEmpty() );
+
+        logger.trc( "siteName: %s", siteName );
+        logger.trc( "siteCounter: %d", siteCounter.longValue() );
+        logger.trc( "siteVariant: %d (%s)", siteVariant.ordinal(), siteVariant );
+        logger.trc( "siteType: %d (%s)", siteType.ordinal(), siteType );
+
+        if (siteCounter.longValue() == 0)
+            siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (300 * 1000)) * 300 );
+
+        String siteScope = siteVariant.getScope();
+        byte[] siteNameBytes = siteName.getBytes( MP_charset );
+        byte[] siteNameLengthBytes = bytesForInt( siteName.length() );
+        byte[] siteCounterBytes = bytesForInt( siteCounter );
+        byte[] siteContextBytes = siteContext == null || siteContext.isEmpty()? null: siteContext.getBytes( MP_charset );
+        byte[] siteContextLengthBytes = bytesForInt( siteContextBytes == null? 0: siteContextBytes.length );
+        logger.trc( "site scope: %s, context: %s", siteScope, siteContextBytes == null? "<empty>": siteContext );
+        logger.trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)", siteScope, CodeUtils.encodeHex( siteNameLengthBytes ),
+                    siteName, CodeUtils.encodeHex( siteCounterBytes ), CodeUtils.encodeHex( siteContextLengthBytes ),
+                    siteContextBytes == null? "(null)": siteContext );
+
+        byte[] sitePasswordInfo = Bytes.concat( siteScope.getBytes( MP_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes );
+        if (siteContextBytes != null)
+            sitePasswordInfo = Bytes.concat( sitePasswordInfo, siteContextLengthBytes, siteContextBytes );
+        logger.trc( "sitePasswordInfo ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordInfo ) ) );
+
+        byte[] sitePasswordSeed = MP_mac.of( getKey(), sitePasswordInfo );
+        logger.trc( "sitePasswordSeed ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordSeed ) ) );
+
+        Preconditions.checkState( sitePasswordSeed.length > 0 );
+        int templateIndex = sitePasswordSeed[0] & 0xFF; // Mask the integer's sign.
+        MPTemplate template = siteType.getTemplateAtRollingIndex( templateIndex );
+        logger.trc( "type %s, template: %s", siteType, template.getTemplateString() );
+
+        StringBuilder password = new StringBuilder( template.length() );
+        for (int i = 0; i < template.length(); ++i) {
+            int characterIndex = sitePasswordSeed[i + 1] & 0xFF; // Mask the integer's sign.
+            MPTemplateCharacterClass characterClass = template.getCharacterClassAtIndex( i );
+            char passwordCharacter = characterClass.getCharacterAtRollingIndex( characterIndex );
+            logger.trc( "class %c, index %d (0x%02X) -> character: %c", characterClass.getIdentifier(), characterIndex,
+                        sitePasswordSeed[i + 1], passwordCharacter );
+
+            password.append( passwordCharacter );
+        }
+
+        return password.toString();
+    }
+}

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

@@ -0,0 +1,84 @@
+package com.lyndir.masterpassword;
+
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Bytes;
+import com.google.common.primitives.UnsignedInteger;
+import com.lyndir.lhunath.opal.system.CodeUtils;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+
+/**
+ * bugs:
+ * - V2: miscounted the byte-length fromInt multi-byte full names.
+ * 
+ * @author lhunath, 2014-08-30
+ */
+public class MasterKeyV2 extends MasterKeyV1 {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MasterKeyV2.class );
+
+    public MasterKeyV2(final String fullName) {
+        super( fullName );
+    }
+
+    @Override
+    public Version getAlgorithmVersion() {
+
+        return Version.V2;
+    }
+
+    @Override
+    public String encode(@Nonnull final String siteName, final MPSiteType siteType, @Nonnull UnsignedInteger siteCounter,
+                         final MPSiteVariant siteVariant, @Nullable final String siteContext) {
+        Preconditions.checkArgument( siteType.getTypeClass() == MPSiteTypeClass.Generated );
+        Preconditions.checkArgument( !siteName.isEmpty() );
+
+        logger.trc( "siteName: %s", siteName );
+        logger.trc( "siteCounter: %d", siteCounter.longValue() );
+        logger.trc( "siteVariant: %d (%s)", siteVariant.ordinal(), siteVariant );
+        logger.trc( "siteType: %d (%s)", siteType.ordinal(), siteType );
+
+        if (siteCounter.longValue() == 0)
+            siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (300 * 1000)) * 300 );
+
+        String siteScope = siteVariant.getScope();
+        byte[] siteNameBytes = siteName.getBytes( MP_charset );
+        byte[] siteNameLengthBytes = bytesForInt( siteNameBytes.length );
+        byte[] siteCounterBytes = bytesForInt( siteCounter );
+        byte[] siteContextBytes = siteContext == null || siteContext.isEmpty()? null: siteContext.getBytes( MP_charset );
+        byte[] siteContextLengthBytes = bytesForInt( siteContextBytes == null? 0: siteContextBytes.length );
+        logger.trc( "site scope: %s, context: %s", siteScope, siteContextBytes == null? "<empty>": siteContext );
+        logger.trc( "seed from: hmac-sha256(masterKey, %s | %s | %s | %s | %s | %s)", siteScope, CodeUtils.encodeHex( siteNameLengthBytes ),
+                    siteName, CodeUtils.encodeHex( siteCounterBytes ), CodeUtils.encodeHex( siteContextLengthBytes ),
+                    siteContextBytes == null? "(null)": siteContext );
+
+        byte[] sitePasswordInfo = Bytes.concat( siteScope.getBytes( MP_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes );
+        if (siteContextBytes != null)
+            sitePasswordInfo = Bytes.concat( sitePasswordInfo, siteContextLengthBytes, siteContextBytes );
+        logger.trc( "sitePasswordInfo ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordInfo ) ) );
+
+        byte[] sitePasswordSeed = MP_mac.of( getKey(), sitePasswordInfo );
+        logger.trc( "sitePasswordSeed ID: %s", CodeUtils.encodeHex( idForBytes( sitePasswordSeed ) ) );
+
+        Preconditions.checkState( sitePasswordSeed.length > 0 );
+        int templateIndex = sitePasswordSeed[0] & 0xFF; // Mask the integer's sign.
+        MPTemplate template = siteType.getTemplateAtRollingIndex( templateIndex );
+        logger.trc( "type %s, template: %s", siteType, template.getTemplateString() );
+
+        StringBuilder password = new StringBuilder( template.length() );
+        for (int i = 0; i < template.length(); ++i) {
+            int characterIndex = sitePasswordSeed[i + 1] & 0xFF; // Mask the integer's sign.
+            MPTemplateCharacterClass characterClass = template.getCharacterClassAtIndex( i );
+            char passwordCharacter = characterClass.getCharacterAtRollingIndex( characterIndex );
+            logger.trc( "class %c, index %d (0x%02X) -> character: %c", characterClass.getIdentifier(), characterIndex,
+                        sitePasswordSeed[i + 1], passwordCharacter );
+
+            password.append( passwordCharacter );
+        }
+
+        return password.toString();
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.lyndir.masterpassword;
+
+import com.google.common.primitives.Bytes;
+import com.lambdaworks.crypto.SCrypt;
+import com.lyndir.lhunath.opal.system.CodeUtils;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.security.GeneralSecurityException;
+import java.util.Arrays;
+import javax.annotation.Nullable;
+
+
+/**
+ * bugs:
+ * - no known issues.
+ *
+ * @author lhunath, 2014-08-30
+ */
+public class MasterKeyV3 extends MasterKeyV2 {
+
+    @SuppressWarnings("UnusedDeclaration")
+    private static final Logger logger = Logger.get( MasterKeyV3.class );
+
+    public MasterKeyV3(final String fullName) {
+        super( fullName );
+    }
+
+    @Override
+    public Version getAlgorithmVersion() {
+
+        return Version.V3;
+    }
+
+    @Nullable
+    @Override
+    protected byte[] deriveKey(final char[] masterPassword) {
+        byte[] fullNameBytes = getFullName().getBytes( MP_charset );
+        byte[] fullNameLengthBytes = bytesForInt( fullNameBytes.length );
+
+        String mpKeyScope = MPSiteVariant.Password.getScope();
+        byte[] masterKeySalt = Bytes.concat( mpKeyScope.getBytes( MP_charset ), fullNameLengthBytes, fullNameBytes );
+        logger.trc( "key scope: %s", mpKeyScope );
+        logger.trc( "masterKeySalt ID: %s", CodeUtils.encodeHex( idForBytes( masterKeySalt ) ) );
+
+        ByteBuffer mpBytesBuf = MP_charset.encode( CharBuffer.wrap( masterPassword ) );
+        byte[] mpBytes = new byte[mpBytesBuf.remaining()];
+        mpBytesBuf.get( mpBytes, 0, mpBytes.length );
+        Arrays.fill( mpBytesBuf.array(), (byte) 0 );
+
+        return scrypt( masterKeySalt, mpBytes );
+    }
+}

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

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

MasterPassword/Java/masterpassword-algorithm/src/test/java/com/lyndir/masterpassword/MPWTests.java

@@ -1,188 +0,0 @@
-package com.lyndir.masterpassword;
-
-import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
-
-import com.lyndir.lhunath.opal.system.logging.Logger;
-import com.lyndir.lhunath.opal.system.util.NNSupplier;
-import com.lyndir.lhunath.opal.system.util.NSupplier;
-import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.xml.bind.annotation.*;
-
-
-/**
- * @author lhunath, 14-12-05
- */
-@XmlRootElement(name = "tests")
-public class MPWTests {
-
-    public static final String ID_DEFAULT = "default";
-
-    @SuppressWarnings("UnusedDeclaration")
-    private static final Logger logger = Logger.get( MPWTests.class );
-
-    @XmlElement(name = "case")
-    private List<Case> cases;
-
-    public List<Case> getCases() {
-        return cases;
-    }
-
-    public Case getCase(String identifier) {
-        for (Case testCase : getCases())
-            if (identifier.equals( testCase.getIdentifier() ))
-                return testCase;
-
-        throw new IllegalArgumentException( "No case for identifier: " + identifier );
-    }
-
-    @XmlRootElement(name = "case")
-    public static class Case {
-
-        @XmlAttribute(name = "id")
-        private String  identifier;
-        @XmlAttribute
-        private String  parent;
-        @XmlElement
-        private String  fullName;
-        @XmlElement
-        private String  masterPassword;
-        @XmlElement
-        private String  keyID;
-        @XmlElement
-        private String  siteName;
-        @XmlElement
-        private Integer siteCounter;
-        @XmlElement
-        private String  siteType;
-        @XmlElement
-        private String  siteVariant;
-        @XmlElement
-        private String  siteContext;
-        @XmlElement
-        private String  result;
-
-        private transient Case parentCase;
-
-        public void setTests(MPWTests tests) {
-
-            if (parent != null) {
-                parentCase = tests.getCase( parent );
-                fullName = ifNotNullElse( fullName, new NNSupplier<String>() {
-                    @Nonnull
-                    @Override
-                    public String get() {
-                        return parentCase.getFullName();
-                    }
-                } );
-                masterPassword = ifNotNullElse( masterPassword, new NNSupplier<String>() {
-                    @Nonnull
-                    @Override
-                    public String get() {
-                        return parentCase.getMasterPassword();
-                    }
-                } );
-                keyID = ifNotNullElse( keyID, new NNSupplier<String>() {
-                    @Nonnull
-                    @Override
-                    public String get() {
-                        return parentCase.getKeyID();
-                    }
-                } );
-                siteName = ifNotNullElse( siteName, new NNSupplier<String>() {
-                    @Nonnull
-                    @Override
-                    public String get() {
-                        return parentCase.getSiteName();
-                    }
-                } );
-                siteCounter = ifNotNullElse( siteCounter, new NNSupplier<Integer>() {
-                    @Nonnull
-                    @Override
-                    public Integer get() {
-                        return parentCase.getSiteCounter();
-                    }
-                } );
-                siteType = ifNotNullElse( siteType, new NNSupplier<String>() {
-                    @Nonnull
-                    @Override
-                    public String get() {
-                        return parentCase.getSiteType().name();
-                    }
-                } );
-                siteVariant = ifNotNullElse( siteVariant, new NNSupplier<String>() {
-                    @Nonnull
-                    @Override
-                    public String get() {
-                        return parentCase.getSiteVariant().name();
-                    }
-                } );
-                siteContext = ifNotNullElseNullable( siteContext, new NSupplier<String>() {
-                    @Nonnull
-                    @Override
-                    public String get() {
-                        return parentCase.getSiteContext();
-                    }
-                } );
-                result = ifNotNullElse( result, new NNSupplier<String>() {
-                    @Nonnull
-                    @Override
-                    public String get() {
-                        return parentCase.getResult();
-                    }
-                } );
-            }
-        }
-
-        public String getIdentifier() {
-            return identifier;
-        }
-
-        @Nullable
-        public Case getParentCase() {
-            return parentCase;
-        }
-
-        public String getFullName() {
-            return fullName;
-        }
-
-        public String getMasterPassword() {
-            return masterPassword;
-        }
-
-        public String getKeyID() {
-            return keyID;
-        }
-
-        public String getSiteName() {
-            return siteName;
-        }
-
-        public int getSiteCounter() {
-            return siteCounter;
-        }
-
-        public MPSiteType getSiteType() {
-            return MPSiteType.forName( siteType );
-        }
-
-        public MPSiteVariant getSiteVariant() {
-            return MPSiteVariant.forName( siteVariant );
-        }
-
-        public String getSiteContext() {
-            return siteContext;
-        }
-
-        public String getResult() {
-            return result;
-        }
-
-        @Override
-        public String toString() {
-            return identifier;
-        }
-    }
-}

MasterPassword/Java/masterpassword-algorithm/src/test/java/com/lyndir/masterpassword/MasterKeyTest.java

@@ -1,77 +0,0 @@
-package com.lyndir.masterpassword;
-
-import static org.testng.Assert.*;
-
-import com.google.common.io.Resources;
-import com.lyndir.lhunath.opal.system.CodeUtils;
-import com.lyndir.lhunath.opal.system.logging.Logger;
-import java.net.URL;
-import javax.xml.bind.JAXBContext;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-
-public class MasterKeyTest {
-
-    @SuppressWarnings("UnusedDeclaration")
-    private static final Logger logger = Logger.get( MasterKeyTest.class );
-
-    private MPWTests      tests;
-    private MPWTests.Case defaultCase;
-
-    @BeforeMethod
-    public void setUp()
-            throws Exception {
-
-        URL testCasesResource = Resources.getResource( "mpw_tests.xml" );
-        tests = (MPWTests) JAXBContext.newInstance( MPWTests.class ).createUnmarshaller().unmarshal( testCasesResource );
-        for (MPWTests.Case testCase : tests.getCases())
-            testCase.setTests( tests );
-        defaultCase = tests.getCase( MPWTests.ID_DEFAULT );
-    }
-
-    @Test
-    public void testEncode()
-            throws Exception {
-
-        for (MPWTests.Case testCase : tests.getCases()) {
-            MasterKey masterKey = new MasterKey( testCase.getFullName(), testCase.getMasterPassword() );
-            assertEquals(
-                    masterKey.encode( testCase.getSiteName(), testCase.getSiteType(), testCase.getSiteCounter(), testCase.getSiteVariant(),
-                                      testCase.getSiteContext() ), testCase.getResult(), "Failed test case: " + testCase );
-        }
-    }
-
-    @Test
-    public void testGetUserName()
-            throws Exception {
-
-        assertEquals( new MasterKey( defaultCase.getFullName(), defaultCase.getMasterPassword() ).getFullName(),
-                      defaultCase.getFullName() );
-    }
-
-    @Test
-    public void testGetKeyID()
-            throws Exception {
-
-        for (MPWTests.Case testCase : tests.getCases()) {
-            MasterKey masterKey = new MasterKey( testCase.getFullName(), testCase.getMasterPassword() );
-            assertEquals( CodeUtils.encodeHex( masterKey.getKeyID() ), testCase.getKeyID(), "Failed test case: " + testCase );
-        }
-    }
-
-    @Test
-    public void testInvalidate()
-            throws Exception {
-
-        try {
-            MasterKey masterKey = new MasterKey( defaultCase.getFullName(), defaultCase.getMasterPassword() );
-            masterKey.invalidate();
-            masterKey.encode( defaultCase.getSiteName(), defaultCase.getSiteType(), defaultCase.getSiteCounter(),
-                              defaultCase.getSiteVariant(), defaultCase.getSiteContext() );
-            assertTrue( false, "Master key should have been invalidated, but was still usable." );
-        }
-        catch (IllegalStateException ignored) {
-        }
-    }
-}

MasterPassword/Java/masterpassword-algorithm/src/test/resources/logback.xml

@@ -1,15 +0,0 @@
-<configuration scan="false">
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%-8relative %22c{0} [%-5level] %msg%n</Pattern>
-        </layout>
-    </appender>
-
-    <logger name="com.lyndir.masterpassword" level="${mp.log.level:-TRACE}" />
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-</configuration>

MasterPassword/Java/masterpassword-algorithm/src/test/resources/mpw_tests.xml

@@ -1,73 +0,0 @@
-<tests>
-    <case id="default">
-        <fullName>Robert Lee Mitchell</fullName>
-        <masterPassword>banana colored duckling</masterPassword>
-        <keyID>98EEF4D1DF46D849574A82A03C3177056B15DFFCA29BB3899DE4628453675302</keyID>
-        <siteName>masterpasswordapp.com</siteName>
-        <siteCounter>1</siteCounter>
-        <siteType>GeneratedLong</siteType>
-        <siteVariant>Password</siteVariant>
-        <result>Jejr5[RepuSosp</result>
-    </case>
-    <case id="mb_fullName" parent="default">
-        <fullName>⛄</fullName>
-        <keyID>1717AA1F9BF5BA56CD0965CDA3D78E6D2E6A1EA8C067A8EA621F3DDAD4A87EB8</keyID>
-        <result>NopaDajh8=Fene</result>
-    </case>
-    <case id="mb_masterPassword" parent="default">
-        <masterPassword>⛄</masterPassword>
-        <keyID>351432B8528A5ABECAB768CA95015097DE76FE14C41E10AF36C67DCFB8917E08</keyID>
-        <result>QesuHirv5-Xepl</result>
-    </case>
-    <case id="mb_siteName" parent="default">
-        <siteName>⛄</siteName>
-        <result>LiheCuwhSerz6)</result>
-    </case>
-    <case id="loginName" parent="default">
-        <siteVariant>Login</siteVariant>
-        <siteType>GeneratedName</siteType>
-        <result>wohzaqage</result>
-    </case>
-    <case id="securityAnswer" parent="default">
-        <siteVariant>Answer</siteVariant>
-        <siteType>GeneratedPhrase</siteType>
-        <result>xin diyjiqoja hubu</result>
-    </case>
-    <case id="securityAnswer_context" parent="securityAnswer">
-        <siteContext>question</siteContext>
-        <result>xogx tem cegyiva jab</result>
-    </case>
-    <case id="type_maximum" parent="default">
-        <siteType>GeneratedMaximum</siteType>
-        <result>W6@692^B1#&amp;@gVdSdLZ@</result>
-    </case>
-    <case id="type_medium" parent="default">
-        <siteType>GeneratedMedium</siteType>
-        <result>Jej2$Quv</result>
-    </case>
-    <case id="type_basic" parent="default">
-        <siteType>GeneratedBasic</siteType>
-        <result>WAo2xIg6</result>
-    </case>
-    <case id="type_short" parent="default">
-        <siteType>GeneratedShort</siteType>
-        <result>Jej2</result>
-    </case>
-    <case id="type_pin" parent="default">
-        <siteType>GeneratedPIN</siteType>
-        <result>7662</result>
-    </case>
-    <case id="type_name" parent="default">
-        <siteType>GeneratedName</siteType>
-        <result>jejraquvo</result>
-    </case>
-    <case id="type_phrase" parent="default">
-        <siteType>GeneratedPhrase</siteType>
-        <result>jejr quv cabsibu tam</result>
-    </case>
-    <case id="counter_ceiling" parent="default">
-        <siteCounter>4294967295</siteCounter>
-        <result>XambHoqo6[Peni</result>
-    </case>
-</tests>
-

MasterPassword/Java/masterpassword-android/AndroidManifest.xml

@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.lyndir.masterpassword"
-          android:versionCode="1"
-          android:versionName="GIT-SNAPSHOT">
+          android:versionCode="2003"
+          android:versionName="2.3">
 
     <uses-sdk
-            android:minSdkVersion="14"
-            android:targetSdkVersion="19" />
+            android:minSdkVersion="19"
+            android:targetSdkVersion="21" />
 
     <application
             android:icon="@drawable/icon"
             android:label="@string/app_name"
-            android:allowBackup="true">
-        <activity android:name=".EmergencyActivity">
+            android:allowBackup="true"
+            android:debuggable="true">
+        <activity android:name=".EmergencyActivity" android:theme="@style/MPTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".UsersActivity" />
+        <activity android:name=".TestActivity" android:theme="@style/MPTheme" />
     </application>
     
 </manifest>