- (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@
This commit is contained in:
parent
c7a8af03a0
commit
dd190ddfd7
|
@ -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
|
20101109
|
||||||
- (tim) [regress/kextype.sh] Not all platforms have time in /usr/bin.
|
- (tim) [regress/kextype.sh] Not all platforms have time in /usr/bin.
|
||||||
Feedback from dtucker@
|
Feedback from dtucker@
|
||||||
|
|
|
@ -155,8 +155,10 @@ fill_default_server_options(ServerOptions *options)
|
||||||
_PATH_HOST_RSA_KEY_FILE;
|
_PATH_HOST_RSA_KEY_FILE;
|
||||||
options->host_key_files[options->num_host_key_files++] =
|
options->host_key_files[options->num_host_key_files++] =
|
||||||
_PATH_HOST_DSA_KEY_FILE;
|
_PATH_HOST_DSA_KEY_FILE;
|
||||||
|
#ifdef OPENSSL_HAS_ECC
|
||||||
options->host_key_files[options->num_host_key_files++] =
|
options->host_key_files[options->num_host_key_files++] =
|
||||||
_PATH_HOST_ECDSA_KEY_FILE;
|
_PATH_HOST_ECDSA_KEY_FILE;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* No certificates by default */
|
/* No certificates by default */
|
||||||
|
|
|
@ -70,7 +70,9 @@ extern char *__progname;
|
||||||
static char *default_files[] = {
|
static char *default_files[] = {
|
||||||
_PATH_SSH_CLIENT_ID_RSA,
|
_PATH_SSH_CLIENT_ID_RSA,
|
||||||
_PATH_SSH_CLIENT_ID_DSA,
|
_PATH_SSH_CLIENT_ID_DSA,
|
||||||
|
#ifdef OPENSSL_HAS_ECC
|
||||||
_PATH_SSH_CLIENT_ID_ECDSA,
|
_PATH_SSH_CLIENT_ID_ECDSA,
|
||||||
|
#endif
|
||||||
_PATH_SSH_CLIENT_IDENTITY,
|
_PATH_SSH_CLIENT_IDENTITY,
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
|
@ -177,10 +177,12 @@ ask_filename(struct passwd *pw, const char *prompt)
|
||||||
case KEY_DSA:
|
case KEY_DSA:
|
||||||
name = _PATH_SSH_CLIENT_ID_DSA;
|
name = _PATH_SSH_CLIENT_ID_DSA;
|
||||||
break;
|
break;
|
||||||
|
#ifdef OPENSSL_HAS_ECC
|
||||||
case KEY_ECDSA_CERT:
|
case KEY_ECDSA_CERT:
|
||||||
case KEY_ECDSA:
|
case KEY_ECDSA:
|
||||||
name = _PATH_SSH_CLIENT_ID_ECDSA;
|
name = _PATH_SSH_CLIENT_ID_ECDSA;
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
case KEY_RSA_CERT:
|
case KEY_RSA_CERT:
|
||||||
case KEY_RSA_CERT_V00:
|
case KEY_RSA_CERT_V00:
|
||||||
case KEY_RSA:
|
case KEY_RSA:
|
||||||
|
|
Loading…
Reference in New Issue