diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2013-09-29 17:35:12 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2013-09-29 17:35:12 -0300 |
commit | bdbf214658446e0821e67a5e58695df0881247b6 (patch) | |
tree | 3d848ce0b2c368f62b7b48844a3af6b802da6f3e /share/keyringer | |
parent | 1145393c5405187b50600f65371fb49c376c0c4f (diff) | |
download | keyringer-bdbf214658446e0821e67a5e58695df0881247b6.tar.gz keyringer-bdbf214658446e0821e67a5e58695df0881247b6.tar.bz2 |
Sanitize file names (#20)
Diffstat (limited to 'share/keyringer')
-rwxr-xr-x | share/keyringer/encrypt | 6 | ||||
-rwxr-xr-x | share/keyringer/genpair | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/share/keyringer/encrypt b/share/keyringer/encrypt index c0b7874..ac305a4 100755 --- a/share/keyringer/encrypt +++ b/share/keyringer/encrypt @@ -10,7 +10,8 @@ source "$LIB" || exit 1 # Aditional parameters if [ ! -z "$3" ]; then UNENCRYPTED_FILE="$2" - keyringer_get_new_file "$3" + shift 2 + keyringer_get_new_file "$*" if [ ! -f "$UNENCRYPTED_FILE" ]; then echo "Error: cannot encrypted $UNENCRYPTED_FILE: file not found." @@ -18,7 +19,8 @@ if [ ! -z "$3" ]; then fi else UNENCRYPTED_FILE="-" - keyringer_get_new_file "$2" + shift + keyringer_get_new_file $* fi # Set recipients file diff --git a/share/keyringer/genpair b/share/keyringer/genpair index 5e013dc..f977714 100755 --- a/share/keyringer/genpair +++ b/share/keyringer/genpair @@ -194,9 +194,11 @@ if [ -z "$NODE" ]; then echo -e "Usage: keyringer <keyring> $BASENAME <gpg|ssh|ssl|ssl-self> <file> <hostname> [outfile]" echo -e "Options:" echo -e "\t gpg|ssh|ssl[-self]: key type." - echo -e "\t file : base file name for encrypted output (relative to keys folder)" + echo -e "\t file : base file name for encrypted output (relative to keys folder)," + echo -e "\t without spaces" echo -e "\t hostname : host for the key pair" - echo -e "\t outfile : optional unencrypted output file, useful for deployment" + echo -e "\t outfile : optional unencrypted output file, useful for deployment," + echo -e "\t without spaces" exit 1 elif [ ! -e "$KEYDIR" ]; then echo "Folder not found: $KEYDIR, leaving" |