diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2021-07-03 10:51:46 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2021-07-03 10:51:46 -0300 |
commit | 2469b3245e2f59d1f1719ec4e3becb2b384b7488 (patch) | |
tree | e1d1980341a18f7c92f05b67999dac1885e552cd /lib | |
parent | 7d1c32c22d7ac199797dfdd691264ebd3379a161 (diff) | |
parent | 493e7ef750bd5fbf7db59793776cd9fb75756d3c (diff) | |
download | keyringer-2469b3245e2f59d1f1719ec4e3becb2b384b7488.tar.gz keyringer-2469b3245e2f59d1f1719ec4e3becb2b384b7488.tar.bz2 |
New upstream version 0.5.6upstream_keyringer_0.5.6
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 "$?" |