diff --git a/.bash_android b/.bash_android index 93b4c82..c1ffeef 100644 --- a/.bash_android +++ b/.bash_android @@ -2,7 +2,7 @@ # set the path to android executables # -ANDROID_SDK_HOME='~/android-sdk' +ANDROID_SDK_HOME='/Volumes/D1/dev/android-sdk' JAVA_HOME='/usr/local/bin/javahome' ANT_HOME=' /usr/local/Cellar/ant/1.9.4' # diff --git a/.bash_crypto b/.bash_crypto index 38e3f73..68502d3 100644 --- a/.bash_crypto +++ b/.bash_crypto @@ -1,16 +1,17 @@ + #openssl -alias sha='openssl sha1' -alias sha256='openssl dgst -sha256' -alias sha512='openssl dgst -sha512' -alias b64='openssl enc -base64 -e' -alias b64dec='openssl enc -base64 -d' -alias ciphers='openssl list-cipher-commands' +alias sha="$OSSL sha1" +alias sha256="$OSSL dgst -sha256" +alias sha512="$OSSL dgst -sha512" +alias b64="$OSSL enc -base64 -e" +alias b64dec="$OSSL enc -base64 -d" +alias ciphers="$OSSL list-cipher-commands" ### ### ### ### ### ### AES Encrypt/Decrypt # -alias aes='openssl enc -aes-256-cbc' +alias aes="$OSSL enc -aes-256-cbc" # encrypt file.txt to file.enc using 256-bit AES in CBC mode #openssl enc -aes-256-cbc -salt -in file.txt -out file.enc # the same, only the output is base64 encoded for, e.g., e-mail diff --git a/.bash_mac b/.bash_mac index 987f785..8a095de 100644 --- a/.bash_mac +++ b/.bash_mac @@ -1,10 +1,14 @@ +# brew openssl +alias ossl='/usr/local/Cellar/openssl/1.0.2/bin/openssl' + # Mac Shortcuts alias eject='drutil tray eject' -#dev +# dev alias cddev='cd /Volumes/MAVERICKS/Users/j3g/dev' # alias subl='open -a "Sublime Text 2"' alias subl='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl' alias subl3='/Applications/Sublime\ Text\ 3.app/Contents/SharedSupport/bin/subl' +export OSSL=/usr/local/Cellar/openssl/1.0.2/bin/openssl diff --git a/.bash_profile b/.bash_profile index 6576c55..31916ed 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,8 +1,12 @@ #set architecture flags export ARCHFLAGS="-arch x86_64" + # user-installed binaries exec (homebrew binaries) export PATH=/usr/local/bin:$PATH +# openssl env variable +export OSSL=openssl + # aliases source ~/.bash_aliases source ~/.bash_mac