6caa97
diff -up openssh-8.0p1/ssh_config.5.crypto-policies openssh-8.0p1/ssh_config.5
6caa97
--- openssh-8.0p1/ssh_config.5.crypto-policies	2019-05-13 14:04:01.999099570 +0200
6caa97
+++ openssh-8.0p1/ssh_config.5	2019-05-13 14:12:36.343923071 +0200
6caa97
@@ -445,12 +445,10 @@ aes256-gcm@openssh.com
6caa97
 chacha20-poly1305@openssh.com
6caa97
 .Ed
6caa97
 .Pp
6caa97
-The default is:
6caa97
-.Bd -literal -offset indent
6caa97
-chacha20-poly1305@openssh.com,
6caa97
-aes128-ctr,aes192-ctr,aes256-ctr,
6caa97
-aes128-gcm@openssh.com,aes256-gcm@openssh.com
6caa97
-.Ed
6caa97
+The default is handled system-wide by
6caa97
+.Xr crypto-policies 7 .
fdbd5b
+To see the defaults and how to modify this default, see manual page
6caa97
+.Xr update-crypto-policies 8 .
6caa97
 .Pp
6caa97
 The list of available ciphers may also be obtained using
6caa97
 .Qq ssh -Q cipher .
6caa97
@@ -812,8 +810,10 @@ gss-nistp256-sha256-,
6caa97
 gss-curve25519-sha256-
6caa97
 .Ed
6caa97
 .Pp
6caa97
-The default is
6caa97
-.Dq gss-gex-sha1-,gss-group14-sha1- .
6caa97
+The default is handled system-wide by
6caa97
+.Xr crypto-policies 7 .
fdbd5b
+To see the defaults and how to modify this default, see manual page
6caa97
+.Xr update-crypto-policies 8 .
6caa97
 This option only applies to protocol version 2 connections using GSSAPI.
6caa97
 .It Cm HashKnownHosts
6caa97
 Indicates that
6caa97
@@ -1123,16 +1123,10 @@ If the specified value begins with a
6caa97
 .Sq -
6caa97
 character, then the specified methods (including wildcards) will be removed
6caa97
 from the default set instead of replacing them.
6caa97
-The default is:
6caa97
-.Bd -literal -offset indent
6caa97
-curve25519-sha256,curve25519-sha256@libssh.org,
6caa97
-ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
6caa97
-diffie-hellman-group-exchange-sha256,
6caa97
-diffie-hellman-group16-sha512,
6caa97
-diffie-hellman-group18-sha512,
6caa97
-diffie-hellman-group14-sha256,
6caa97
-diffie-hellman-group14-sha1
6caa97
-.Ed
6caa97
+The default is handled system-wide by
6caa97
+.Xr crypto-policies 7 .
fdbd5b
+To see the defaults and how to modify this default, see manual page
6caa97
+.Xr update-crypto-policies 8 .
6caa97
 .Pp
6caa97
 The list of available key exchange algorithms may also be obtained using
6caa97
 .Qq ssh -Q kex .
6caa97
@@ -1210,14 +1204,10 @@ The algorithms that contain
6caa97
 calculate the MAC after encryption (encrypt-then-mac).
6caa97
 These are considered safer and their use recommended.
6caa97
 .Pp
6caa97
-The default is:
6caa97
-.Bd -literal -offset indent
6caa97
-umac-64-etm@openssh.com,umac-128-etm@openssh.com,
6caa97
-hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,
6caa97
-hmac-sha1-etm@openssh.com,
6caa97
-umac-64@openssh.com,umac-128@openssh.com,
6caa97
-hmac-sha2-256,hmac-sha2-512,hmac-sha1
6caa97
-.Ed
6caa97
+The default is handled system-wide by
6caa97
+.Xr crypto-policies 7 .
fdbd5b
+To see the defaults and how to modify this default, see manual page
6caa97
+.Xr update-crypto-policies 8 .
6caa97
 .Pp
6caa97
 The list of available MAC algorithms may also be obtained using
6caa97
 .Qq ssh -Q mac .
6caa97
@@ -1361,17 +1351,10 @@ If the specified value begins with a
6caa97
 .Sq -
6caa97
 character, then the specified key types (including wildcards) will be removed
6caa97
 from the default set instead of replacing them.
6caa97
-The default for this option is:
6caa97
-.Bd -literal -offset 3n
6caa97
-ecdsa-sha2-nistp256-cert-v01@openssh.com,
6caa97
-ecdsa-sha2-nistp384-cert-v01@openssh.com,
6caa97
-ecdsa-sha2-nistp521-cert-v01@openssh.com,
6caa97
-ssh-ed25519-cert-v01@openssh.com,
6caa97
-rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,
6caa97
-ssh-rsa-cert-v01@openssh.com,
6caa97
-ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
6caa97
-ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
6caa97
-.Ed
6caa97
+The default is handled system-wide by
6caa97
+.Xr crypto-policies 7 .
fdbd5b
+To see the defaults and how to modify this default, see manual page
6caa97
+.Xr update-crypto-policies 8 .
6caa97
 .Pp
6caa97
 The list of available key types may also be obtained using
6caa97
 .Qq ssh -Q key .
6caa97
diff -up openssh-8.0p1/sshd_config.5.crypto-policies openssh-8.0p1/sshd_config.5
6caa97
--- openssh-8.0p1/sshd_config.5.crypto-policies	2019-05-13 14:12:41.226968863 +0200
6caa97
+++ openssh-8.0p1/sshd_config.5	2019-05-13 14:15:14.581406997 +0200
6caa97
@@ -490,12 +490,10 @@ aes256-gcm@openssh.com
6caa97
 chacha20-poly1305@openssh.com
6caa97
 .El
6caa97
 .Pp
6caa97
-The default is:
6caa97
-.Bd -literal -offset indent
6caa97
-chacha20-poly1305@openssh.com,
6caa97
-aes128-ctr,aes192-ctr,aes256-ctr,
6caa97
-aes128-gcm@openssh.com,aes256-gcm@openssh.com
6caa97
-.Ed
6caa97
+The default is handled system-wide by
6caa97
+.Xr crypto-policies 7 .
fdbd5b
+To see the defaults and how to modify this default, see manual page
6caa97
+.Xr update-crypto-policies 8 .
6caa97
 .Pp
6caa97
 The list of available ciphers may also be obtained using
6caa97
 .Qq ssh -Q cipher .
6caa97
@@ -700,8 +698,10 @@ gss-nistp256-sha256-,
6caa97
 gss-curve25519-sha256-
6caa97
 .Ed
6caa97
 .Pp
6caa97
-The default is
6caa97
-.Dq gss-gex-sha1-,gss-group14-sha1- .
6caa97
+The default is handled system-wide by
6caa97
+.Xr crypto-policies 7 .
fdbd5b
+To see the defaults and how to modify this default, see manual page
6caa97
+.Xr update-crypto-policies 8 .
6caa97
 This option only applies to protocol version 2 connections using GSSAPI.
6caa97
 .It Cm HostbasedAcceptedKeyTypes
6caa97
 Specifies the key types that will be accepted for hostbased authentication
6caa97
@@ -792,17 +792,10 @@ environment variable.
6caa97
 .It Cm HostKeyAlgorithms
6caa97
 Specifies the host key algorithms
6caa97
 that the server offers.
6caa97
-The default for this option is:
6caa97
-.Bd -literal -offset 3n
6caa97
-ecdsa-sha2-nistp256-cert-v01@openssh.com,
6caa97
-ecdsa-sha2-nistp384-cert-v01@openssh.com,
6caa97
-ecdsa-sha2-nistp521-cert-v01@openssh.com,
6caa97
-ssh-ed25519-cert-v01@openssh.com,
6caa97
-rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,
6caa97
-ssh-rsa-cert-v01@openssh.com,
6caa97
-ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
6caa97
-ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
6caa97
-.Ed
6caa97
+The default is handled system-wide by
6caa97
+.Xr crypto-policies 7 .
fdbd5b
+To see the defaults and how to modify this default, see manual page
6caa97
+.Xr update-crypto-policies 8 .
6caa97
 .Pp
6caa97
 The list of available key types may also be obtained using
6caa97
 .Qq ssh -Q key .
6caa97
@@ -960,14 +953,10 @@ ecdh-sha2-nistp384
6caa97
 ecdh-sha2-nistp521
6caa97
 .El
6caa97
 .Pp
6caa97
-The default is:
6caa97
-.Bd -literal -offset indent
6caa97
-curve25519-sha256,curve25519-sha256@libssh.org,
6caa97
-ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
6caa97
-diffie-hellman-group-exchange-sha256,
6caa97
-diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,
6caa97
-diffie-hellman-group14-sha256,diffie-hellman-group14-sha1
6caa97
-.Ed
6caa97
+The default is handled system-wide by
6caa97
+.Xr crypto-policies 7 .
fdbd5b
+To see the defaults and how to modify this default, see manual page
6caa97
+.Xr update-crypto-policies 8 .
6caa97
 .Pp
6caa97
 The list of available key exchange algorithms may also be obtained using
6caa97
 .Qq ssh -Q kex .
6caa97
@@ -1090,14 +1079,10 @@ umac-64-etm@openssh.com
6caa97
 umac-128-etm@openssh.com
6caa97
 .El
6caa97
 .Pp
6caa97
-The default is:
6caa97
-.Bd -literal -offset indent
6caa97
-umac-64-etm@openssh.com,umac-128-etm@openssh.com,
6caa97
-hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,
6caa97
-hmac-sha1-etm@openssh.com,
6caa97
-umac-64@openssh.com,umac-128@openssh.com,
6caa97
-hmac-sha2-256,hmac-sha2-512,hmac-sha1
6caa97
-.Ed
6caa97
+The default is handled system-wide by
6caa97
+.Xr crypto-policies 7 .
fdbd5b
+To see the defaults and how to modify this default, see manual page
6caa97
+.Xr update-crypto-policies 8 .
6caa97
 .Pp
6caa97
 The list of available MAC algorithms may also be obtained using
6caa97
 .Qq ssh -Q mac .
6caa97
@@ -1455,17 +1440,10 @@ If the specified value begins with a
6caa97
 .Sq -
6caa97
 character, then the specified key types (including wildcards) will be removed
6caa97
 from the default set instead of replacing them.
6caa97
-The default for this option is:
6caa97
-.Bd -literal -offset 3n
6caa97
-ecdsa-sha2-nistp256-cert-v01@openssh.com,
6caa97
-ecdsa-sha2-nistp384-cert-v01@openssh.com,
6caa97
-ecdsa-sha2-nistp521-cert-v01@openssh.com,
6caa97
-ssh-ed25519-cert-v01@openssh.com,
6caa97
-rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,
6caa97
-ssh-rsa-cert-v01@openssh.com,
6caa97
-ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
6caa97
-ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
6caa97
-.Ed
6caa97
+The default is handled system-wide by
6caa97
+.Xr crypto-policies 7 .
fdbd5b
+To see the defaults and how to modify this default, see manual page
6caa97
+.Xr update-crypto-policies 8 .
6caa97
 .Pp
6caa97
 The list of available key types may also be obtained using
6caa97
 .Qq ssh -Q key .