summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-02-06 07:41:27 +1100
committerDamien Miller <djm@mindrot.org>2012-02-06 07:41:27 +1100
commitb56e4930aeada1b73d3457b452bf241236fdb1ed (patch)
treef17450f1ff0ef4222d8264ba25ae785fa5fc6a09
parente9b3ad73baf25fa780f853e40f91ce74f0381c76 (diff)
- (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--ChangeLog7
-rw-r--r--ssh-keygen.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4bdc73ec..3a9c052a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 }
};