summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-03-30 09:04:39 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-03-30 09:04:39 -0300
commit70c9c33f32273b2538493443bbb04e4c591f8539 (patch)
tree3f7836af002df7bd20b1b4011fa78b95855ec721
parent2f86eac334fc26cbc72221458cce4def87b69707 (diff)
parent347f255ec06b26a0437b653d87b5753d57d3c998 (diff)
downloadkeyringer-70c9c33f32273b2538493443bbb04e4c591f8539.tar.gz
keyringer-70c9c33f32273b2538493443bbb04e4c591f8539.tar.bz2
Merge branch 'release/0.3.8' into develop
-rw-r--r--ChangeLog7
-rwxr-xr-xkeyringer2
-rw-r--r--share/man/keyringer.112
3 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index eee4b8a..2462e45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
-2015-03-17 - Silvio Rhatto <rhatto@riseup.net>
+2015-03-30 - 0.3.8 - Silvio Rhatto <rhatto@riseup.net>
- 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 <rhatto@riseup.net>
+ 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