Merge branch 'master' of github.com:Lyndir/MasterPassword

MasterPassword/C/build

@@ -36,7 +36,7 @@ fi
 ### DEPENDENCIES
 
 digest() {
-    openssl sha1 -binary < "$1" | od -t x1 -An -v | tr -d '[:space:]'
+    openssl sha -sha256 -binary < "$1" | od -t x1 -An -v | tr -d '[:space:]'
 }
 fetch() {
     if hash wget 2>/dev/null; then
@@ -81,7 +81,7 @@ fetchSource() (
         [[ -e $files ]] || {
             echo
             echo "Unpacking: ${PWD##*/}, using package..."
-            unpack "${pkg##*/}" "$pkg_sha"
+            unpack "${pkg##*/}" "$pkg_sha256"
         }
 
     elif [[ $git ]] && hash git 2>/dev/null; then
@@ -114,7 +114,7 @@ fetchSource() (
             echo
             echo "Fetching: ${PWD##*/}, using package..."
             fetch "$pkg"
-            unpack "${pkg##*/}" "$pkg_sha"
+            unpack "${pkg##*/}" "$pkg_sha256"
         }
 
     else

MasterPassword/C/lib/bcrypt/.source

@@ -1,3 +1,3 @@
 home=http://www.openwall.com/crypt/
 pkg=http://www.openwall.com/crypt/crypt_blowfish-1.3.tar.gz
-pkg_sha=461ba876ebacd5f7dc95f1eb3c5286d6e0983ae0
+pkg_sha256=83fa01fca6996fe8d882b7f8e9ba0305a5664936100b01481ea3c6a8ce8d72fd

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_sha=a86445c3e031392d20652f4163adfd3fb0b1994e
+pkg_sha256=c726daec68a345e420896f005394a948dc5a6924713ed94b684c856d4c247f0b