From fbd5f1bee2e2cdc7b1b47f4604b8347d8c3ed63f Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mar 30 2020 14:38:36 +0000 Subject: Print FIPS mode initialized in debug mode after the configuration is processed Amends ee9cb00 --- diff --git a/openssh-7.7p1-fips.patch b/openssh-7.7p1-fips.patch index 0681e28..84611de 100644 --- a/openssh-7.7p1-fips.patch +++ b/openssh-7.7p1-fips.patch @@ -303,16 +303,16 @@ diff -up openssh-8.0p1/ssh.c.fips openssh-8.0p1/ssh.c #ifndef HAVE_SETPROCTITLE /* Prepare for later setproctitle emulation */ @@ -614,6 +626,10 @@ main(int ac, char **av) - - seed_rng(); - + dump_client_config(&options, host); + exit(0); + } ++ + if (FIPS_mode()) { + debug("FIPS mode initialized"); + } -+ - /* - * Discard other fds that are hanging around. These can cause problem - * with backgrounded ssh processes started by ControlPersist. + + /* Expand SecurityKeyProvider if it refers to an environment variable */ + if (options.sk_provider != NULL && *options.sk_provider == '$' && diff -up openssh-8.0p1/sshconnect2.c.fips openssh-8.0p1/sshconnect2.c --- openssh-8.0p1/sshconnect2.c.fips 2019-07-23 14:55:45.336525743 +0200 +++ openssh-8.0p1/sshconnect2.c 2019-07-23 14:55:45.403526421 +0200