1 files changed, 5 insertions, 2 deletions

diff --git a/bin/samizdat-ssh-uid b/bin/samizdat-ssh-uid
index 2612bdc..2180cd5 100755
--- a/bin/samizdat-ssh-uid
+++ b/bin/samizdat-ssh-uid
@@ -21,8 +21,10 @@ get_domain()
 get_sshfp()
 {
     [ -f "$1" ] || return
-    sshfp_b16=$(ssh-keygen -r . -f "$1" | sed -ne 's/^. IN SSHFP [0-9]* 2 //p') &&
-        [ "$sshfp_b16" ] || die "could not determine ssh client fingerprint"
+    sshfp_raw=$(ssh-keygen -r . -f "$1" | sed -ne 's/^. IN SSHFP \([0-9]* 2 \)/\1/p' | head -n1) || die 'ssh-keygen'
+
+    sshfp_b16=$(echo "$sshfp_raw" | sed -ne 's/^[0-9]* 2 //p') &&
+    [ "$sshfp_b16" ] || die "could not determine ssh client fingerprint"
     sshfp_b32=$(b16_to_b32 "$sshfp_b16")
 }
 
@@ -82,6 +84,7 @@ dispose_of_temp_pem_files "$@"
 
 env -i \
     SSH_CLIENT_DOMAIN="$domain" \
+    SSH_CLIENT_SSHFP_DATA="'$sshfp_raw'" \
     SSH_CLIENT_FINGERPRINT="$sshfp_b32" \
     SSH_CLIENT_KEYTYPE="$keytype" \
     SSH_CLIENT_KEYDATA="$keydata"