vishalmishra434 / rpms / openssh

Forked from rpms/openssh a month ago
Clone
Norbert Pocs 2b67ec
diff --color -ru -x regress -x autom4te.cache -x '*.o' -x '*.lo' -x Makefile -x config.status -x configure~ -x configure.ac openssh-9.3p1/ssh_config.5 openssh-9.3p1-patched/ssh_config.5
Norbert Pocs 2b67ec
--- openssh-9.3p1/ssh_config.5	2023-06-07 10:26:48.284590156 +0200
Norbert Pocs 2b67ec
+++ openssh-9.3p1-patched/ssh_config.5	2023-06-07 10:26:00.623052194 +0200
Norbert Pocs 2b67ec
@@ -378,17 +378,13 @@
Dmitry Belyavskiy 7b76af
 causes no CNAMEs to be considered for canonicalization.
Dmitry Belyavskiy 7b76af
 This is the default behaviour.
Jakub Jelen 51f5c1
 .It Cm CASignatureAlgorithms
Jakub Jelen a84805
+The default is handled system-wide by
Jakub Jelen a84805
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen a84805
+.Xr update-crypto-policies 8 .
Jakub Jelen a84805
+.Pp
Jakub Jelen 51f5c1
 Specifies which algorithms are allowed for signing of certificates
Jakub Jelen 51f5c1
 by certificate authorities (CAs).
Jakub Jelen 51f5c1
-The default is:
Jakub Jelen 51f5c1
-.Bd -literal -offset indent
Dmitry Belyavskiy 8f4d19
-ssh-ed25519,ecdsa-sha2-nistp256,
Dmitry Belyavskiy 8f4d19
-ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
Dmitry Belyavskiy 8f4d19
-sk-ssh-ed25519@openssh.com,
Dmitry Belyavskiy 8f4d19
-sk-ecdsa-sha2-nistp256@openssh.com,
Dmitry Belyavskiy f32b84
-rsa-sha2-512,rsa-sha2-256
Jakub Jelen 51f5c1
-.Ed
Jakub Jelen 51f5c1
-.Pp
Dmitry Belyavskiy 8f4d19
 If the specified list begins with a
Dmitry Belyavskiy 8f4d19
 .Sq +
Dmitry Belyavskiy 8f4d19
 character, then the specified algorithms will be appended to the default set
Norbert Pocs 2b67ec
@@ -450,20 +446,25 @@
Jakub Jelen 25c16c
 (the default),
Jakub Jelen a84805
 the check will not be executed.
Jakub Jelen a84805
 .It Cm Ciphers
Jakub Jelen 51f5c1
+The default is handled system-wide by
Jakub Jelen 51f5c1
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen 51f5c1
+.Xr update-crypto-policies 8 .
Jakub Jelen 51f5c1
+.Pp
Jakub Jelen a84805
 Specifies the ciphers allowed and their order of preference.
Jakub Jelen a84805
 Multiple ciphers must be comma-separated.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq +
Jakub Jelen a84805
-character, then the specified ciphers will be appended to the default set
Jakub Jelen 9c8896
-instead of replacing them.
Jakub Jelen 9c8896
+character, then the specified ciphers will be appended to the built-in
Jakub Jelen 9c8896
+openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq -
Jakub Jelen a84805
 character, then the specified ciphers (including wildcards) will be removed
Jakub Jelen a84805
-from the default set instead of replacing them.
Jakub Jelen 9c8896
+from the built-in openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq ^
Jakub Jelen a84805
 character, then the specified ciphers will be placed at the head of the
Jakub Jelen a84805
-default set.
Jakub Jelen 9c8896
+built-in openssh default set.
Jakub Jelen a84805
 .Pp
Jakub Jelen a84805
 The supported ciphers are:
Jakub Jelen a84805
 .Bd -literal -offset indent
Norbert Pocs 2b67ec
@@ -479,13 +480,6 @@
Jakub Jelen 6caa97
 chacha20-poly1305@openssh.com
Jakub Jelen 6caa97
 .Ed
Jakub Jelen 6caa97
 .Pp
Jakub Jelen 6caa97
-The default is:
Jakub Jelen 6caa97
-.Bd -literal -offset indent
Jakub Jelen 6caa97
-chacha20-poly1305@openssh.com,
Jakub Jelen 6caa97
-aes128-ctr,aes192-ctr,aes256-ctr,
Jakub Jelen 6caa97
-aes128-gcm@openssh.com,aes256-gcm@openssh.com
Jakub Jelen 6caa97
-.Ed
Jakub Jelen a84805
-.Pp
Jakub Jelen a84805
 The list of available ciphers may also be obtained using
Jakub Jelen a84805
 .Qq ssh -Q cipher .
Jakub Jelen a84805
 .It Cm ClearAllForwardings
Norbert Pocs 2b67ec
@@ -885,6 +879,11 @@
Jakub Jelen a84805
 The default is
Jakub Jelen a84805
 .Dq no .
Jakub Jelen a84805
 .It Cm GSSAPIKexAlgorithms
Jakub Jelen 6caa97
+The default is handled system-wide by
Jakub Jelen 6caa97
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen 6caa97
+.Xr update-crypto-policies 8 .
Jakub Jelen a84805
+.Pp
Jakub Jelen a84805
 The list of key exchange algorithms that are offered for GSSAPI
Jakub Jelen a84805
 key exchange. Possible values are
Jakub Jelen a84805
 .Bd -literal -offset 3n
Norbert Pocs 2b67ec
@@ -897,10 +896,8 @@
Jakub Jelen 6caa97
 gss-curve25519-sha256-
Jakub Jelen 6caa97
 .Ed
Jakub Jelen 6caa97
 .Pp
Jakub Jelen 6caa97
-The default is
Jakub Jelen 1cc7c8
-.Dq gss-group14-sha256-,gss-group16-sha512-,gss-nistp256-sha256-,
Jakub Jelen 1cc7c8
-gss-curve25519-sha256-,gss-group14-sha1-,gss-gex-sha1- .
Jakub Jelen a84805
 This option only applies to connections using GSSAPI.
Jakub Jelen a84805
+.Pp
Jakub Jelen a84805
 .It Cm HashKnownHosts
Jakub Jelen a84805
 Indicates that
Jakub Jelen a84805
 .Xr ssh 1
Norbert Pocs 2b67ec
@@ -919,36 +916,25 @@
Alexander Sosedkin 42b22d
 but may be manually hashed using
Alexander Sosedkin 42b22d
 .Xr ssh-keygen 1 .
Alexander Sosedkin 42b22d
 .It Cm HostbasedAcceptedAlgorithms
Alexander Sosedkin 42b22d
+The default is handled system-wide by
Alexander Sosedkin 42b22d
+.Xr crypto-policies 7 .
Alexander Sosedkin 42b22d
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Alexander Sosedkin 42b22d
+.Xr update-crypto-policies 8 .
Alexander Sosedkin 42b22d
+.Pp
Alexander Sosedkin 42b22d
 Specifies the signature algorithms that will be used for hostbased
Alexander Sosedkin 42b22d
 authentication as a comma-separated list of patterns.
Alexander Sosedkin 42b22d
 Alternately if the specified list begins with a
Alexander Sosedkin 42b22d
 .Sq +
Alexander Sosedkin 42b22d
 character, then the specified signature algorithms will be appended
Alexander Sosedkin 42b22d
-to the default set instead of replacing them.
Alexander Sosedkin 42b22d
+to the built-in openssh default set instead of replacing them.
Alexander Sosedkin 42b22d
 If the specified list begins with a
Alexander Sosedkin 42b22d
 .Sq -
Alexander Sosedkin 42b22d
 character, then the specified signature algorithms (including wildcards)
Alexander Sosedkin 42b22d
-will be removed from the default set instead of replacing them.
Alexander Sosedkin 42b22d
+will be removed from the built-in openssh default set instead of replacing them.
Alexander Sosedkin 42b22d
 If the specified list begins with a
Alexander Sosedkin 42b22d
 .Sq ^
Alexander Sosedkin 42b22d
 character, then the specified signature algorithms will be placed
Alexander Sosedkin 42b22d
-at the head of the default set.
Alexander Sosedkin 42b22d
-The default for this option is:
Alexander Sosedkin 42b22d
-.Bd -literal -offset 3n
Alexander Sosedkin 42b22d
-ssh-ed25519-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-ecdsa-sha2-nistp256-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-ecdsa-sha2-nistp384-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-ecdsa-sha2-nistp521-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-sk-ssh-ed25519-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-rsa-sha2-512-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-rsa-sha2-256-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-ssh-ed25519,
Alexander Sosedkin 42b22d
-ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
Alexander Sosedkin 42b22d
-sk-ssh-ed25519@openssh.com,
Alexander Sosedkin 42b22d
-sk-ecdsa-sha2-nistp256@openssh.com,
Alexander Sosedkin 42b22d
-rsa-sha2-512,rsa-sha2-256
Alexander Sosedkin 42b22d
-.Ed
Alexander Sosedkin 42b22d
+at the head of the built-in openssh default set.
Alexander Sosedkin 42b22d
 .Pp
Alexander Sosedkin 42b22d
 The
Alexander Sosedkin 42b22d
 .Fl Q
Norbert Pocs 2b67ec
@@ -1001,6 +987,17 @@
Norbert Pocs 2b67ec
 .Pp
Norbert Pocs 2b67ec
 The list of available signature algorithms may also be obtained using
Norbert Pocs 2b67ec
 .Qq ssh -Q HostKeyAlgorithms .
Norbert Pocs 2b67ec
+.Pp
Norbert Pocs 2b67ec
+The proposed
Norbert Pocs 2b67ec
+.Cm HostKeyAlgorithms
Norbert Pocs 2b67ec
+during KEX are limited to the set of algorithms that is defined in
Norbert Pocs 2b67ec
+.Cm PubkeyAcceptedAlgorithms
Norbert Pocs 2b67ec
+and therefore they are indirectly affected by system-wide
Norbert Pocs 2b67ec
+.Xr crypto_policies 7 .
Norbert Pocs 2b67ec
+.Xr crypto_policies 7 can not handle the list of host key algorithms directly as doing so
Norbert Pocs 2b67ec
+would break the order given by the
Norbert Pocs 2b67ec
+.Pa known_hosts
Norbert Pocs 2b67ec
+file.
Norbert Pocs 2b67ec
 .It Cm HostKeyAlias
Norbert Pocs 2b67ec
 Specifies an alias that should be used instead of the
Norbert Pocs 2b67ec
 real host name when looking up or saving the host key
Norbert Pocs 2b67ec
@@ -1232,30 +1229,25 @@
Jakub Jelen a84805
 and
Jakub Jelen a84805
 .Cm pam .
Jakub Jelen a84805
 .It Cm KexAlgorithms
Jakub Jelen 6caa97
+The default is handled system-wide by
Jakub Jelen 6caa97
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen 6caa97
+.Xr update-crypto-policies 8 .
Jakub Jelen a84805
+.Pp
Jakub Jelen a84805
 Specifies the available KEX (Key Exchange) algorithms.
Jakub Jelen a84805
 Multiple algorithms must be comma-separated.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq +
Dmitry Belyavskiy 7b76af
-character, then the specified algorithms will be appended to the default set
Jakub Jelen 9c8896
-instead of replacing them.
Dmitry Belyavskiy 9fd698
+character, then the specified methods will be appended to the built-in
Jakub Jelen 9c8896
+openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq -
Dmitry Belyavskiy 7b76af
 character, then the specified algorithms (including wildcards) will be removed
Jakub Jelen a84805
-from the default set instead of replacing them.
Jakub Jelen 9c8896
+from the built-in openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen 36fef5
 .Sq ^
Dmitry Belyavskiy 7b76af
 character, then the specified algorithms will be placed at the head of the
Jakub Jelen a84805
-default set.
Jakub Jelen 6caa97
-The default is:
Jakub Jelen 6caa97
-.Bd -literal -offset indent
Dmitry Belyavskiy 03150f
-sntrup761x25519-sha512@openssh.com,
Jakub Jelen 6caa97
-curve25519-sha256,curve25519-sha256@libssh.org,
Jakub Jelen 6caa97
-ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
Jakub Jelen 6caa97
-diffie-hellman-group-exchange-sha256,
Jakub Jelen 6caa97
-diffie-hellman-group16-sha512,
Jakub Jelen 6caa97
-diffie-hellman-group18-sha512,
Jakub Jelen 51f5c1
-diffie-hellman-group14-sha256
Jakub Jelen 6caa97
-.Ed
Jakub Jelen 9c8896
+built-in openssh default set.
Jakub Jelen a84805
 .Pp
Jakub Jelen a84805
 The list of available key exchange algorithms may also be obtained using
Jakub Jelen a84805
 .Qq ssh -Q kex .
Norbert Pocs 2b67ec
@@ -1365,37 +1357,33 @@
Jakub Jelen 25c16c
 file.
Jakub Jelen 25c16c
 This option is intended for debugging and no overrides are enabled by default.
Jakub Jelen a84805
 .It Cm MACs
Jakub Jelen 6caa97
+The default is handled system-wide by
Jakub Jelen 6caa97
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen 6caa97
+.Xr update-crypto-policies 8 .
Jakub Jelen a84805
+.Pp
Jakub Jelen a84805
 Specifies the MAC (message authentication code) algorithms
Jakub Jelen a84805
 in order of preference.
Jakub Jelen a84805
 The MAC algorithm is used for data integrity protection.
Jakub Jelen a84805
 Multiple algorithms must be comma-separated.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq +
Jakub Jelen a84805
-character, then the specified algorithms will be appended to the default set
Jakub Jelen 9c8896
-instead of replacing them.
Jakub Jelen 9c8896
+character, then the specified algorithms will be appended to the built-in
Jakub Jelen 9c8896
+openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq -
Jakub Jelen a84805
 character, then the specified algorithms (including wildcards) will be removed
Jakub Jelen a84805
-from the default set instead of replacing them.
Jakub Jelen 9c8896
+from the built-in openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq ^
Jakub Jelen a84805
 character, then the specified algorithms will be placed at the head of the
Jakub Jelen a84805
-default set.
Jakub Jelen 9c8896
+built-in openssh default set.
Jakub Jelen 6caa97
 .Pp
Jakub Jelen a84805
 The algorithms that contain
Jakub Jelen a84805
 .Qq -etm
Jakub Jelen 6caa97
 calculate the MAC after encryption (encrypt-then-mac).
Jakub Jelen 6caa97
 These are considered safer and their use recommended.
Jakub Jelen 6caa97
 .Pp
Jakub Jelen 6caa97
-The default is:
Jakub Jelen 6caa97
-.Bd -literal -offset indent
Jakub Jelen 6caa97
-umac-64-etm@openssh.com,umac-128-etm@openssh.com,
Jakub Jelen 6caa97
-hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,
Jakub Jelen 6caa97
-hmac-sha1-etm@openssh.com,
Jakub Jelen 6caa97
-umac-64@openssh.com,umac-128@openssh.com,
Jakub Jelen 6caa97
-hmac-sha2-256,hmac-sha2-512,hmac-sha1
Jakub Jelen 6caa97
-.Ed
Jakub Jelen a84805
-.Pp
Jakub Jelen a84805
 The list of available MAC algorithms may also be obtained using
Jakub Jelen a84805
 .Qq ssh -Q mac .
Jakub Jelen a84805
 .It Cm NoHostAuthenticationForLocalhost
Norbert Pocs 2b67ec
@@ -1567,39 +1555,31 @@
Jakub Jelen a84805
 The default is
Jakub Jelen a84805
 .Cm no .
Jakub Jelen 25c16c
 .It Cm PubkeyAcceptedAlgorithms
Jakub Jelen 6caa97
+The default is handled system-wide by
Jakub Jelen 6caa97
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen 6caa97
+.Xr update-crypto-policies 8 .
Jakub Jelen a84805
+.Pp
Jakub Jelen 25c16c
 Specifies the signature algorithms that will be used for public key
Jakub Jelen 25c16c
 authentication as a comma-separated list of patterns.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq +
Jakub Jelen 25c16c
-character, then the algorithms after it will be appended to the default
Jakub Jelen 9c8896
-instead of replacing it.
Jakub Jelen 25c16c
+character, then the algorithms after it will be appended to the built-in
Jakub Jelen 9c8896
+openssh default instead of replacing it.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq -
Jakub Jelen 25c16c
 character, then the specified algorithms (including wildcards) will be removed
Jakub Jelen a84805
-from the default set instead of replacing them.
Jakub Jelen 9c8896
+from the built-in openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen 36fef5
 .Sq ^
Jakub Jelen 25c16c
 character, then the specified algorithms will be placed at the head of the
Jakub Jelen a84805
-default set.
Jakub Jelen 6caa97
-The default for this option is:
Jakub Jelen 6caa97
-.Bd -literal -offset 3n
Jakub Jelen 25c16c
-ssh-ed25519-cert-v01@openssh.com,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp256-cert-v01@openssh.com,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp384-cert-v01@openssh.com,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp521-cert-v01@openssh.com,
Jakub Jelen 51f5c1
-sk-ssh-ed25519-cert-v01@openssh.com,
Jakub Jelen 25c16c
-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
Jakub Jelen 51f5c1
-rsa-sha2-512-cert-v01@openssh.com,
Jakub Jelen 51f5c1
-rsa-sha2-256-cert-v01@openssh.com,
Jakub Jelen 25c16c
-ssh-ed25519,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
Jakub Jelen 25c16c
-sk-ssh-ed25519@openssh.com,
Jakub Jelen 51f5c1
-sk-ecdsa-sha2-nistp256@openssh.com,
Dmitry Belyavskiy 7b76af
-rsa-sha2-512,rsa-sha2-256
Jakub Jelen 6caa97
-.Ed
Jakub Jelen 9c8896
+built-in openssh default set.
Jakub Jelen 6caa97
 .Pp
Jakub Jelen 25c16c
 The list of available signature algorithms may also be obtained using
Jakub Jelen 25c16c
 .Qq ssh -Q PubkeyAcceptedAlgorithms .
Norbert Pocs 2b67ec
+.Pp
Norbert Pocs 2b67ec
+This option affects also
Norbert Pocs 2b67ec
+.Cm HostKeyAlgorithms
Norbert Pocs 2b67ec
 .It Cm PubkeyAuthentication
Norbert Pocs 2b67ec
 Specifies whether to try public key authentication.
Norbert Pocs 2b67ec
 The argument to this keyword must be
Norbert Pocs 2b67ec
@@ -2265,7 +2245,9 @@
Alexander Sosedkin 42b22d
 This file must be world-readable.
Alexander Sosedkin 42b22d
 .El
Alexander Sosedkin 42b22d
 .Sh SEE ALSO
Alexander Sosedkin 42b22d
-.Xr ssh 1
Alexander Sosedkin 42b22d
+.Xr ssh 1 ,
Alexander Sosedkin 42b22d
+.Xr crypto-policies 7 ,
Alexander Sosedkin 42b22d
+.Xr update-crypto-policies 8
Alexander Sosedkin 42b22d
 .Sh AUTHORS
Alexander Sosedkin 42b22d
 .An -nosplit
Alexander Sosedkin 42b22d
 OpenSSH is a derivative of the original and free
Norbert Pocs 2b67ec
diff --color -ru -x regress -x autom4te.cache -x '*.o' -x '*.lo' -x Makefile -x config.status -x configure~ -x configure.ac openssh-9.3p1/sshd_config.5 openssh-9.3p1-patched/sshd_config.5
Norbert Pocs 2b67ec
--- openssh-9.3p1/sshd_config.5	2023-06-07 10:26:48.277590077 +0200
Norbert Pocs 2b67ec
+++ openssh-9.3p1-patched/sshd_config.5	2023-06-07 10:26:00.592051845 +0200
Norbert Pocs 2b67ec
@@ -379,17 +379,13 @@
Jakub Jelen a84805
 then no banner is displayed.
Jakub Jelen a84805
 By default, no banner is displayed.
Jakub Jelen 51f5c1
 .It Cm CASignatureAlgorithms
Jakub Jelen a84805
+The default is handled system-wide by
Jakub Jelen a84805
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen a84805
+.Xr update-crypto-policies 8 .
Jakub Jelen a84805
+.Pp
Jakub Jelen 51f5c1
 Specifies which algorithms are allowed for signing of certificates
Jakub Jelen 51f5c1
 by certificate authorities (CAs).
Jakub Jelen 51f5c1
-The default is:
Jakub Jelen 51f5c1
-.Bd -literal -offset indent
Dmitry Belyavskiy 8f4d19
-ssh-ed25519,ecdsa-sha2-nistp256,
Dmitry Belyavskiy 8f4d19
-ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
Dmitry Belyavskiy 8f4d19
-sk-ssh-ed25519@openssh.com,
Dmitry Belyavskiy 8f4d19
-sk-ecdsa-sha2-nistp256@openssh.com,
Dmitry Belyavskiy f32b84
-rsa-sha2-512,rsa-sha2-256
Jakub Jelen 51f5c1
-.Ed
Jakub Jelen 51f5c1
-.Pp
Dmitry Belyavskiy 8f4d19
 If the specified list begins with a
Dmitry Belyavskiy 8f4d19
 .Sq +
Dmitry Belyavskiy 8f4d19
 character, then the specified algorithms will be appended to the default set
Norbert Pocs 2b67ec
@@ -525,20 +521,25 @@
Jakub Jelen a84805
 indicating not to
Jakub Jelen a84805
 .Xr chroot 2 .
Jakub Jelen a84805
 .It Cm Ciphers
Jakub Jelen 51f5c1
+The default is handled system-wide by
Jakub Jelen 51f5c1
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen 51f5c1
+.Xr update-crypto-policies 8 .
Jakub Jelen 51f5c1
+.Pp
Jakub Jelen a84805
 Specifies the ciphers allowed.
Jakub Jelen a84805
 Multiple ciphers must be comma-separated.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq +
Jakub Jelen a84805
-character, then the specified ciphers will be appended to the default set
Jakub Jelen 9c8896
-instead of replacing them.
Jakub Jelen 9c8896
+character, then the specified ciphers will be appended to the built-in
Jakub Jelen 9c8896
+openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq -
Jakub Jelen a84805
 character, then the specified ciphers (including wildcards) will be removed
Jakub Jelen a84805
-from the default set instead of replacing them.
Jakub Jelen 9c8896
+from the built-in openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq ^
Jakub Jelen a84805
 character, then the specified ciphers will be placed at the head of the
Jakub Jelen a84805
-default set.
Jakub Jelen 9c8896
+built-in openssh default set.
Jakub Jelen a84805
 .Pp
Jakub Jelen a84805
 The supported ciphers are:
Jakub Jelen a84805
 .Pp
Norbert Pocs 2b67ec
@@ -565,13 +566,6 @@
Jakub Jelen 6caa97
 chacha20-poly1305@openssh.com
Jakub Jelen 6caa97
 .El
Jakub Jelen 6caa97
 .Pp
Jakub Jelen 6caa97
-The default is:
Jakub Jelen 6caa97
-.Bd -literal -offset indent
Jakub Jelen 6caa97
-chacha20-poly1305@openssh.com,
Jakub Jelen 6caa97
-aes128-ctr,aes192-ctr,aes256-ctr,
Jakub Jelen 6caa97
-aes128-gcm@openssh.com,aes256-gcm@openssh.com
Jakub Jelen 6caa97
-.Ed
Jakub Jelen a84805
-.Pp
Jakub Jelen a84805
 The list of available ciphers may also be obtained using
Jakub Jelen a84805
 .Qq ssh -Q cipher .
Jakub Jelen a84805
 .It Cm ClientAliveCountMax
Norbert Pocs 2b67ec
@@ -766,53 +760,43 @@
Jakub Jelen a84805
 .Cm GSSAPIKeyExchange
Jakub Jelen a84805
 needs to be enabled in the server and also used by the client.
Jakub Jelen a84805
 .It Cm GSSAPIKexAlgorithms
Jakub Jelen 6caa97
+The default is handled system-wide by
Jakub Jelen 6caa97
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen 6caa97
+.Xr update-crypto-policies 8 .
Jakub Jelen a84805
+.Pp
Jakub Jelen a84805
 The list of key exchange algorithms that are accepted by GSSAPI
Jakub Jelen a84805
 key exchange. Possible values are
Jakub Jelen a84805
 .Bd -literal -offset 3n
Jakub Jelen a84805
-gss-gex-sha1-,
Jakub Jelen a84805
-gss-group1-sha1-,
Jakub Jelen a84805
-gss-group14-sha1-,
Jakub Jelen a84805
-gss-group14-sha256-,
Jakub Jelen a84805
-gss-group16-sha512-,
Jakub Jelen a84805
-gss-nistp256-sha256-,
Jakub Jelen a84805
+gss-gex-sha1-
Jakub Jelen a84805
+gss-group1-sha1-
Jakub Jelen a84805
+gss-group14-sha1-
Jakub Jelen a84805
+gss-group14-sha256-
Jakub Jelen a84805
+gss-group16-sha512-
Jakub Jelen a84805
+gss-nistp256-sha256-
Jakub Jelen 6caa97
 gss-curve25519-sha256-
Jakub Jelen 6caa97
 .Ed
Jakub Jelen a84805
-.Pp
Jakub Jelen 6caa97
-The default is
Jakub Jelen 1cc7c8
-.Dq gss-group14-sha256-,gss-group16-sha512-,gss-nistp256-sha256-,
Jakub Jelen 1cc7c8
-gss-curve25519-sha256-,gss-group14-sha1-,gss-gex-sha1- .
Jakub Jelen 1cc7c8
 This option only applies to connections using GSSAPI.
Jakub Jelen 25c16c
 .It Cm HostbasedAcceptedAlgorithms
Alexander Sosedkin 42b22d
+The default is handled system-wide by
Alexander Sosedkin 42b22d
+.Xr crypto-policies 7 .
Alexander Sosedkin 42b22d
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Alexander Sosedkin 42b22d
+.Xr update-crypto-policies 8 .
Alexander Sosedkin 42b22d
+.Pp
Jakub Jelen 25c16c
 Specifies the signature algorithms that will be accepted for hostbased
Alexander Sosedkin 42b22d
 authentication as a list of comma-separated patterns.
Alexander Sosedkin 42b22d
 Alternately if the specified list begins with a
Alexander Sosedkin 42b22d
 .Sq +
Alexander Sosedkin 42b22d
 character, then the specified signature algorithms will be appended to
Alexander Sosedkin 42b22d
-the default set instead of replacing them.
Alexander Sosedkin 42b22d
+the built-in openssh default set instead of replacing them.
Alexander Sosedkin 42b22d
 If the specified list begins with a
Alexander Sosedkin 42b22d
 .Sq -
Alexander Sosedkin 42b22d
 character, then the specified signature algorithms (including wildcards)
Alexander Sosedkin 42b22d
-will be removed from the default set instead of replacing them.
Alexander Sosedkin 42b22d
+will be removed from the built-in openssh default set instead of replacing them.
Alexander Sosedkin 42b22d
 If the specified list begins with a
Alexander Sosedkin 42b22d
 .Sq ^
Alexander Sosedkin 42b22d
 character, then the specified signature algorithms will be placed at
Alexander Sosedkin 42b22d
-the head of the default set.
Alexander Sosedkin 42b22d
-The default for this option is:
Alexander Sosedkin 42b22d
-.Bd -literal -offset 3n
Alexander Sosedkin 42b22d
-ssh-ed25519-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-ecdsa-sha2-nistp256-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-ecdsa-sha2-nistp384-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-ecdsa-sha2-nistp521-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-sk-ssh-ed25519-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-rsa-sha2-512-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-rsa-sha2-256-cert-v01@openssh.com,
Alexander Sosedkin 42b22d
-ssh-ed25519,
Alexander Sosedkin 42b22d
-ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
Alexander Sosedkin 42b22d
-sk-ssh-ed25519@openssh.com,
Alexander Sosedkin 42b22d
-sk-ecdsa-sha2-nistp256@openssh.com,
Alexander Sosedkin 42b22d
-rsa-sha2-512,rsa-sha2-256
Alexander Sosedkin 42b22d
-.Ed
Alexander Sosedkin 42b22d
+the head of the built-in openssh default set.
Alexander Sosedkin 42b22d
 .Pp
Alexander Sosedkin 42b22d
 The list of available signature algorithms may also be obtained using
Alexander Sosedkin 42b22d
 .Qq ssh -Q HostbasedAcceptedAlgorithms .
Norbert Pocs 2b67ec
@@ -879,25 +863,14 @@
Jakub Jelen a84805
 .Ev SSH_AUTH_SOCK
Jakub Jelen a84805
 environment variable.
Jakub Jelen 6caa97
 .It Cm HostKeyAlgorithms
Jakub Jelen a84805
+The default is handled system-wide by
Jakub Jelen a84805
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen a84805
+.Xr update-crypto-policies 8 .
Jakub Jelen a84805
+.Pp
Jakub Jelen 25c16c
 Specifies the host key signature algorithms
Jakub Jelen 6caa97
 that the server offers.
Dmitry Belyavskiy 03150f
 The default for this option is:
Jakub Jelen 6caa97
-.Bd -literal -offset 3n
Jakub Jelen 25c16c
-ssh-ed25519-cert-v01@openssh.com,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp256-cert-v01@openssh.com,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp384-cert-v01@openssh.com,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp521-cert-v01@openssh.com,
Jakub Jelen 51f5c1
-sk-ssh-ed25519-cert-v01@openssh.com,
Jakub Jelen 25c16c
-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
Jakub Jelen 51f5c1
-rsa-sha2-512-cert-v01@openssh.com,
Jakub Jelen 51f5c1
-rsa-sha2-256-cert-v01@openssh.com,
Jakub Jelen 25c16c
-ssh-ed25519,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
Jakub Jelen 25c16c
-sk-ssh-ed25519@openssh.com,
Jakub Jelen 51f5c1
-sk-ecdsa-sha2-nistp256@openssh.com,
Dmitry Belyavskiy 03150f
-rsa-sha2-512,rsa-sha2-256
Jakub Jelen 6caa97
-.Ed
Jakub Jelen a84805
-.Pp
Jakub Jelen 25c16c
 The list of available signature algorithms may also be obtained using
Jakub Jelen a84805
 .Qq ssh -Q HostKeyAlgorithms .
Jakub Jelen a84805
 .It Cm IgnoreRhosts
Norbert Pocs 2b67ec
@@ -1044,20 +1017,25 @@
Jakub Jelen a84805
 The default is
Jakub Jelen a84805
 .Cm yes .
Jakub Jelen a84805
 .It Cm KexAlgorithms
Jakub Jelen 6caa97
+The default is handled system-wide by
Jakub Jelen 6caa97
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen 6caa97
+.Xr update-crypto-policies 8 .
Jakub Jelen a84805
+.Pp
Jakub Jelen a84805
 Specifies the available KEX (Key Exchange) algorithms.
Jakub Jelen a84805
 Multiple algorithms must be comma-separated.
Jakub Jelen a84805
 Alternately if the specified list begins with a
Jakub Jelen a84805
 .Sq +
Dmitry Belyavskiy 7b76af
-character, then the specified algorithms will be appended to the default set
Jakub Jelen 9c8896
-instead of replacing them.
Dmitry Belyavskiy 9fd698
+character, then the specified methods will be appended to the built-in
Jakub Jelen 9c8896
+openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq -
Dmitry Belyavskiy 7b76af
 character, then the specified algorithms (including wildcards) will be removed
Jakub Jelen a84805
-from the default set instead of replacing them.
Jakub Jelen 9c8896
+from the built-in openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq ^
Dmitry Belyavskiy 7b76af
 character, then the specified algorithms will be placed at the head of the
Jakub Jelen a84805
-default set.
Jakub Jelen 9c8896
+built-in openssh default set.
Jakub Jelen a84805
 The supported algorithms are:
Jakub Jelen 6caa97
 .Pp
Jakub Jelen a84805
 .Bl -item -compact -offset indent
Norbert Pocs 2b67ec
@@ -1089,16 +1067,6 @@
Jakub Jelen 25c16c
 sntrup761x25519-sha512@openssh.com
Jakub Jelen 6caa97
 .El
Jakub Jelen 6caa97
 .Pp
Jakub Jelen 6caa97
-The default is:
Jakub Jelen 6caa97
-.Bd -literal -offset indent
Dmitry Belyavskiy 03150f
-sntrup761x25519-sha512@openssh.com,
Jakub Jelen 6caa97
-curve25519-sha256,curve25519-sha256@libssh.org,
Jakub Jelen 6caa97
-ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
Jakub Jelen 6caa97
-diffie-hellman-group-exchange-sha256,
Jakub Jelen 6caa97
-diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,
Jakub Jelen 51f5c1
-diffie-hellman-group14-sha256
Jakub Jelen 6caa97
-.Ed
Jakub Jelen a84805
-.Pp
Jakub Jelen a84805
 The list of available key exchange algorithms may also be obtained using
Jakub Jelen a84805
 .Qq ssh -Q KexAlgorithms .
Jakub Jelen a84805
 .It Cm ListenAddress
Norbert Pocs 2b67ec
@@ -1184,21 +1152,26 @@
Jakub Jelen 25c16c
 file.
Jakub Jelen 25c16c
 This option is intended for debugging and no overrides are enabled by default.
Jakub Jelen a84805
 .It Cm MACs
Jakub Jelen 6caa97
+The default is handled system-wide by
Jakub Jelen 6caa97
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen 6caa97
+.Xr update-crypto-policies 8 .
Jakub Jelen a84805
+.Pp
Jakub Jelen a84805
 Specifies the available MAC (message authentication code) algorithms.
Jakub Jelen a84805
 The MAC algorithm is used for data integrity protection.
Jakub Jelen a84805
 Multiple algorithms must be comma-separated.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq +
Jakub Jelen a84805
-character, then the specified algorithms will be appended to the default set
Jakub Jelen 9c8896
-instead of replacing them.
Jakub Jelen 9c8896
+character, then the specified algorithms will be appended to the built-in
Jakub Jelen 9c8896
+openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq -
Jakub Jelen a84805
 character, then the specified algorithms (including wildcards) will be removed
Jakub Jelen a84805
-from the default set instead of replacing them.
Jakub Jelen 9c8896
+from the built-in openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq ^
Jakub Jelen a84805
 character, then the specified algorithms will be placed at the head of the
Jakub Jelen a84805
-default set.
Jakub Jelen 9c8896
+built-in openssh default set.
Jakub Jelen 6caa97
 .Pp
Jakub Jelen a84805
 The algorithms that contain
Jakub Jelen a84805
 .Qq -etm
Norbert Pocs 2b67ec
@@ -1241,15 +1214,6 @@
Jakub Jelen 6caa97
 umac-128-etm@openssh.com
Jakub Jelen 6caa97
 .El
Jakub Jelen 6caa97
 .Pp
Jakub Jelen 6caa97
-The default is:
Jakub Jelen 6caa97
-.Bd -literal -offset indent
Jakub Jelen 6caa97
-umac-64-etm@openssh.com,umac-128-etm@openssh.com,
Jakub Jelen 6caa97
-hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,
Jakub Jelen 6caa97
-hmac-sha1-etm@openssh.com,
Jakub Jelen 6caa97
-umac-64@openssh.com,umac-128@openssh.com,
Jakub Jelen 6caa97
-hmac-sha2-256,hmac-sha2-512,hmac-sha1
Jakub Jelen 6caa97
-.Ed
Jakub Jelen a84805
-.Pp
Jakub Jelen a84805
 The list of available MAC algorithms may also be obtained using
Jakub Jelen a84805
 .Qq ssh -Q mac .
Jakub Jelen a84805
 .It Cm Match
Norbert Pocs 2b67ec
@@ -1633,36 +1597,25 @@
Jakub Jelen a84805
 The default is
Jakub Jelen a84805
 .Cm yes .
Jakub Jelen 25c16c
 .It Cm PubkeyAcceptedAlgorithms
Jakub Jelen 6caa97
+The default is handled system-wide by
Jakub Jelen 6caa97
+.Xr crypto-policies 7 .
Dmitry Belyavskiy 9fd698
+Information about defaults, how to modify the defaults and how to customize existing policies with sub-policies are present in manual page
Jakub Jelen 6caa97
+.Xr update-crypto-policies 8 .
Jakub Jelen a84805
+.Pp
Jakub Jelen 25c16c
 Specifies the signature algorithms that will be accepted for public key
Jakub Jelen 25c16c
 authentication as a list of comma-separated patterns.
Jakub Jelen a84805
 Alternately if the specified list begins with a
Jakub Jelen a84805
 .Sq +
Jakub Jelen 25c16c
-character, then the specified algorithms will be appended to the default set
Jakub Jelen 9c8896
-instead of replacing them.
Jakub Jelen 25c16c
+character, then the specified algorithms will be appended to the built-in
Jakub Jelen 9c8896
+openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen a84805
 .Sq -
Jakub Jelen 25c16c
 character, then the specified algorithms (including wildcards) will be removed
Jakub Jelen a84805
-from the default set instead of replacing them.
Jakub Jelen 9c8896
+from the built-in openssh default set instead of replacing them.
Jakub Jelen a84805
 If the specified list begins with a
Jakub Jelen 36fef5
 .Sq ^
Jakub Jelen 25c16c
 character, then the specified algorithms will be placed at the head of the
Jakub Jelen a84805
-default set.
Jakub Jelen 6caa97
-The default for this option is:
Jakub Jelen 6caa97
-.Bd -literal -offset 3n
Jakub Jelen 25c16c
-ssh-ed25519-cert-v01@openssh.com,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp256-cert-v01@openssh.com,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp384-cert-v01@openssh.com,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp521-cert-v01@openssh.com,
Jakub Jelen 51f5c1
-sk-ssh-ed25519-cert-v01@openssh.com,
Jakub Jelen 25c16c
-sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
Jakub Jelen 51f5c1
-rsa-sha2-512-cert-v01@openssh.com,
Jakub Jelen 51f5c1
-rsa-sha2-256-cert-v01@openssh.com,
Jakub Jelen 25c16c
-ssh-ed25519,
Jakub Jelen 6caa97
-ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
Jakub Jelen 25c16c
-sk-ssh-ed25519@openssh.com,
Jakub Jelen 51f5c1
-sk-ecdsa-sha2-nistp256@openssh.com,
Dmitry Belyavskiy 03150f
-rsa-sha2-512,rsa-sha2-256
Jakub Jelen 6caa97
-.Ed
Jakub Jelen 9c8896
+built-in openssh default set.
Jakub Jelen 6caa97
 .Pp
Jakub Jelen 25c16c
 The list of available signature algorithms may also be obtained using
Jakub Jelen 25c16c
 .Qq ssh -Q PubkeyAcceptedAlgorithms .
Norbert Pocs 2b67ec
@@ -2131,7 +2084,9 @@
Alexander Sosedkin 42b22d
 .El
Alexander Sosedkin 42b22d
 .Sh SEE ALSO
Alexander Sosedkin 42b22d
 .Xr sftp-server 8 ,
Alexander Sosedkin 42b22d
-.Xr sshd 8
Alexander Sosedkin 42b22d
+.Xr sshd 8 ,
Alexander Sosedkin 42b22d
+.Xr crypto-policies 7 ,
Alexander Sosedkin 42b22d
+.Xr update-crypto-policies 8
Alexander Sosedkin 42b22d
 .Sh AUTHORS
Alexander Sosedkin 42b22d
 .An -nosplit
Alexander Sosedkin 42b22d
 OpenSSH is a derivative of the original and free