summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ssh-keygen.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index a3c2362a2..96dd8b439 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.266 2015/02/26 20:45:47 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.267 2015/03/23 06:06:38 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -948,12 +948,16 @@ do_gen_all_hostkeys(struct passwd *pw)
948 char *key_type_display; 948 char *key_type_display;
949 char *path; 949 char *path;
950 } key_types[] = { 950 } key_types[] = {
951#ifdef WITH_OPENSSL
952#ifdef WITH_SSH1
951 { "rsa1", "RSA1", _PATH_HOST_KEY_FILE }, 953 { "rsa1", "RSA1", _PATH_HOST_KEY_FILE },
954#endif /* WITH_SSH1 */
952 { "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE }, 955 { "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE },
953 { "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE }, 956 { "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE },
954#ifdef OPENSSL_HAS_ECC 957#ifdef OPENSSL_HAS_ECC
955 { "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE }, 958 { "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE },
956#endif 959#endif /* OPENSSL_HAS_ECC */
960#endif /* WITH_OPENSSL */
957 { "ed25519", "ED25519",_PATH_HOST_ED25519_KEY_FILE }, 961 { "ed25519", "ED25519",_PATH_HOST_ED25519_KEY_FILE },
958 { NULL, NULL, NULL } 962 { NULL, NULL, NULL }
959 }; 963 };