diff options
| author | Damien Miller <djm@mindrot.org> | 2010-11-11 14:17:02 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-11-11 14:17:02 +1100 |
| commit | dd190ddfd7a8934808556354eeee6ee690443d3e (patch) | |
| tree | 46301777984dcb9c4aa0a993c09a914820c68e9a | |
| parent | c7a8af03a022e8ab52422b6ce26fdbcb729031fd (diff) | |
- (djm) [servconf.c ssh-add.c ssh-keygen.c] don't look for ECDSA keys on
platforms that don't support ECC. Fixes some spurious warnings reported
by tim@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | servconf.c | 2 | ||||
| -rw-r--r-- | ssh-add.c | 2 | ||||
| -rw-r--r-- | ssh-keygen.c | 2 |
4 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,8 @@ +20101111 + - (djm) [servconf.c ssh-add.c ssh-keygen.c] don't look for ECDSA keys on + platforms that don't support ECC. Fixes some spurious warnings reported + by tim@ + 20101109 - (tim) [regress/kextype.sh] Not all platforms have time in /usr/bin. Feedback from dtucker@ diff --git a/servconf.c b/servconf.c index 41c9c6964..4e5fd2f04 100644 --- a/servconf.c +++ b/servconf.c @@ -155,8 +155,10 @@ fill_default_server_options(ServerOptions *options) _PATH_HOST_RSA_KEY_FILE; options->host_key_files[options->num_host_key_files++] = _PATH_HOST_DSA_KEY_FILE; +#ifdef OPENSSL_HAS_ECC options->host_key_files[options->num_host_key_files++] = _PATH_HOST_ECDSA_KEY_FILE; +#endif } } /* No certificates by default */ @@ -70,7 +70,9 @@ extern char *__progname; static char *default_files[] = { _PATH_SSH_CLIENT_ID_RSA, _PATH_SSH_CLIENT_ID_DSA, +#ifdef OPENSSL_HAS_ECC _PATH_SSH_CLIENT_ID_ECDSA, +#endif _PATH_SSH_CLIENT_IDENTITY, NULL }; diff --git a/ssh-keygen.c b/ssh-keygen.c index 560c4818a..b9fd10abc 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -177,10 +177,12 @@ ask_filename(struct passwd *pw, const char *prompt) case KEY_DSA: name = _PATH_SSH_CLIENT_ID_DSA; break; +#ifdef OPENSSL_HAS_ECC case KEY_ECDSA_CERT: case KEY_ECDSA: name = _PATH_SSH_CLIENT_ID_ECDSA; break; +#endif case KEY_RSA_CERT: case KEY_RSA_CERT_V00: case KEY_RSA: |