Merge tag 'upstream_keyringer_0.3.7' into debian

Upstream version 0.3.7

3 files changed, 27 insertions, 0 deletions

diff --git a/share/keyringer/editors/vim b/share/keyringer/editors/vim
new file mode 100644
index 0000000..0f877df
--- /dev/null
+++ b/share/keyringer/editors/vim
@@ -0,0 +1,5 @@
+" Use sane defaults for VIM to avoid data leakage
+" See https://keyringer.pw/trac/ticket/50
+set nowritebackup
+set nobackup
+set viminfo="NONE"
diff --git a/share/man/keyringer.1 b/share/man/keyringer.1
index 95c236d..82cb520 100644
--- a/share/man/keyringer.1
+++ b/share/man/keyringer.1
@@ -164,6 +164,11 @@ Alias for \f[I]del\f[] action.
 .RS
 .RE
 .TP
+.B cp <\f[I]secret\f[]> <\f[I]dest\f[]>
+Copy a secret.
+.RS
+.RE
+.TP
 .B mv <\f[I]secret\f[]> <\f[I]dest\f[]>
 Rename a secret.
 .RS
@@ -370,6 +375,13 @@ using the \f[I]git\f[] action.
 Keyringer does not protect data which were not encrypted to a keyring,
 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.
+.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
+use this feature carefully.
 .SH SEE ALSO
 .PP
 The \f[I]README\f[] file distributed with Keyringer contains full
diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn
index 407baaa..af098a3 100644
--- a/share/man/keyringer.1.mdwn
+++ b/share/man/keyringer.1.mdwn
@@ -128,6 +128,9 @@ del <*secret*>
 rm <*secret*>
 :   Alias for *del* action.
 
+cp <*secret*> <*dest*>
+:   Copy a secret.
+
 mv <*secret*> <*dest*>
 :   Rename a secret.
 
@@ -284,6 +287,13 @@ Keyringer currently has the following limitations:
    so be careful when decrypting secrets and writing them to the disk or
    other storage media.
 
+   Pay special attention that keyringer outputs data to stdout, which could
+   be easilly spotted by any agent looking directly at you computer screen.
+
+   The xclip action even copies secret data to the X11 clipboard, which can
+   be accessed by any application running in the user's X11 session, so use
+   this feature carefully.
+
 # SEE ALSO
 
 The *README* file distributed with Keyringer contains full documentation.