merge key exchange patch without rekeying support

[openssh.git] / key.c

diff --git a/key.c b/key.c
index e3a305e..d30dc5c 100644 (file)
--- a/key.c
+++ b/key.c
@@ -971,6 +971,8 @@ key_ssh_name_from_type_nid(int type, int nid)
                }
                break;
 #endif /* OPENSSL_HAS_ECC */
+       case KEY_NULL:
+               return "null";
        }
        return "ssh-unknown";
 }
@@ -1276,6 +1278,8 @@ key_type_from_name(char *name)
            strcmp(name, "ecdsa-sha2-nistp521-cert-v01@openssh.com") == 0) {
                return KEY_ECDSA_CERT;
 #endif
+       } else if (strcmp(name, "null") == 0) {
+               return KEY_NULL;
        }
 
        debug2("key_type_from_name: unknown key type '%s'", name);