switch to base32 encoded key hashes

2 files changed, 9 insertions, 2 deletions

diff --git a/bin/samizdat-ssh-uid b/bin/samizdat-ssh-uid
index 2b4b311..94d8f8c 100755
--- a/bin/samizdat-ssh-uid
+++ b/bin/samizdat-ssh-uid
@@ -2,6 +2,11 @@
 
 die() { echo "$0: Error: $*" >&2; exit 1; }
 
+b16_to_b32()
+{
+    echo -n "$1" | basez -x -d | basez -j -l | tr -d =
+}
+
 [ "$SSH_USER_AUTH" ] || die "not defined: \$SSH_USER_AUTH"
 [ -f "$SSH_USER_AUTH" ] || die "file does not exist: \$SSH_USER_AUTH=${SSH_USER_AUTH}"
 
@@ -11,6 +16,7 @@ sed -ne 's/^publickey //p' < "${SSH_USER_AUTH}" > "${PEMFILE}" || die "could not
 
 SSH_CLIENT_FINGERPRINT=$(ssh-keygen -r . -f "${PEMFILE}" | sed -ne 's/^. IN SSHFP [0-9]* 2 //p') &&
   [ "$SSH_CLIENT_FINGERPRINT" ] || die "could not determine ssh client fingerprint"
+SSH_CLIENT_FINGERPRINT_B32=$(b16_to_b32 "$SSH_CLIENT_FINGERPRINT")
 
 read keytype keydata < "${PEMFILE}" || die "reading from PEMFILE=$PEMFILE"
 case "$keytype" in
@@ -31,7 +37,7 @@ else
 fi
 
 env -i \
-  SSH_CLIENT_FINGERPRINT="$SSH_CLIENT_FINGERPRINT" \
+  SSH_CLIENT_FINGERPRINT="$SSH_CLIENT_FINGERPRINT_B32" \
   SSH_CLIENT_KEYTYPE="$keytype" \
   SSH_CLIENT_DOMAIN="$domain" \
   SSH_CLIENT_PEMFILE="$PEMFILE" \
diff --git a/control.d/depends.control b/control.d/depends.control
index 710c001..f285bc1 100644
--- a/control.d/depends.control
+++ b/control.d/depends.control
@@ -1,2 +1,3 @@
-Depends: pdns-backend-sqlite3,
+Depends: basez,
+         pdns-backend-sqlite3,
          pdns-server