From 2e987d14ca36042fe256702a3f68c491bfe44ac0 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 2 Sep 2014 11:43:44 -0300 Subject: Ensure destination folder exists at 'cp' action --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 683c853..c8708e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-02 - Silvio Rhatto + + Ensure destination folder exists at 'cp' action + 2014-08-21 - 0.3.7 - Silvio Rhatto Init: just set git user/mail if needed -- cgit v1.2.3 From 9d916327eae2c4625046ccdbe7474b489517a70e Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 17 Mar 2015 15:05:23 -0300 Subject: Manpage and ChangeLog and help update (#69) --- ChangeLog | 4 ++++ lib/keyringer/actions/genkeys | 10 +++++----- share/man/keyringer.1.mdwn | 5 ++++- 3 files changed, 13 insertions(+), 6 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index c8708e6..eee4b8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-03-17 - Silvio Rhatto + + Rename genpair action and option (#69) + 2014-09-02 - Silvio Rhatto Ensure destination folder exists at 'cp' action diff --git a/lib/keyringer/actions/genkeys b/lib/keyringer/actions/genkeys index 60f9dfc..d4f24d8 100755 --- a/lib/keyringer/actions/genkeys +++ b/lib/keyringer/actions/genkeys @@ -199,11 +199,11 @@ if [ -z "$NODE" ]; then echo -e "Usage: keyringer $BASENAME [outfile]" echo -e "Options:" echo -e "\t gpg|ssh|x509[-self]|ssl|ssl[-self]: key type." - 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 without spaces" + 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 without spaces" exit 1 elif [ ! -e "$KEYDIR" ]; then echo "Folder not found: $KEYDIR, leaving" diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn index 44ddb81..55ae216 100644 --- a/share/man/keyringer.1.mdwn +++ b/share/man/keyringer.1.mdwn @@ -150,9 +150,12 @@ encrypt-batch <*secret*> [*file*] : Encrypt content, batch mode. Behavior is identical to *encrypt* action, but less verbose. Useful inside scripts. -genpair <*ssh*|*gpg*|*ssl*|*ssl-self*> [*options*] +genkeys <*ssh*|*gpg*|*x509*|*x509-self*|*ssl*|*ssl-self*> [*options*] : Wrapper to generate encryption key-pairs, useful for automated key deployment. +genpair <*ssh*|*gpg*|*x509*|*x509-self*|*ssl*|*ssl-self*> [*options*] +: Alias for *genkeys* action. + open <*secret*> : Decrypt a secret into a temporary folder and open it using xdg-open, which tries to figure out the file type and then calls the associated application. -- cgit v1.2.3 From 347f255ec06b26a0437b653d87b5753d57d3c998 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 30 Mar 2015 09:04:23 -0300 Subject: Keyringer 0.3.8 --- ChangeLog | 7 ++++--- keyringer | 2 +- share/man/keyringer.1 | 12 ++++++++++-- 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index eee4b8a..2462e45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ -2015-03-17 - Silvio Rhatto +2015-03-30 - 0.3.8 - Silvio Rhatto - Rename genpair action and option (#69) + Eliminates hardcoded bash path, reported and fixed by + polynomial (closes https://github.com/rhatto/keyringer/pull/1). -2014-09-02 - Silvio Rhatto + Rename genpair action and option (#69) Ensure destination folder exists at 'cp' action diff --git a/keyringer b/keyringer index 55563c5..956bb73 100755 --- a/keyringer +++ b/keyringer @@ -140,7 +140,7 @@ function keyringer_dispatch { # Config NAME="keyringer" -KEYRINGER_VERSION="0.3.7" +KEYRINGER_VERSION="0.3.8" CONFIG_VERSION="0.1" CONFIG_BASE="$HOME/.$NAME" CONFIG="$CONFIG_BASE/config" diff --git a/share/man/keyringer.1 b/share/man/keyringer.1 index 82cb520..13de085 100644 --- a/share/man/keyringer.1 +++ b/share/man/keyringer.1 @@ -201,13 +201,21 @@ Useful inside scripts. .RS .RE .TP -.B genpair <\f[I]ssh\f[]|\f[I]gpg\f[]|\f[I]ssl\f[]|\f[I]ssl-self\f[]> +.B genkeys +<\f[I]ssh\f[]|\f[I]gpg\f[]|\f[I]x509\f[]|\f[I]x509-self\f[]|\f[I]ssl\f[]|\f[I]ssl-self\f[]> [\f[I]options\f[]] Wrapper to generate encryption key-pairs, useful for automated key deployment. .RS .RE .TP +.B genpair +<\f[I]ssh\f[]|\f[I]gpg\f[]|\f[I]x509\f[]|\f[I]x509-self\f[]|\f[I]ssl\f[]|\f[I]ssl-self\f[]> +[\f[I]options\f[]] +Alias for \f[I]genkeys\f[] action. +.RS +.RE +.TP .B open <\f[I]secret\f[]> Decrypt a secret into a temporary folder and open it using xdg-open, which tries to figure out the file type and then calls the associated @@ -377,7 +385,7 @@ so be careful when decrypting secrets and writing them to the disk or other storage media. .PP Pay special attention that keyringer outputs data to stdout, which could -be easilly spotted by any agent looking directly at you computer screen. +be easily spotted by any agent looking directly at you computer screen. .PP The xclip action even copies secret data to the X11 clipboard, which can be accessed by any application running in the user\[aq]s X11 session, so -- cgit v1.2.3