From 7326d8f70deb2ced665b92d224b027f1f7a584f7 Mon Sep 17 00:00:00 2001 From: gammlaa Date: Thu, 31 Mar 2016 16:00:53 +0200 Subject: [PATCH] Bugfix for invalid keys-check --- foodoor-update-keydb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/foodoor-update-keydb b/foodoor-update-keydb index 4031c54..9455502 100755 --- a/foodoor-update-keydb +++ b/foodoor-update-keydb @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e export PATH="/usr/bin:/bin:/usr/sbin:/sbin" @@ -22,10 +22,11 @@ do find "${dest}/keys" -name '*.pub' | sort | \ while read keyfile do - valid_key=$(ssh-keygen -l -f ${keyfile}) - if [ "$?" -eq "0" ]; then - if [ $(echo "${valid_key}" | cut -d" " -f1) -lt "4096" ]; then - echo "Size of key ${keyfile} is less than 4096. Not adding it to key database." >&2 + ssh-keygen -l -f ${keyfile} &> /dev/null + if [ $? -eq 0 ]; then + key_length=`ssh-keygen -l -f ${keyfile} | cut -d" " -f1` + if [ ${key_length} -lt 4096 ]; then + echo "Key size of key ${keyfile} not equal to 4096. Not adding it to key database." >&2 continue fi fi