From 72aea69dd8cfdcf79a6e18b955d43bdd40e95ccc Mon Sep 17 00:00:00 2001 From: Dmitry Belyavskiy Date: Sep 16 2021 14:13:20 +0000 Subject: fixup! OpenSSH 8.7p1 patches rebase --- diff --git a/openssh-8.7p1-scp-kill-switch.patch b/openssh-8.7p1-scp-kill-switch.patch index 5ccae09..6710304 100644 --- a/openssh-8.7p1-scp-kill-switch.patch +++ b/openssh-8.7p1-scp-kill-switch.patch @@ -5,7 +5,7 @@ diff -up openssh-8.7p1/pathnames.h.kill-scp openssh-8.7p1/pathnames.h #define _PATH_HOST_XMSS_KEY_FILE SSHDIR "/ssh_host_xmss_key" #define _PATH_HOST_RSA_KEY_FILE SSHDIR "/ssh_host_rsa_key" #define _PATH_DH_MODULI SSHDIR "/moduli" -+#define _PATH_SCP_KILL_SWITCH SSHDIR "/scp_kill_switch" ++#define _PATH_SCP_KILL_SWITCH SSHDIR "/disable_scp" #ifndef _PATH_SSH_PROGRAM #define _PATH_SSH_PROGRAM "/usr/bin/ssh" @@ -18,7 +18,7 @@ diff -up openssh-8.7p1/scp.1.kill-scp openssh-8.7p1/scp.1 .El +.Pp +Usage of SCP protocol can be blocked by creating a world-readable -+.Ar /etc/ssh/scp_kill_switch ++.Ar /etc/ssh/disable_scp +file. If this file exists, when SCP protocol is in use (either remotely or +via the +.Fl O