diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2021-07-03 10:51:32 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2021-07-03 10:51:32 -0300 |
commit | 143401045b9a64d113a87a2854aef6586b024470 (patch) | |
tree | 03eb6b83b01983385bb1947ccdabc4c98133b5da /lib | |
parent | 51d267cebe45aa34c6bb68594a0189b2e9050f73 (diff) | |
parent | 493e7ef750bd5fbf7db59793776cd9fb75756d3c (diff) | |
download | keyringer-143401045b9a64d113a87a2854aef6586b024470.tar.gz keyringer-143401045b9a64d113a87a2854aef6586b024470.tar.bz2 |
Merge branch 'develop'
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/keyringer/actions/genkeys | 5 | ||||
-rwxr-xr-x | lib/keyringer/actions/pass | 20 |
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 "$?" |