diff options
| author | djm <djm> | 2012-02-05 20:41:27 +0000 |
|---|---|---|
| committer | djm <djm> | 2012-02-05 20:41:27 +0000 |
| commit | d1b07bb07fe68cfb68a70023d360c853c8f59d7c (patch) | |
| tree | 5e6de7f3beadf8c77ef09d789929edb2b5e94dcd | |
| parent | 4e5f336dd3759c7e779da49054eb4596b68e0cb3 (diff) | |
| download | openssh-d1b07bb07fe68cfb68a70023d360c853c8f59d7c.tar.gz | |
- (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms
that don't support ECC. Patch from Phil Oleson
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ssh-keygen.c | 2 |
2 files changed, 5 insertions, 4 deletions
@@ -1,7 +1,6 @@ -20120117 - - (dtucker) [configure.ac mac.c openbsd-compat/openssl-compat.h] Add - null implementation of HMAC_CTX_init for the benefit of old versions - of OpenSSL that don't have it. +20120206 + - (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms + that don't support ECC. Patch from Phil Oleson 20111219 - OpenBSD CVS Sync diff --git a/ssh-keygen.c b/ssh-keygen.c index 53b232d6..5fcd3a15 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -857,7 +857,9 @@ do_gen_all_hostkeys(struct passwd *pw) { "rsa1", "RSA1", _PATH_HOST_KEY_FILE }, { "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 { NULL, NULL, NULL } }; |