From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 27 Mar 2019 02:31:11 +0000 (-0300)
Subject: Do not list keys without password at ssh-agent-loadkey (robust approach)
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6e9267bf75c6d7ce93e7a4be22d88d2c354cfcb9;p=utils-ssh.git

Do not list keys without password at ssh-agent-loadkey (robust approach)
---

diff --git a/ssh-agent-loadkey b/ssh-agent-loadkey
index 840ea82..841e3d2 100755
--- a/ssh-agent-loadkey
+++ b/ssh-agent-loadkey
@@ -18,7 +18,8 @@ function __query {
   (
   cd $KEYS && find -name '*.pub' | sed -e 's/.pub$//' | grep -v decomissioned | while read line; do
     # See https://security.stackexchange.com/questions/129724/how-to-check-if-an-ssh-private-key-has-passphrase-or-not#129727
-    if grep -q ',ENCRYPTED' $line; then
+    #if grep -q ',ENCRYPTED' $line; then
+    if ! ssh-keygen -y -P "" -f $line &> /dev/null; then
       handle="`echo $line | cut -d '/' -f 3`"
       type="`echo $line | cut -d '/' -f 2`"
       echo "$handle ($type)"