From a85efc5736f5f544eb0a0ab0746765b11fd23d9c Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sun, 27 Aug 2017 11:17:45 -0400 Subject: [PATCH] Remove all build-time external dependency fetching/building logic. --- core/c/mpw-util.c | 22 +- .../project.pbxproj | 15 +- .../project.pbxproj | 48 +- platform-independent/cli-c/build | 441 ++++++------------ 4 files changed, 181 insertions(+), 345 deletions(-) diff --git a/core/c/mpw-util.c b/core/c/mpw-util.c index 46a5adf2..9f400999 100644 --- a/core/c/mpw-util.c +++ b/core/c/mpw-util.c @@ -26,10 +26,10 @@ #include #endif -#if HAS_CPERCIVA +#if MPW_CPERCIVA #include #include -#elif HAS_SODIUM +#elif MPW_SODIUM #include "sodium.h" #endif @@ -175,12 +175,12 @@ uint8_t const *mpw_kdf_scrypt(const size_t keySize, const char *secret, const ui if (!key) return NULL; -#if HAS_CPERCIVA +#if MPW_CPERCIVA if (crypto_scrypt( (const uint8_t *)secret, strlen( secret ), salt, saltSize, N, r, p, key, keySize ) < 0) { mpw_free( &key, keySize ); return NULL; } -#elif HAS_SODIUM +#elif MPW_SODIUM if (crypto_pwhash_scryptsalsa208sha256_ll( (const uint8_t *)secret, strlen( secret ), salt, saltSize, N, r, p, key, keySize ) != 0) { mpw_free( &key, keySize ); return NULL; @@ -204,7 +204,7 @@ uint8_t const *mpw_kdf_blake2b(const size_t subkeySize, const uint8_t *key, cons if (!subkey) return NULL; -#if HAS_SODIUM +#if MPW_SODIUM if (keySize < crypto_generichash_blake2b_KEYBYTES_MIN || keySize > crypto_generichash_blake2b_KEYBYTES_MAX || subkeySize < crypto_generichash_blake2b_KEYBYTES_MIN || subkeySize > crypto_generichash_blake2b_KEYBYTES_MAX || contextSize < crypto_generichash_blake2b_BYTES_MIN || contextSize > crypto_generichash_blake2b_BYTES_MAX || @@ -240,13 +240,13 @@ uint8_t const *mpw_hash_hmac_sha256(const uint8_t *key, const size_t keySize, co if (!key || !keySize || !message || !messageSize) return NULL; -#if HAS_CPERCIVA +#if MPW_CPERCIVA uint8_t *const mac = malloc( 32 ); if (!mac) return NULL; HMAC_SHA256_Buf( key, keySize, message, messageSize, mac ); -#elif HAS_SODIUM +#elif MPW_SODIUM uint8_t *const mac = malloc( crypto_auth_hmacsha256_BYTES ); if (!mac) return NULL; @@ -267,7 +267,7 @@ uint8_t const *mpw_hash_hmac_sha256(const uint8_t *key, const size_t keySize, co static uint8_t const *mpw_aes(bool encrypt, const uint8_t *key, const size_t keySize, const uint8_t *buf, const size_t bufSize) { -#if HAS_SODIUM +#if MPW_SODIUM if (!key || keySize < crypto_stream_KEYBYTES) return NULL; @@ -318,10 +318,10 @@ MPKeyID mpw_id_buf(const void *buf, size_t length) { if (!buf) return ""; -#if HAS_CPERCIVA +#if MPW_CPERCIVA uint8_t hash[32]; SHA256_Buf( buf, length, hash ); -#elif HAS_SODIUM +#elif MPW_SODIUM uint8_t hash[crypto_hash_sha256_BYTES]; crypto_hash_sha256( hash, buf, length ); #else @@ -364,7 +364,7 @@ const char *mpw_vstr(const char *format, va_list args) { return NULL; do { - int len = vsnprintf( &str_str, str_str_max, format, args ); + int len = vsnprintf( str_str, str_str_max, format, args ); if (len < str_str_max) break; diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj index a3997528..57d869dc 100644 --- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -4375,7 +4375,10 @@ "$(PROJECT_DIR)/External/libsodium/libsodium-ios/lib", "$(PROJECT_DIR)/External/libjson-c/libjson-c-ios/lib", ); - OTHER_CFLAGS = "-DHAS_SODIUM=1"; + OTHER_CFLAGS = ( + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", + ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword; SKIP_INSTALL = NO; STRIP_INSTALLED_PRODUCT = YES; @@ -4648,7 +4651,10 @@ "$(PROJECT_DIR)/External/libsodium/libsodium-ios/lib", "$(PROJECT_DIR)/External/libjson-c/libjson-c-ios/lib", ); - OTHER_CFLAGS = "-DHAS_SODIUM=1"; + OTHER_CFLAGS = ( + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", + ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = 1; @@ -4679,7 +4685,10 @@ "$(PROJECT_DIR)/External/libsodium/libsodium-ios/lib", "$(PROJECT_DIR)/External/libjson-c/libjson-c-ios/lib", ); - OTHER_CFLAGS = "-DHAS_SODIUM=1"; + OTHER_CFLAGS = ( + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", + ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword; SKIP_INSTALL = NO; STRIP_INSTALLED_PRODUCT = YES; diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj index d8310bcb..92958d8f 100644 --- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj @@ -3031,8 +3031,8 @@ "$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac; SKIP_INSTALL = NO; @@ -3088,8 +3088,8 @@ "$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", ); }; name = Test; @@ -3104,8 +3104,8 @@ "$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", "-DMPW_JSON=1", "-DMPW_COLOR=1", ); @@ -3123,8 +3123,8 @@ "$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", "-DMPW_JSON=1", "-DMPW_COLOR=1", ); @@ -3142,8 +3142,8 @@ "$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", "-DMPW_JSON=1", "-DMPW_COLOR=1", ); @@ -3160,8 +3160,8 @@ "$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", ); PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -3176,8 +3176,8 @@ "$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", ); PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -3192,8 +3192,8 @@ "$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", ); PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -3467,8 +3467,8 @@ "$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac; SKIP_INSTALL = NO; @@ -3499,8 +3499,8 @@ "$(PROJECT_DIR)/External/libjson-c/libjson-c-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", ); PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac; SKIP_INSTALL = NO; @@ -3522,8 +3522,8 @@ "$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", ); }; name = Debug; @@ -3542,8 +3542,8 @@ "$(PROJECT_DIR)/External/libsodium/libsodium-osx/lib", ); OTHER_CFLAGS = ( - "-DHAS_SODIUM=1", - "-DHAS_CPERCIVA=0", + "-DMPW_SODIUM=1", + "-DMPW_CPERCIVA=0", ); }; name = Release; diff --git a/platform-independent/cli-c/build b/platform-independent/cli-c/build index 376bc7d5..4c971b01 100755 --- a/platform-independent/cli-c/build +++ b/platform-independent/cli-c/build @@ -1,13 +1,6 @@ #!/usr/bin/env bash # # TROUBLESHOOTING -# - If you see 'undefined reference to `AES_encrypt'', -# make sure you have openssl installed. -# If libcrypto.a is in a non-standard directory, try ./build -L[your-lib-dir] -# - If you see 'undefined reference to `clock_gettime'', -# try ./build -lrt instead. -# - If you see 'x86.S:202: Error: junk at end of line, first unrecognized character is `,'', -# try commenting the line in lib/bcrypt/x86.S. # - Take a look at the "Optional features" section. Some features have dependencies, # either make sure you have them or disable those features. # eg. mpw_color=0 ./build @@ -31,16 +24,17 @@ else # Default targets. # Modify here or override using targets='mpw mpw-bench' ./build targets=( - mpw # C CLI version of Master Password, requires libsodium or openssl-dev. - #mpw-bench # C CLI Master Password benchmark utility. - #mpw-tests # C Master Password algorithm test suite, requires libxml2. + mpw # C CLI version of Master Password (needs: mpw_sodium, optional: mpw_color, mpw_json). + #mpw-bench # C CLI Master Password benchmark utility (needs: mpw_sodium). + #mpw-tests # C Master Password algorithm test suite (needs: mpw_sodium, mpw_xml). ) fi # Optional features. -mpw_color=${mpw_color:-1} # Colorized Identicon, requires libncurses-dev. -mpw_sodium=${mpw_sodium:-1} # Use libsodium if available instead of cperciva's libscrypt. -mpw_json=${mpw_json:-1} # Support for JSON-based user configuration format. +mpw_sodium=${mpw_sodium:-1} # Implement crypto functions with sodium (depends on libsodium). +mpw_json=${mpw_json:-1} # Support JSON-based user configuration format (depends on libjson-c). +mpw_color=${mpw_color:-1} # Colorized identicon (depends on libncurses). +mpw_xml=${mpw_xml:-1} # XML parsing (depends on libxml2). # Default build flags. cflags=( -O3 $CFLAGS ) @@ -50,7 +44,100 @@ ldflags=( $LDFLAGS ) if { mpw_version=$(git describe --match '*-cli*' --long --dirty --broken) || mpw_version=$(/dev/null; then cflags+=( -D"MP_VERSION=$mpw_version" ) fi -echo 2>&1 "Building mpw version ${mpw_version:-}..." +echo 2>&1 "Current mpw source version ${mpw_version:-}..." + + +### TARGET: MPW +mpw() { + # dependencies + use_mpw_sodium + use_mpw_color + use_mpw_json + + # target + cflags=( + "${cflags[@]}" + + # library paths + -I"lib/include" + # mpw paths + -I"core" -I"cli" + ) + local ldflags=( + "${ldflags[@]}" + ) + + # build + cc "${cflags[@]}" "$@" -c core/base64.c -o core/base64.o + cc "${cflags[@]}" "$@" -c core/mpw-algorithm.c -o core/mpw-algorithm.o + cc "${cflags[@]}" "$@" -c core/mpw-types.c -o core/mpw-types.o + cc "${cflags[@]}" "$@" -c core/mpw-util.c -o core/mpw-util.o + cc "${cflags[@]}" "$@" -c core/mpw-marshall-util.c -o core/mpw-marshall-util.o + cc "${cflags[@]}" "$@" -c core/mpw-marshall.c -o core/mpw-marshall.o + cc "${cflags[@]}" "$@" "core/base64.o" "core/mpw-algorithm.o" "core/mpw-types.o" "core/mpw-util.o" "core/mpw-marshall-util.o" "core/mpw-marshall.o" \ + "${ldflags[@]}" "cli/mpw-cli.c" -o "mpw" + echo "done! Now run ./install or use ./$_" +} + + +### TARGET: MPW-BENCH +mpw-bench() { + # dependencies + use_mpw_sodium + + # target + cflags=( + "${cflags[@]}" + + # library paths + -I"lib/include" + # mpw paths + -I"core" -I"cli" + ) + local ldflags=( + "${ldflags[@]}" + ) + + # build + cc "${cflags[@]}" "$@" -c core/base64.c -o core/base64.o + cc "${cflags[@]}" "$@" -c core/mpw-algorithm.c -o core/mpw-algorithm.o + cc "${cflags[@]}" "$@" -c core/mpw-types.c -o core/mpw-types.o + cc "${cflags[@]}" "$@" -c core/mpw-util.c -o core/mpw-util.o + cc "${cflags[@]}" "$@" "core/base64.o" "core/mpw-algorithm.o" "core/mpw-types.o" "core/mpw-util.o" \ + "${ldflags[@]}" "cli/mpw-bench.c" -o "mpw-bench" + echo "done! Now use ./$_" +} + + +### TARGET: MPW-TESTS +mpw-tests() { + # dependencies + use_mpw_xml + use_mpw_sodium + + # target + cflags=( + "${cflags[@]}" + + # library paths + -I"lib/include" + # mpw paths + -I"core" -I"cli" + ) + local ldflags=( + "${ldflags[@]}" + ) + + # build + cc "${cflags[@]}" "$@" -c core/base64.c -o core/base64.o + cc "${cflags[@]}" "$@" -c core/mpw-algorithm.c -o core/mpw-algorithm.o + cc "${cflags[@]}" "$@" -c core/mpw-types.c -o core/mpw-types.o + cc "${cflags[@]}" "$@" -c core/mpw-util.c -o core/mpw-util.o + cc "${cflags[@]}" "$@" -c cli/mpw-tests-util.c -o cli/mpw-tests-util.o + cc "${cflags[@]}" "$@" "core/base64.o" "core/mpw-algorithm.o" "core/mpw-types.o" "core/mpw-util.o" \ + "${ldflags[@]}" "cli/mpw-tests-util.o" "cli/mpw-tests.c" -o "mpw-tests" + echo "done! Now use ./$_" +} ### TOOLS @@ -70,318 +157,58 @@ cc() { fi } -digest() { - openssl sha -sha256 -binary < "$1" | od -t x1 -An -v | tr -d '[:space:]' -} -fetch() { - if hash wget 2>/dev/null; then - wget -O "${1##*/}" "$1" - elif hash curl 2>/dev/null; then - curl "$1" > "${1##*/}" - fi -} -unpack() { - printf 'Verifying package: %s, against digest: %s...' "$1" "$2" - [[ $(digest "$1") = $2 ]] || { - printf ' mismatch!\n' - echo 2>&1 "Downloaded package doesn't match digest." - exit 1 - } - printf ' OK!\n' - if [[ $1 = *.tar.gz || $1 = *.tgz ]]; then - tar -xvzf "$1" +### DEPENDENCIES +use_mpw_sodium() { + ! (( mpw_sodium )) && return - elif [[ $1 = *.tar.bz2 || $1 = *.tbz2 ]]; then - tar -xvjf "$1" - - elif [[ $1 = *.tar ]]; then - tar -xvf "$1" + if ! haslib sodium; then + echo >&2 "WARNING: mpw_sodium enabled but missing sodium library, will disable mpw_sodium." else - echo 2>&1 "Don't know how to unpack: $1" - fi - - files=( * ) - if [[ -d $files ]] && (( ${#files[@]} == 1 )); then - mv "$files"/* . - rmdir "$files" + echo >&2 "Enabled mpw_sodium (libsodium)." + cflags+=( -D"MPW_SODIUM=1" ) ldflags+=( -l"sodium" ) fi } +use_mpw_color() { + ! (( mpw_color )) && return -fetchSource() ( - local name=${PWD##*/} - source .source - - if [[ -e .unpacked ]]; then - true - - elif [[ $pkg && -e "${pkg##*/}" ]]; then - [[ -e src ]] || { - echo - echo "Unpacking: $name, using package..." - ( mkdir src && cd src && unpack "../${pkg##*/}" "$pkg_sha256" ) - touch .unpacked - } - - elif [[ $git ]] && hash git 2>/dev/null; then - [[ -e .git ]] || { - echo - echo "Fetching: $name, using git..." - git clone "$git" src - touch .unpacked - } - - elif [[ $svn ]] && hash git 2>/dev/null && [[ -x "$(git --exec-path)/git-svn" ]]; then - [[ -e .git ]] || { - echo - echo "Fetching: $name, using git-svn..." - git svn clone --prefix=origin/ --stdlayout "$svn" src - touch .unpacked - } - - elif [[ $svn ]] && hash svn 2>/dev/null; then - [[ -e .svn ]] || { - echo - echo "Fetching: $name, using svn..." - svn checkout "$svn/trunk" src - touch .unpacked - } - - elif [[ $pkg ]]; then - [[ -e src ]] || { - echo - echo "Fetching: $name, using package..." - fetch "$pkg" - ( mkdir src && cd src && unpack "../${pkg##*/}" "$pkg_sha256" ) - touch .unpacked - } + if ! haslib curses; then + echo >&2 "WARNING: mpw_color enabled but missing curses library, will disable mpw_color." else - echo >&2 "error: Missing git-svn or svn." - echo >&2 "error: Please install either or manually check out the sources" - echo >&2 "error: from: $home" - echo >&2 "error: into: $PWD/src" - exit 1 + echo >&2 "Enabled mpw_color (libcurses)." + cflags+=( -D"MPW_COLOR=1" ) ldflags+=( -l"curses" ) fi +} +use_mpw_json() { + ! (( mpw_json )) && return - if [[ ! -e .patched ]] && (( ${#patches[@]} )); then - pushd src - for patch in "${patches[@]}"; do - echo - echo "Patching: $name, for $patch..." - patch -p0 < "../$patch.patch" - done - popd - touch .patched - fi -) -depend() { - local name=$1 + if ! haslib json-c; then + echo >&2 "WARNING: mpw_json enabled but missing json-c library, will disable mpw_json." - echo - echo "Checking dependency: $name..." - [[ -e "lib/include/$name" ]] && return - - pushd "lib/$name" - fetchSource - pushd "src" - - echo - echo "Configuring dependency: $name..." - if [[ -e configure.ac ]]; then - if [[ ! -e configure ]]; then - # create configure using autotools. - if ! hash autoreconf; then - echo >&2 "Need autoconf to build $name. Please install autoconf." - exit 1 - fi - - autoreconf --verbose --install --symlink --force 2>&1 | sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /' - fi - fi - - if [[ -e configure ]]; then - CFLAGS="$CFLAGS ${cflags[*]}" LDFLAGS="$LDFLAGS ${ldflags[*]}" ./configure - fi - - echo - echo "Building dependency: $name..." - if [[ -e Makefile ]]; then - if ! hash make; then - echo >&2 "Need make to build $name. Please install GNU make." - exit 1 - fi - - CFLAGS="$CFLAGS ${cflags[*]}" LDFLAGS="$LDFLAGS ${ldflags[*]}" make - install -d "../../include/$name/" - find . -name '*.h' -exec install -m 444 {} "../../include/$name/" \; else - echo >&2 "error: Don't know how to build: $name" - exit 1 + echo >&2 "Enabled mpw_json (libjson-c)." + cflags+=( -D"MPW_JSON=1" ) ldflags+=( -l"json-c" ) fi - popd - popd } -depend_scrypt() { - if (( mpw_sodium )); then - if haslib sodium; then - cflags+=( -D"HAS_SODIUM=1" ) ldflags+=( -l"sodium" ) - return - else - echo >&2 "mpw_sodium enabled but missing sodium library." - fi +use_mpw_xml() { + ! (( mpw_xml )) && return + + if ! haslib xml2; then + echo >&2 "WARNING: mpw_xml enabled but missing xml2 library, will disable mpw_xml." + + else + echo >&2 "Enabled mpw_xml (libxml2)." + cflags+=( -D"MPW_XML=1" -I"/usr/include/libxml2" -I"/usr/local/include/libxml2" ) ldflags+=( -l"xml2" ) fi - - # Homebrew - openssl for scrypt - if hash brew 2>/dev/null; then - opensslPath=$(brew --prefix openssl) - cflags+=( -I"$opensslPath/include" ) - ldflags+=( -L"$opensslPath/lib" ) - fi - - depend scrypt - cflags+=( -D"HAS_CPERCIVA=1" ) - ldflags+=( - -L"lib/scrypt/src" - - "lib/scrypt/src/libcperciva/"*/*.o - "lib/scrypt/src/lib/crypto/"*.o - ) } -### MPW -mpw() { - # dependencies - depend_scrypt - if (( mpw_color )); then - if haslib curses; then - cflags+=( -D"MPW_COLOR=1" ) ldflags+=( -l"curses" ) - else - echo >&2 "mpw_color enabled but missing curses library." - fi - fi - if (( mpw_json )); then - if haslib json-c; then - cflags+=( -D"MPW_JSON=1" ) ldflags+=( -l"json-c" ) - else - echo >&2 "mpw_json enabled but missing json-c library." - fi - fi - - # target - echo - echo "Building target: $target..." - local cflags=( - "${cflags[@]}" - - # library paths - -I"lib/include" - # mpw paths - -I"core" -I"cli" - ) - local ldflags=( - "${ldflags[@]}" - - # link libraries - -l"crypto" - ) - - # build - cc "${cflags[@]}" "$@" -c core/base64.c -o core/base64.o - cc "${cflags[@]}" "$@" -c core/mpw-algorithm.c -o core/mpw-algorithm.o - cc "${cflags[@]}" "$@" -c core/mpw-types.c -o core/mpw-types.o - cc "${cflags[@]}" "$@" -c core/mpw-util.c -o core/mpw-util.o - cc "${cflags[@]}" "$@" -c core/mpw-marshall-util.c -o core/mpw-marshall-util.o - cc "${cflags[@]}" "$@" -c core/mpw-marshall.c -o core/mpw-marshall.o - cc "${cflags[@]}" "$@" "core/base64.o" "core/mpw-algorithm.o" "core/mpw-types.o" "core/mpw-util.o" "core/mpw-marshall-util.o" "core/mpw-marshall.o" \ - "${ldflags[@]}" "cli/mpw-cli.c" -o "mpw" - echo "done! Now run ./install or use ./$_" -} - - -### MPW-BENCH -mpw-bench() { - # dependencies - depend_scrypt - depend bcrypt - - # target - echo - echo "Building target: $target..." - local cflags=( - "${cflags[@]}" - - # library paths - -I"lib/include" - # mpw paths - -I"core" -I"cli" - ) - local ldflags=( - "${ldflags[@]}" - - # bcrypt - "lib/bcrypt/src/crypt_blowfish.o" - "lib/bcrypt/src/crypt_gensalt.o" - "lib/bcrypt/src/wrapper.o" - "lib/bcrypt/src/x86.o" - # library paths - -L"lib/bcrypt/src" - # link libraries - -l"crypto" - ) - - # build - cc "${cflags[@]}" "$@" -c core/base64.c -o core/base64.o - cc "${cflags[@]}" "$@" -c core/mpw-algorithm.c -o core/mpw-algorithm.o - cc "${cflags[@]}" "$@" -c core/mpw-types.c -o core/mpw-types.o - cc "${cflags[@]}" "$@" -c core/mpw-util.c -o core/mpw-util.o - cc "${cflags[@]}" "$@" "core/base64.o" "core/mpw-algorithm.o" "core/mpw-types.o" "core/mpw-util.o" \ - "${ldflags[@]}" "cli/mpw-bench.c" -o "mpw-bench" - echo "done! Now use ./$_" -} - - -### MPW-TESTS -mpw-tests() { - # dependencies - depend_scrypt - - # target - echo - echo "Building target: $target..." - local cflags=( - "${cflags[@]}" - - # library paths - -I"lib/include" - -I"/usr/include/libxml2" - -I"/usr/local/include/libxml2" - # mpw paths - -I"core" -I"cli" - ) - local ldflags=( - "${ldflags[@]}" - - # link libraries - -l"crypto" -l"xml2" - ) - - # build - cc "${cflags[@]}" "$@" -c core/base64.c -o core/base64.o - cc "${cflags[@]}" "$@" -c core/mpw-algorithm.c -o core/mpw-algorithm.o - cc "${cflags[@]}" "$@" -c core/mpw-types.c -o core/mpw-types.o - cc "${cflags[@]}" "$@" -c core/mpw-util.c -o core/mpw-util.o - cc "${cflags[@]}" "$@" -c cli/mpw-tests-util.c -o cli/mpw-tests-util.o - cc "${cflags[@]}" "$@" "core/base64.o" "core/mpw-algorithm.o" "core/mpw-types.o" "core/mpw-util.o" \ - "${ldflags[@]}" "cli/mpw-tests-util.o" "cli/mpw-tests.c" -o "mpw-tests" - echo "done! Now use ./$_" -} - - -### BUILD +### BUILD TARGETS echo "Will build targets: ${targets[*]}..." for target in "${targets[@]}"; do - "$target" "$@" + echo + echo "Building target: $target..." + ( "$target" "$@" ) done