Build fixes for iOS and Mac.

MasterPassword/C/build

@@ -81,11 +81,15 @@ unpack() {
         mv "$files"/* .
         rmdir "$files"
     fi
+    touch .unpacked
 }
 fetchSource() (
     source .source
 
-    if [[ $pkg && -e "${pkg##*/}" ]]; then
+    if [[ -e .unpacked ]]; then
+        true
+
+    elif [[ $pkg && -e "${pkg##*/}" ]]; then
         files=( !("${pkg##*/}") )
         [[ -e $files ]] || {
             echo
@@ -135,11 +139,14 @@ fetchSource() (
         exit 1
     fi
 
-    for patch in "${patches[@]}"; do
-        echo
-        echo "Patching: ${PWD##*/}, for $patch..."
-        patch -p0 < ../"${PWD##*/}-$patch.patch"
-    done
+    if [[ ! -e .patched ]] && (( ${#patches[@]} )); then
+        for patch in "${patches[@]}"; do
+            echo
+            echo "Patching: ${PWD##*/}, for $patch..."
+            patch -p0 < ../"${PWD##*/}-$patch.patch"
+        done
+        touch .patched
+    fi
 )
 depend() {
 
@@ -273,6 +280,7 @@ mpw-tests() {
         # include paths
         -I"lib/include"
         -I"/usr/include/libxml2"
+        -I"/usr/local/include/libxml2"
     )
     LDFLAGS=(
         # scrypt

MasterPassword/C/mpw-algorithm.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
-#import "mpw-types.h"
+#include "mpw-types.h"
 
 typedef enum(unsigned int, MPAlgorithmVersion) {
     /** V0 did math with chars whose signedness was platform-dependent. */

MasterPassword/C/mpw-algorithm_v0.c

@@ -9,8 +9,8 @@
 #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

MasterPassword/C/mpw-algorithm_v1.c

@@ -9,8 +9,8 @@
 #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

MasterPassword/C/mpw-algorithm_v2.c

@@ -9,8 +9,8 @@
 #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

MasterPassword/C/mpw-algorithm_v3.c

@@ -9,8 +9,8 @@
 #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

MasterPassword/C/mpw-bench.c

@@ -15,7 +15,6 @@
 #include <scrypt/sha256.h>
 #include <bcrypt/ow-crypt.h>
 
-#include "mpw-types.h"
 #include "mpw-algorithm.h"
 #include "mpw-util.h"
 

MasterPassword/C/mpw-cli.c

@@ -15,7 +15,6 @@
 
 #define ftl(...) do { fprintf( stderr, __VA_ARGS__ ); exit(2); } while (0)
 
-#include "mpw-types.h"
 #include "mpw-algorithm.h"
 #include "mpw-util.h"
 
@@ -112,11 +111,16 @@ 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:t:c:v:V:C:h" )) != -1;)
+    for (int opt; (opt = getopt( argc, argv, "u:P:t:c:v:V:C:h" )) != -1;)
         switch (opt) {
             case 'u':
                 fullName = optarg;
                 break;
+            case 'P':
+                // Do not use this.  Passing your master password via the command-line
+                // is insecure.  This is here for non-interactive testing purposes only.
+                masterPassword = strcpy( malloc( strlen( optarg ) + 1 ), optarg );
+                break;
             case 't':
                 siteTypeString = optarg;
                 break;

MasterPassword/C/mpw-tests.c

@@ -5,7 +5,6 @@
 
 #define ftl(...) do { fprintf( stderr, __VA_ARGS__ ); exit(2); } while (0)
 
-#include "mpw-types.h"
 #include "mpw-algorithm.h"
 #include "mpw-util.h"
 

MasterPassword/C/mpw-types.h

@@ -7,6 +7,7 @@
 //
 
 #include <stdlib.h>
+#include <stdint.h>
 
 #ifdef NS_ENUM
 #define enum(_type, _name) NS_ENUM(_type, _name)

MasterPassword/C/mpw-util.h

@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
+#include <stdint.h>
+
 //// Logging.
 
 #ifdef DEBUG

MasterPassword/ObjC/MPAlgorithmV0.m

@@ -719,7 +719,7 @@
         return NO;
 
     BIGNUM *permutations = BN_new(), *templatePermutations = BN_new();
-    for (int t = 0; t < count; ++t) {
+    for (size_t t = 0; t < count; ++t) {
         const char *template = templates[t];
         BN_one( templatePermutations );
 

MasterPassword/ObjC/Mac/MPPasswordWindowController.m

@@ -412,7 +412,7 @@
     NSArray *types = [site.algorithm allTypesStartingWith:MPSiteTypeGeneratedPIN];
     [self.passwordTypesMatrix renewRows:(NSInteger)[types count] columns:1];
     for (NSUInteger t = 0; t < [types count]; ++t) {
-        MPSiteType type = [types[t] unsignedIntegerValue];
+        MPSiteType type = (MPSiteType)[types[t] unsignedIntegerValue];
         NSString *title = [site.algorithm nameOfType:type];
         if (type & MPSiteTypeClassGenerated)
             title = [site.algorithm generatePasswordForSiteNamed:site.name ofType:type

MasterPassword/ObjC/Mac/MPSiteModel.h

@@ -18,6 +18,8 @@
 
 #import <Foundation/Foundation.h>
 #import "MPSiteEntity.h"
+#import "MPAlgorithm.h"
+
 @class MPSiteEntity;
 
 @interface MPSiteModel : NSObject

MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj

@@ -787,6 +787,10 @@
 		DA67743B1A474A03004F356A /* mpw-test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "mpw-test"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DA6774481A47C8F7004F356A /* mpw-tests-util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-tests-util.c"; sourceTree = "<group>"; };
 		DA6774491A47C8F7004F356A /* mpw-tests-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-tests-util.h"; sourceTree = "<group>"; };
+		DA831A271A6E1146000AC234 /* mpw-algorithm_v0.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v0.c"; sourceTree = "<group>"; };
+		DA831A281A6E1146000AC234 /* mpw-algorithm_v1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v1.c"; sourceTree = "<group>"; };
+		DA831A291A6E1146000AC234 /* mpw-algorithm_v2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v2.c"; sourceTree = "<group>"; };
+		DA831A2A1A6E1146000AC234 /* mpw-algorithm_v3.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v3.c"; sourceTree = "<group>"; };
 		DA89D4EA1A51EABD00AC64D7 /* Pearl-Cocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Pearl-Cocoa.h"; sourceTree = "<group>"; };
 		DA89D4EB1A51EABD00AC64D7 /* Pearl-Cocoa.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Pearl-Cocoa.m"; sourceTree = "<group>"; };
 		DA8ED891192906920099B726 /* PearlTween.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlTween.m; sourceTree = "<group>"; };
@@ -1539,6 +1543,10 @@
 				DA67732B1A4746AF004F356A /* build */,
 				DA67732C1A4746AF004F356A /* distribute */,
 				DA67732D1A4746AF004F356A /* install */,
+				DA831A271A6E1146000AC234 /* mpw-algorithm_v0.c */,
+				DA831A281A6E1146000AC234 /* mpw-algorithm_v1.c */,
+				DA831A291A6E1146000AC234 /* mpw-algorithm_v2.c */,
+				DA831A2A1A6E1146000AC234 /* mpw-algorithm_v3.c */,
 				DA6773BB1A4746AF004F356A /* mpw-algorithm.c */,
 				DA6773BC1A4746AF004F356A /* mpw-algorithm.h */,
 				DA6773BF1A4746AF004F356A /* mpw-bench.c */,

MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj

@@ -8,9 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		93D390228D0B8ED51C0AFDB4 /* bashlib in Resources */ = {isa = PBXBuildFile; fileRef = 93D39E71D6BAECEC4CD886F4 /* bashlib */; };
-		93D3906F9ED6493C81A59FC5 /* mpw-algorithm_v2.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D390A3B351FEF1B9EDAB56 /* mpw-algorithm_v2.c */; };
 		93D390C1B93F9D3AE37DD0A5 /* MPAnswersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39C426E03358384018E85 /* MPAnswersViewController.m */; };
-		93D390CE9E30180167317730 /* mpw-algorithm_v1.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D396F918E6470DB846C17F /* mpw-algorithm_v1.c */; };
 		93D391ECBD9BD2C64115B5DD /* PearlSizedTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39156E806BB78E04F78B9 /* PearlSizedTextView.m */; };
 		93D3922A53E41A54832E90D9 /* PearlOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D390FADEB325D8D54A957D /* PearlOverlay.m */; };
 		93D39262A8A97DB748213309 /* PearlEMail.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D393BB973253D4BAAC84AA /* PearlEMail.m */; };
@@ -22,7 +20,6 @@
 		93D39392DEDA376F93C6C718 /* MPCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39BAA71DE51B4D8A1286C /* MPCell.m */; };
 		93D3939661CE37180AF7CD6A /* MPStoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3957D76F71A652716EECC /* MPStoreViewController.m */; };
 		93D393DB5325820241BA90A7 /* PearlSizedTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D39A4759186F6D2D34AA6B /* PearlSizedTextView.h */; };
-		93D393E4A18BF21ABC229C1E /* mpw-algorithm_v3.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D39D4E713564B7654341B0 /* mpw-algorithm_v3.c */; };
 		93D394982CBD25D46692DD7C /* MPWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3990E0CD1B5CF9FBB2C07 /* MPWebViewController.m */; };
 		93D394B5036C882B33C71872 /* MPPasswordsSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39E7A12CC352B2825AA66 /* MPPasswordsSegue.m */; };
 		93D39536EB550E811CCD04BC /* UIResponder+PearlFirstResponder.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D394482BB07F90E8FD1314 /* UIResponder+PearlFirstResponder.h */; };
@@ -56,7 +53,6 @@
 		93D39B8F90F58A5D158DDBA3 /* MPPasswordsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3924EE15017F8A12CB436 /* MPPasswordsViewController.m */; };
 		93D39BA1EA3CAAC8A220B4A6 /* MPAppSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3916C1D8F1427DFBDEBCA /* MPAppSettingsViewController.m */; };
 		93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D396D04E57792A54D437AC /* NSArray+Indexing.h */; };
-		93D39C7B89BEA08A829C66F4 /* mpw-algorithm_v0.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D390A99850139D0FF0211E /* mpw-algorithm_v0.c */; };
 		93D39CEA71BD460ED4876920 /* build in Resources */ = {isa = PBXBuildFile; fileRef = 93D39B573E4DE98BAE518215 /* build */; };
 		93D39D38356F59DBEF934D70 /* MPAppDelegate_InApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D394C78C7B879C9AD9152C /* MPAppDelegate_InApp.m */; };
 		93D39D47FC623E91FC39D20C /* UICollectionView+PearlReloadFromArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3908DF8EABBD952065DC0 /* UICollectionView+PearlReloadFromArray.m */; };
@@ -1622,6 +1618,10 @@
 				93D39B573E4DE98BAE518215 /* build */,
 				93D3979016BF0C5B29D1340D /* distribute */,
 				93D39ACD33E79386E6F33601 /* install */,
+				93D390A99850139D0FF0211E /* mpw-algorithm_v0.c */,
+				93D396F918E6470DB846C17F /* mpw-algorithm_v1.c */,
+				93D390A3B351FEF1B9EDAB56 /* mpw-algorithm_v2.c */,
+				93D39D4E713564B7654341B0 /* mpw-algorithm_v3.c */,
 				93D3969393A3A46BD27D7078 /* mpw-algorithm.c */,
 				93D3990D850D76A94C6B7A4D /* mpw-algorithm.h */,
 				93D39B70138D0E28F7D5E86B /* mpw-bench.c */,
@@ -1634,10 +1634,6 @@
 				93D396C311C3725870343EE0 /* mpw-util.c */,
 				93D39CF7DB942C69D1C5D6BE /* mpw-util.h */,
 				93D39245A478883C672818F3 /* mpw.bashrc */,
-				93D396F918E6470DB846C17F /* mpw-algorithm_v1.c */,
-				93D390A99850139D0FF0211E /* mpw-algorithm_v0.c */,
-				93D390A3B351FEF1B9EDAB56 /* mpw-algorithm_v2.c */,
-				93D39D4E713564B7654341B0 /* mpw-algorithm_v3.c */,
 			);
 			name = C;
 			path = ../../C;
@@ -3655,10 +3651,6 @@
 				93D392FD5E2052F7D7DB3774 /* NSString+MPMarkDown.m in Sources */,
 				93D395B715D15F2B56F2A2EE /* mpw-types.c in Sources */,
 				93D39943D01E70DAC3B0DF76 /* mpw-util.c in Sources */,
-				93D390CE9E30180167317730 /* mpw-algorithm_v1.c in Sources */,
-				93D39C7B89BEA08A829C66F4 /* mpw-algorithm_v0.c in Sources */,
-				93D3906F9ED6493C81A59FC5 /* mpw-algorithm_v2.c in Sources */,
-				93D393E4A18BF21ABC229C1E /* mpw-algorithm_v3.c in Sources */,
 				93D39577FD8BB0945DB2F0A3 /* MPAlgorithmV3.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

MasterPassword/homebrew-mpw.rb

@@ -0,0 +1,32 @@
+require "formula"
+
+class Mpw < Formula
+  homepage "http://masterpasswordapp.com"
+  url "https://ssl.masterpasswordapp.com/mpw-2.1-cli3-3-gd5ff215.tar.gz"
+  sha1 "c9fca230cd0c2b22082bc54fe85053219888212a"
+
+  depends_on "automake" => :build
+  depends_on "autoconf" => :build
+  depends_on "openssl"
+
+  resource "libscrypt" do
+    url "http://masterpasswordapp.com/libscrypt-b12b554.tar.gz"
+    sha1 "ee871e0f93a786c4e3622561f34565337cfdb815"
+  end
+
+  def install
+    resource("libscrypt").stage buildpath/"lib/scrypt"
+    touch "lib/scrypt/.unpacked"
+
+    ENV["targets"]="mpw mpw-tests"
+    system "./build"
+    system "./mpw-tests"
+
+    bin.install "mpw"
+  end
+
+  test do
+    assert_equal "Jejr5[RepuSosp",
+        shell_output("mpw -u 'Robert Lee Mitchell' -P 'banana colored duckling' masterpasswordapp.com").strip
+  end
+end

Site/2013-05/index.html

@@ -82,8 +82,7 @@
                 <a title="iPhone, iPad, iPod touch" href="https://itunes.apple.com/app/id510296984" onclick="_gaq.push(['_trackPageview', '/outbound/ios']);">iPhone / iPad<img class="popup" src="img/ios.png" /></a> |
                 <a title="Mac (graphical interface)" href="https://itunes.apple.com/app/id662763204" onclick="_gaq.push(['_trackPageview', '/outbound/gui/mac']);">Mac<img class="popup border" src="img/mac-gui.png" /></a> |
                 <a title="Mac, Linux, UNIX, Windows (graphical interface)" href="https://ssl.masterpasswordapp.com/masterpassword-gui.jar" onclick="_gaq.push(['_trackPageview', '/outbound/gui/java']);">Desktop (Java)<img class="popup" src="img/java-gui.png" /></a> |
-                Terminal (<a title="Mac, Linux, UNIX, Windows (command line interface)" href="https://ssl.masterpasswordapp.com/masterpassword-cli.zip" onclick="_gaq.push(['_trackPageview', '/outbound/cli/java']);">Java<img class="popup" src="img/java-cli.png" /></a> /
-                <a title="Mac, Linux, UNIX, Windows (command line interface)" href="https://github.com/Lyndir/MasterPassword/tree/master/MasterPassword/C" onclick="_gaq.push(['_trackPageview', '/outbound/cli/c']);">Native C<img class="popup" src="img/c-cli.png" /></a>) |
+                Terminal (<a title="Mac, Linux, POSIX (command line interface)" href="https://ssl.masterpasswordapp.com/masterpassword-cli.tar.gz" onclick="_gaq.push(['_trackPageview', '/outbound/cli/c']);">Native C<img class="popup" src="img/c-cli.png" /></a>) |
                 <a title="Android" href="https://ssl.masterpasswordapp.com/masterpassword-android.apk" onclick="_gaq.push(['_trackPageview', '/outbound/android']);">Android (Beta)<img class="popup" src="img/android.png" /></a> |
                 <a title="JavaScript" href="https://js.masterpasswordapp.com/" onclick="_gaq.push(['_trackPageview', '/outbound/js']);">Web (Beta)<img class="popup border" src="img/web.png" /></a>
             </h4>

Site/2013-05/masterpassword-cli.tar.gz

@@ -0,0 +1 @@
+mpw-2.1-cli4-0-g21630e9.tar.gz

Site/2013-05/mpw-2.1-cli3-0-g438daf2.tar.gz

@@ -0,0 +1 @@
+../../MasterPassword/C/mpw-2.1-cli3-0-g438daf2.tar.gz

Site/2013-05/mpw-2.1-cli4-0-g21630e9.tar.gz

@@ -0,0 +1 @@
+../../MasterPassword/C/mpw-2.1-cli4-0-g21630e9.tar.gz

Site/2013-05/sync

@@ -3,4 +3,4 @@ set -e
 
 cd "${BASH_SOURCE[0]%/*}"
 s3cmd sync --exclude '.git/**' --delete-removed --follow-symlinks --preserve --acl-public --reduced-redundancy . s3://masterpasswordapp.com/
-rsync -avP --no-group . satura.lyndir.com:/usr/local/www/masterpasswordapp.com/htdocs-secure/
+rsync -avPL --no-group . satura.lyndir.com:/usr/local/www/masterpasswordapp.com/htdocs-secure/