From bb3f78c11888678a9eb268c6d27fb4b5b0c7f207 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 18 Sep 2020 08:52:37 -0300
Subject: Genkeys: show CSR when generating x509 keys

---
 lib/keyringer/actions/genkeys | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib')

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"
 }
 
-- 
cgit v1.2.3


From d39c5d247a167acf3747b061137c42f798183e3c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 7 Nov 2020 12:28:48 -0300
Subject: Feat: adds "pass" action

---
 ChangeLog                  |  4 ++++
 lib/keyringer/actions/pass | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100755 lib/keyringer/actions/pass

(limited to 'lib')

diff --git a/ChangeLog b/ChangeLog
index 124f69e..474a09f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-11-07 - develop - Silvio Rhatto <rhatto@riseup.net>
+
+	Adds "pass" action behaving like pass(1) for outputing single-line secrets.
+
 2020-01-18 - develop - Silvio Rhatto <rhatto@riseup.net>
 
 	Install zsh completion in the default path
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 "$?"
-- 
cgit v1.2.3