diff options
| author | des <des@FreeBSD.org> | 2016-08-11 08:29:15 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-08-11 08:29:15 +0000 |
| commit | 91c31a960acb18732dcecb025733e05cc1080cb0 (patch) | |
| tree | cbc58963e26ea0106523d432757b7ce1a827fc3c /crypto | |
| parent | ab4a27034a6173d344e1adcd7eb2a53073b8cc5b (diff) | |
| download | FreeBSD-src-91c31a960acb18732dcecb025733e05cc1080cb0.zip FreeBSD-src-91c31a960acb18732dcecb025733e05cc1080cb0.tar.gz | |
MFH (r303832): check whether each key file exists before adding it
PR: 208254
Approved by: re (kib)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssh/servconf.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index da558de..6fb8be5 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -22,6 +22,7 @@ __RCSID("$FreeBSD$"); #include <netinet/ip.h> #include <ctype.h> +#include <fcntl.h> #include <netdb.h> #include <pwd.h> #include <stdio.h> @@ -206,24 +207,28 @@ fill_default_server_options(ServerOptions *options) /* Standard Options */ if (options->protocol == SSH_PROTO_UNKNOWN) options->protocol = SSH_PROTO_2; +#define add_host_key_file(path) \ + do { \ + if (access((path), O_RDONLY) == 0) \ + options->host_key_files \ + [options->num_host_key_files++] = (path); \ + } while (0) if (options->num_host_key_files == 0) { /* fill default hostkeys for protocols */ if (options->protocol & SSH_PROTO_1) - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_KEY_FILE; + add_host_key_file(_PATH_HOST_KEY_FILE); if (options->protocol & SSH_PROTO_2) { - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_RSA_KEY_FILE; - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_DSA_KEY_FILE; + add_host_key_file(_PATH_HOST_RSA_KEY_FILE); + add_host_key_file(_PATH_HOST_DSA_KEY_FILE); #ifdef OPENSSL_HAS_ECC - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_ECDSA_KEY_FILE; + add_host_key_file(_PATH_HOST_ECDSA_KEY_FILE); #endif - options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_ED25519_KEY_FILE; + add_host_key_file(_PATH_HOST_ED25519_KEY_FILE); } } +#undef add_host_key_file + if (options->num_host_key_files == 0) + fatal("No host key files found"); /* No certificates by default */ if (options->num_ports == 0) options->ports[options->num_ports++] = SSH_DEFAULT_PORT; |
