summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-09-10 11:39:26 +1000
committerDamien Miller <djm@mindrot.org>2010-09-10 11:39:26 +1000
commit6af914a15c0c33e8b5bab5ca61919b8562ff1db9 (patch)
treeb87546d8a88a05e6fd600cbb2b8c0b132278cb10 /readconf.c
parent041ab7c1e7d6514ed84a539a767f79ffb356e807 (diff)
- (djm) [authfd.c authfile.c bufec.c buffer.h configure.ac kex.h kexecdh.c]
[kexecdhc.c kexecdhs.c key.c key.h myproposal.h packet.c readconf.c] [ssh-agent.c ssh-ecdsa.c ssh-keygen.c ssh.c] Disable ECDH and ECDSA on platforms that don't have the requisite OpenSSL support. ok dtucker@
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c
index 98ce3017f..586422930 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1214,12 +1214,13 @@ fill_default_options(Options * options)
1214 xmalloc(len); 1214 xmalloc(len);
1215 snprintf(options->identity_files[options->num_identity_files++], 1215 snprintf(options->identity_files[options->num_identity_files++],
1216 len, "~/%.100s", _PATH_SSH_CLIENT_ID_DSA); 1216 len, "~/%.100s", _PATH_SSH_CLIENT_ID_DSA);
1217 1217#ifdef OPENSSL_HAS_ECC
1218 len = 2 + strlen(_PATH_SSH_CLIENT_ID_ECDSA) + 1; 1218 len = 2 + strlen(_PATH_SSH_CLIENT_ID_ECDSA) + 1;
1219 options->identity_files[options->num_identity_files] = 1219 options->identity_files[options->num_identity_files] =
1220 xmalloc(len); 1220 xmalloc(len);
1221 snprintf(options->identity_files[options->num_identity_files++], 1221 snprintf(options->identity_files[options->num_identity_files++],
1222 len, "~/%.100s", _PATH_SSH_CLIENT_ID_ECDSA); 1222 len, "~/%.100s", _PATH_SSH_CLIENT_ID_ECDSA);
1223#endif
1223 } 1224 }
1224 } 1225 }
1225 if (options->escape_char == -1) 1226 if (options->escape_char == -1)