Update upstream source from tag 'upstream_keyringer_0.5.6'

Update to upstream version '0.5.6'
with Debian dir 0f8b41a58423522af53f8d6cfd3a40e747e3bba0

2 files changed, 25 insertions, 0 deletions

diff --git a/lib/keyringer/actions/genkeys b/lib/keyringer/actions/genkeys
index addd10d..d9af46a 100755
--- a/lib/keyringer/actions/genkeys
+++ b/lib/keyringer/actions/genkeys
@@ -185,6 +185,11 @@ EOF
     openssl x509 -noout -in "$TMPWORK/${NODE}.crt" -fingerprint
   fi
 
+  # Show CSR
+  if [ "$KEYTYPE" != "ssl-self" ] || [ "$KEYTYPE" != "x509-self" ]; then
+    cat "$TMPWORK/${NODE}_csr.pem"
+  fi
+
   echo "Done"
 }
 
diff --git a/lib/keyringer/actions/pass b/lib/keyringer/actions/pass
new file mode 100755
index 0000000..7bca7d5
--- /dev/null
+++ b/lib/keyringer/actions/pass
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+#
+# Behave like pass(1), outputing just the first line of a secret.
+#
+
+# Load functions
+LIB="`dirname $0`/../functions"
+source "$LIB" read $* || exit 1
+
+# Get file
+keyringer_get_file "$2"
+
+# Decrypt
+pass="$($GPG --use-agent -d "$KEYDIR/$FILE" 2> /dev/null | head -n 1)"
+
+# Output password
+echo "$pass"
+
+# Exit
+exit "$?"