diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-03-12 04:08:19 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-03-13 13:14:13 +1100 |
| commit | 88057eb6df912abf2678ea5c846d9d9cbc92752c (patch) | |
| tree | 7eae3d98c66cb57b8433b83d2e50aa63a47a3368 /sshd.c | |
| parent | f07519a2af96109325b5a48b1af18b57601074ca (diff) | |
| download | openssh-git-88057eb6df912abf2678ea5c846d9d9cbc92752c.tar.gz | |
upstream: Add ModuliFile keyword to sshd_config to specify the
location of the "moduli" file containing the groups for DH-GEX. This will
allow us to run tests against arbitrary moduli files without having to
install them. ok djm@
OpenBSD-Commit-ID: 8df99d60b14ecaaa28f3469d01fc7f56bff49f66
Diffstat (limited to 'sshd.c')
| -rw-r--r-- | sshd.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.570 2021/02/05 02:20:23 dtucker Exp $ */ +/* $OpenBSD: sshd.c,v 1.571 2021/03/12 04:08:19 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -124,6 +124,7 @@ #include "ssherr.h" #include "sk-api.h" #include "srclimit.h" +#include "dh.h" /* Re-exec fds */ #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1) @@ -1724,6 +1725,9 @@ main(int ac, char **av) parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name, cfg, &includes, NULL); + if (options.moduli_file != NULL) + dh_set_moduli_file(options.moduli_file); + /* Fill in default values for those options not explicitly set. */ fill_default_server_options(&options); |