summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2018-12-03 03:59:12 +0100
committerGuilhem Moulin <guilhem@fripost.org>2018-12-03 03:59:12 +0100
commit7c78ef44898be08e8c3b6570ebd4064c6e0ade8f (patch)
tree86bd15c1e40b54dfc04dc3f6b4fa6ed1d97f1c00
parent07c1734d2c00ce0a52830533b19a02faed678364 (diff)
gencerts: Also show the algorithm for SSH host keys.
-rwxr-xr-xcerts/gencerts.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/certs/gencerts.sh b/certs/gencerts.sh
index 291a73f..bb5650d 100755
--- a/certs/gencerts.sh
+++ b/certs/gencerts.sh
@@ -57,7 +57,7 @@ x509fpr2() {
}
sshfpr() {
- local msg="$1" host h fpr str
+ local msg="$1" host a h fpr str
host="${msg%%,*}"; host="${host%% *}"; host="${host#*@}"; host="${host#\`}"; host="${host%\`}"
[ "$typ" = mdwn ] && printf '\n%s\n\n' "$msg" || { printf '\n%s\n\n' "$msg" | tr -d '`'; }
[ "${host#*:}" != 22 ] || host="${host%%:*}"
@@ -65,10 +65,10 @@ sshfpr() {
[ "$typ" = mdwn ] && str= || str=' '
for h in MD5 SHA256; do
ssh-keygen -E "$h" -f "$DIR/../ssh_known_hosts" -lF "${host#*@}"
- done | sed -nr 's/^[^ #]+\s+//p' | sed -r 's/^\S+\s+([^:]+):/\1 /' |
- while read h fpr; do
+ done | sed -nr 's/^[^ #]+\s+//p' | sed -r 's/^(\S+)\s+([^:]+):/\1 \2 /' |
+ while read a h fpr; do
str2="$str$(printf '%-6s' "$h" | tr '[a-z]' '[A-Z]')"
- printf '%s %s\n' "$indent$str2" "$fpr"
+ printf '%s %s (%s)\n' "$indent$str2" "$fpr" "$a"
indent=" ${indent#?}"
done
}