diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-03-23 06:06:38 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-03-23 17:10:14 +1100 |
| commit | 5c27e3b6ec2db711dfcd40e6359c0bcdd0b62ea9 (patch) | |
| tree | 2f42b4bf282181637166ad0094b1bdc09d0ed417 /ssh-keygen.c | |
| parent | 725fd22a8c41db7de73a638539a5157b7e4424ae (diff) | |
upstream commit
for ssh-keygen -A, don't try (and fail) to generate ssh
v.1 keys when compiled without SSH1 support RSA/DSA/ECDSA keys when compiled
without OpenSSL based on patch by Mike Frysinger; bz#2369
Diffstat (limited to 'ssh-keygen.c')
| -rw-r--r-- | ssh-keygen.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index a3c2362a..96dd8b43 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.266 2015/02/26 20:45:47 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.267 2015/03/23 06:06:38 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -948,12 +948,16 @@ do_gen_all_hostkeys(struct passwd *pw) char *key_type_display; char *path; } key_types[] = { +#ifdef WITH_OPENSSL +#ifdef WITH_SSH1 { "rsa1", "RSA1", _PATH_HOST_KEY_FILE }, +#endif /* WITH_SSH1 */ { "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE }, { "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE }, #ifdef OPENSSL_HAS_ECC { "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE }, -#endif +#endif /* OPENSSL_HAS_ECC */ +#endif /* WITH_OPENSSL */ { "ed25519", "ED25519",_PATH_HOST_ED25519_KEY_FILE }, { NULL, NULL, NULL } }; |