1 files changed, 2 insertions, 1 deletions

diff --git a/sshkey.c b/sshkey.c
index cfe598080..2c87d8099 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -116,6 +116,7 @@ static const struct keytype keytypes[] = {
         { "ssh-dss-cert-v00@openssh.com", "DSA-CERT-V00",
             KEY_DSA_CERT_V00, 0, 1 },
 #endif /* WITH_OPENSSL */
+        { "null", "null", KEY_NULL, 0, 0 },
         { NULL, NULL, -1, -1, 0 }
 };
 
@@ -204,7 +205,7 @@ key_alg_list(int certs_only, int plain_only)
         const struct keytype *kt;
 
         for (kt = keytypes; kt->type != -1; kt++) {
-                if (kt->name == NULL)
+                if (kt->name == NULL || kt->type == KEY_NULL)
                         continue;
                 if ((certs_only && !kt->cert) || (plain_only && kt->cert))
                         continue;