diff options
author | Anderson Toshiyuki Sasaki <ansasaki@redhat.com> | 2019-10-02 17:36:54 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2019-10-25 16:11:17 +0200 |
commit | 50b37f299148067dd316d167c4a21ecd87eca84d (patch) | |
tree | 88d983dbddb24ef85bc5368f965351db84374bbf | |
parent | a47a291303b5cfb4e97ab3c2712b28919c3671d3 (diff) | |
download | libssh-50b37f299148067dd316d167c4a21ecd87eca84d.tar.gz libssh-50b37f299148067dd316d167c4a21ecd87eca84d.tar.xz libssh-50b37f299148067dd316d167c4a21ecd87eca84d.zip |
tests: Do not process server config during tests
In pkd tests, avoid processing the global server configuration file.
This is to allow testing with algorithms not allowed in the global
server configuration.
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit 040aa0edfeb47307f117bf1c5e4d66fc2d579cc2)
-rw-r--r-- | tests/pkd/pkd_daemon.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/pkd/pkd_daemon.c b/tests/pkd/pkd_daemon.c index 141d79a6..910b3749 100644 --- a/tests/pkd/pkd_daemon.c +++ b/tests/pkd/pkd_daemon.c @@ -252,6 +252,7 @@ static int pkd_exec_hello(int fd, struct pkd_daemon_args *args) size_t kex_len = 0; const char *all_ciphers = NULL; const uint64_t rekey_data_limit = args->rekey_data_limit; + bool process_config = false; pkd_state.eof_received = 0; pkd_state.close_received = 0; @@ -291,6 +292,13 @@ static int pkd_exec_hello(int fd, struct pkd_daemon_args *args) goto outclose; } + rc = ssh_bind_options_set(b, SSH_BIND_OPTIONS_PROCESS_CONFIG, + &process_config); + if (rc != 0) { + pkderr("ssh_bind_options_set process config: %s\n", ssh_get_error(b)); + goto outclose; + } + if (!ssh_fips_mode()) { /* Add methods not enabled by default */ #define GEX_SHA1 "diffie-hellman-group-exchange-sha1" |