jonathancammack / rpms / openssh

Forked from rpms/openssh 8 months ago
Clone

Blame SOURCES/openssh-8.0p1-crypto-policies.patch

aedd00
diff -up openssh-8.0p1/ssh_config.5.crypto-policies openssh-8.0p1/ssh_config.5
aedd00
--- openssh-8.0p1/ssh_config.5.crypto-policies	2020-03-24 17:32:54.821789205 +0100
aedd00
+++ openssh-8.0p1/ssh_config.5	2020-03-24 17:59:58.174122920 +0100
aedd00
@@ -357,17 +357,17 @@ or
aedd00
 .Qq *.c.example.com
aedd00
 domains.
aedd00
 .It Cm CASignatureAlgorithms
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 Specifies which algorithms are allowed for signing of certificates
aedd00
 by certificate authorities (CAs).
aedd00
-The default is:
aedd00
-.Bd -literal -offset indent
aedd00
-ecdsa-sha2-nistp256.ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
aedd00
-ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
aedd00
-.Ed
aedd00
-.Pp
aedd00
 .Xr ssh 1
aedd00
 will not accept host certificates signed using algorithms other than those
aedd00
 specified.
aedd00
+.Pp
aedd00
 .It Cm CertificateFile
aedd00
 Specifies a file from which the user's certificate is read.
aedd00
 A corresponding private key must be provided separately in order
aedd00
@@ -420,16 +420,21 @@ If the option is set to
aedd00
 .Cm no ,
aedd00
 the check will not be executed.
aedd00
 .It Cm Ciphers
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 Specifies the ciphers allowed and their order of preference.
aedd00
 Multiple ciphers must be comma-separated.
aedd00
 If the specified value begins with a
aedd00
 .Sq +
aedd00
-character, then the specified ciphers will be appended to the default set
aedd00
+character, then the specified ciphers will be appended to the built-in default set
aedd00
 instead of replacing them.
aedd00
 If the specified value begins with a
aedd00
 .Sq -
aedd00
 character, then the specified ciphers (including wildcards) will be removed
aedd00
-from the default set instead of replacing them.
aedd00
+from the built-in default set instead of replacing them.
aedd00
 .Pp
aedd00
 The supported ciphers are:
aedd00
 .Bd -literal -offset indent
aedd00
@@ -445,13 +450,6 @@ aes256-gcm@openssh.com
aedd00
 chacha20-poly1305@openssh.com
aedd00
 .Ed
aedd00
 .Pp
aedd00
-The default is:
aedd00
-.Bd -literal -offset indent
aedd00
-chacha20-poly1305@openssh.com,
aedd00
-aes128-ctr,aes192-ctr,aes256-ctr,
aedd00
-aes128-gcm@openssh.com,aes256-gcm@openssh.com
aedd00
-.Ed
aedd00
-.Pp
aedd00
 The list of available ciphers may also be obtained using
aedd00
 .Qq ssh -Q cipher .
aedd00
 .It Cm ClearAllForwardings
aedd00
@@ -800,6 +798,11 @@ command line will be passed untouched to
aedd00
 The default is
aedd00
 .Dq no .
aedd00
 .It Cm GSSAPIKexAlgorithms
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 The list of key exchange algorithms that are offered for GSSAPI
aedd00
 key exchange. Possible values are
aedd00
 .Bd -literal -offset 3n
aedd00
@@ -812,9 +815,8 @@ gss-nistp256-sha256-,
aedd00
 gss-curve25519-sha256-
aedd00
 .Ed
aedd00
 .Pp
aedd00
-The default is
aedd00
-.Dq gss-group14-sha256-,gss-group16-sha512-,gss-nistp256-sha256-,gss-curve25519-sha256-,gss-group14-sha1-,gss-gex-sha1- .
aedd00
 This option only applies to connections using GSSAPI.
aedd00
+.Pp
aedd00
 .It Cm HashKnownHosts
aedd00
 Indicates that
aedd00
 .Xr ssh 1
aedd00
@@ -1114,26 +1115,21 @@ it may be zero or more of:
aedd00
 and
aedd00
 .Cm pam .
aedd00
 .It Cm KexAlgorithms
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 Specifies the available KEX (Key Exchange) algorithms.
aedd00
 Multiple algorithms must be comma-separated.
aedd00
 Alternately if the specified value begins with a
aedd00
 .Sq +
aedd00
-character, then the specified methods will be appended to the default set
aedd00
+character, then the specified methods will be appended to the built-in default set
aedd00
 instead of replacing them.
aedd00
 If the specified value begins with a
aedd00
 .Sq -
aedd00
 character, then the specified methods (including wildcards) will be removed
aedd00
-from the default set instead of replacing them.
aedd00
-The default is:
aedd00
-.Bd -literal -offset indent
aedd00
-curve25519-sha256,curve25519-sha256@libssh.org,
aedd00
-ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
aedd00
-diffie-hellman-group-exchange-sha256,
aedd00
-diffie-hellman-group16-sha512,
aedd00
-diffie-hellman-group18-sha512,
aedd00
-diffie-hellman-group14-sha256,
aedd00
-diffie-hellman-group14-sha1
aedd00
-.Ed
aedd00
+from the built-in default set instead of replacing them.
aedd00
 .Pp
aedd00
 The list of available key exchange algorithms may also be obtained using
aedd00
 .Qq ssh -Q kex .
aedd00
@@ -1193,33 +1189,29 @@ The default is INFO.
aedd00
 DEBUG and DEBUG1 are equivalent.
aedd00
 DEBUG2 and DEBUG3 each specify higher levels of verbose output.
aedd00
 .It Cm MACs
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 Specifies the MAC (message authentication code) algorithms
aedd00
 in order of preference.
aedd00
 The MAC algorithm is used for data integrity protection.
aedd00
 Multiple algorithms must be comma-separated.
aedd00
 If the specified value begins with a
aedd00
 .Sq +
aedd00
-character, then the specified algorithms will be appended to the default set
aedd00
+character, then the specified algorithms will be appended to the built-in default set
aedd00
 instead of replacing them.
aedd00
 If the specified value begins with a
aedd00
 .Sq -
aedd00
 character, then the specified algorithms (including wildcards) will be removed
aedd00
-from the default set instead of replacing them.
aedd00
+from the built-in default set instead of replacing them.
aedd00
 .Pp
aedd00
 The algorithms that contain
aedd00
 .Qq -etm
aedd00
 calculate the MAC after encryption (encrypt-then-mac).
aedd00
 These are considered safer and their use recommended.
aedd00
 .Pp
aedd00
-The default is:
aedd00
-.Bd -literal -offset indent
aedd00
-umac-64-etm@openssh.com,umac-128-etm@openssh.com,
aedd00
-hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,
aedd00
-hmac-sha1-etm@openssh.com,
aedd00
-umac-64@openssh.com,umac-128@openssh.com,
aedd00
-hmac-sha2-256,hmac-sha2-512,hmac-sha1
aedd00
-.Ed
aedd00
-.Pp
aedd00
 The list of available MAC algorithms may also be obtained using
aedd00
 .Qq ssh -Q mac .
aedd00
 .It Cm NoHostAuthenticationForLocalhost
aedd00
@@ -1352,27 +1344,21 @@ instead of continuing to execute and pas
aedd00
 The default is
aedd00
 .Cm no .
aedd00
 .It Cm PubkeyAcceptedKeyTypes
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 Specifies the key types that will be used for public key authentication
aedd00
 as a comma-separated list of patterns.
aedd00
 Alternately if the specified value begins with a
aedd00
 .Sq +
aedd00
-character, then the key types after it will be appended to the default
aedd00
+character, then the key types after it will be appended to the built-in default
aedd00
 instead of replacing it.
aedd00
 If the specified value begins with a
aedd00
 .Sq -
aedd00
 character, then the specified key types (including wildcards) will be removed
aedd00
-from the default set instead of replacing them.
aedd00
-The default for this option is:
aedd00
-.Bd -literal -offset 3n
aedd00
-ecdsa-sha2-nistp256-cert-v01@openssh.com,
aedd00
-ecdsa-sha2-nistp384-cert-v01@openssh.com,
aedd00
-ecdsa-sha2-nistp521-cert-v01@openssh.com,
aedd00
-ssh-ed25519-cert-v01@openssh.com,
aedd00
-rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,
aedd00
-ssh-rsa-cert-v01@openssh.com,
aedd00
-ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
aedd00
-ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
aedd00
-.Ed
aedd00
+from the built-in default set instead of replacing them.
aedd00
 .Pp
aedd00
 The list of available key types may also be obtained using
aedd00
 .Qq ssh -Q key .
aedd00
diff -up openssh-8.0p1/sshd_config.5.crypto-policies openssh-8.0p1/sshd_config.5
aedd00
--- openssh-8.0p1/sshd_config.5.crypto-policies	2020-03-24 17:32:54.802788908 +0100
aedd00
+++ openssh-8.0p1/sshd_config.5	2020-03-24 17:54:13.347740176 +0100
aedd00
@@ -383,16 +383,16 @@ If the argument is
aedd00
 then no banner is displayed.
aedd00
 By default, no banner is displayed.
aedd00
 .It Cm CASignatureAlgorithms
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 Specifies which algorithms are allowed for signing of certificates
aedd00
 by certificate authorities (CAs).
aedd00
-The default is:
aedd00
-.Bd -literal -offset indent
aedd00
-ecdsa-sha2-nistp256.ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
aedd00
-ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
aedd00
-.Ed
aedd00
-.Pp
aedd00
 Certificates signed using other algorithms will not be accepted for
aedd00
 public key or host-based authentication.
aedd00
+.Pp
aedd00
 .It Cm ChallengeResponseAuthentication
aedd00
 Specifies whether challenge-response authentication is allowed (e.g. via
aedd00
 PAM or through authentication styles supported in
aedd00
@@ -454,16 +454,21 @@ The default is
aedd00
 indicating not to
aedd00
 .Xr chroot 2 .
aedd00
 .It Cm Ciphers
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 Specifies the ciphers allowed.
aedd00
 Multiple ciphers must be comma-separated.
aedd00
 If the specified value begins with a
aedd00
 .Sq +
aedd00
-character, then the specified ciphers will be appended to the default set
aedd00
+character, then the specified ciphers will be appended to the built-in default set
aedd00
 instead of replacing them.
aedd00
 If the specified value begins with a
aedd00
 .Sq -
aedd00
 character, then the specified ciphers (including wildcards) will be removed
aedd00
-from the default set instead of replacing them.
aedd00
+from the built-in default set instead of replacing them.
aedd00
 .Pp
aedd00
 The supported ciphers are:
aedd00
 .Pp
aedd00
@@ -490,13 +495,6 @@ aes256-gcm@openssh.com
aedd00
 chacha20-poly1305@openssh.com
aedd00
 .El
aedd00
 .Pp
aedd00
-The default is:
aedd00
-.Bd -literal -offset indent
aedd00
-chacha20-poly1305@openssh.com,
aedd00
-aes128-ctr,aes192-ctr,aes256-ctr,
aedd00
-aes128-gcm@openssh.com,aes256-gcm@openssh.com
aedd00
-.Ed
aedd00
-.Pp
aedd00
 The list of available ciphers may also be obtained using
aedd00
 .Qq ssh -Q cipher .
aedd00
 .It Cm ClientAliveCountMax
aedd00
@@ -688,6 +686,11 @@ For this to work
aedd00
 .Cm GSSAPIKeyExchange
aedd00
 needs to be enabled in the server and also used by the client.
aedd00
 .It Cm GSSAPIKexAlgorithms
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 The list of key exchange algorithms that are accepted by GSSAPI
aedd00
 key exchange. Possible values are
aedd00
 .Bd -literal -offset 3n
aedd00
@@ -700,8 +703,6 @@ gss-nistp256-sha256-,
aedd00
 gss-curve25519-sha256-
aedd00
 .Ed
aedd00
 .Pp
aedd00
-The default is
aedd00
-.Dq gss-group14-sha256-,gss-group16-sha512-,gss-nistp256-sha256-,gss-curve25519-sha256-,gss-group14-sha1-,gss-gex-sha1- .
aedd00
 This option only applies to connections using GSSAPI.
aedd00
 .It Cm HostbasedAcceptedKeyTypes
aedd00
 Specifies the key types that will be accepted for hostbased authentication
aedd00
@@ -791,19 +791,13 @@ is specified, the location of the socket
aedd00
 .Ev SSH_AUTH_SOCK
aedd00
 environment variable.
aedd00
 .It Cm HostKeyAlgorithms
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 Specifies the host key algorithms
aedd00
 that the server offers.
aedd00
-The default for this option is:
aedd00
-.Bd -literal -offset 3n
aedd00
-ecdsa-sha2-nistp256-cert-v01@openssh.com,
aedd00
-ecdsa-sha2-nistp384-cert-v01@openssh.com,
aedd00
-ecdsa-sha2-nistp521-cert-v01@openssh.com,
aedd00
-ssh-ed25519-cert-v01@openssh.com,
aedd00
-rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,
aedd00
-ssh-rsa-cert-v01@openssh.com,
aedd00
-ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
aedd00
-ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
aedd00
-.Ed
aedd00
 .Pp
aedd00
 The list of available key types may also be obtained using
aedd00
 .Qq ssh -Q key .
aedd00
@@ -922,16 +916,21 @@ Specifies whether to look at .k5login fi
aedd00
 The default is
aedd00
 .Cm yes .
aedd00
 .It Cm KexAlgorithms
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 Specifies the available KEX (Key Exchange) algorithms.
aedd00
 Multiple algorithms must be comma-separated.
aedd00
 Alternately if the specified value begins with a
aedd00
 .Sq +
aedd00
-character, then the specified methods will be appended to the default set
aedd00
+character, then the specified methods will be appended to the built-in default set
aedd00
 instead of replacing them.
aedd00
 If the specified value begins with a
aedd00
 .Sq -
aedd00
 character, then the specified methods (including wildcards) will be removed
aedd00
-from the default set instead of replacing them.
aedd00
+from the built-in default set instead of replacing them.
aedd00
 The supported algorithms are:
aedd00
 .Pp
aedd00
 .Bl -item -compact -offset indent
aedd00
@@ -961,15 +960,6 @@ ecdh-sha2-nistp384
aedd00
 ecdh-sha2-nistp521
aedd00
 .El
aedd00
 .Pp
aedd00
-The default is:
aedd00
-.Bd -literal -offset indent
aedd00
-curve25519-sha256,curve25519-sha256@libssh.org,
aedd00
-ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
aedd00
-diffie-hellman-group-exchange-sha256,
aedd00
-diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,
aedd00
-diffie-hellman-group14-sha256,diffie-hellman-group14-sha1
aedd00
-.Ed
aedd00
-.Pp
aedd00
 The list of available key exchange algorithms may also be obtained using
aedd00
 .Qq ssh -Q kex .
aedd00
 .It Cm ListenAddress
aedd00
@@ -1038,17 +1028,22 @@ DEBUG and DEBUG1 are equivalent.
aedd00
 DEBUG2 and DEBUG3 each specify higher levels of debugging output.
aedd00
 Logging with a DEBUG level violates the privacy of users and is not recommended.
aedd00
 .It Cm MACs
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 Specifies the available MAC (message authentication code) algorithms.
aedd00
 The MAC algorithm is used for data integrity protection.
aedd00
 Multiple algorithms must be comma-separated.
aedd00
 If the specified value begins with a
aedd00
 .Sq +
aedd00
-character, then the specified algorithms will be appended to the default set
aedd00
+character, then the specified algorithms will be appended to the built-in default set
aedd00
 instead of replacing them.
aedd00
 If the specified value begins with a
aedd00
 .Sq -
aedd00
 character, then the specified algorithms (including wildcards) will be removed
aedd00
-from the default set instead of replacing them.
aedd00
+from the built-in default set instead of replacing them.
aedd00
 .Pp
aedd00
 The algorithms that contain
aedd00
 .Qq -etm
aedd00
@@ -1091,15 +1086,6 @@ umac-64-etm@openssh.com
aedd00
 umac-128-etm@openssh.com
aedd00
 .El
aedd00
 .Pp
aedd00
-The default is:
aedd00
-.Bd -literal -offset indent
aedd00
-umac-64-etm@openssh.com,umac-128-etm@openssh.com,
aedd00
-hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,
aedd00
-hmac-sha1-etm@openssh.com,
aedd00
-umac-64@openssh.com,umac-128@openssh.com,
aedd00
-hmac-sha2-256,hmac-sha2-512,hmac-sha1
aedd00
-.Ed
aedd00
-.Pp
aedd00
 The list of available MAC algorithms may also be obtained using
aedd00
 .Qq ssh -Q mac .
aedd00
 .It Cm Match
aedd00
@@ -1446,27 +1432,21 @@ or equivalent.)
aedd00
 The default is
aedd00
 .Cm yes .
aedd00
 .It Cm PubkeyAcceptedKeyTypes
aedd00
+The default is handled system-wide by
aedd00
+.Xr crypto-policies 7 .
aedd00
+To see the current defaults and how to modify them, see manual page
aedd00
+.Xr update-crypto-policies 8 .
aedd00
+.Pp
aedd00
 Specifies the key types that will be accepted for public key authentication
aedd00
 as a list of comma-separated patterns.
aedd00
 Alternately if the specified value begins with a
aedd00
 .Sq +
aedd00
-character, then the specified key types will be appended to the default set
aedd00
+character, then the specified key types will be appended to the built-in default set
aedd00
 instead of replacing them.
aedd00
 If the specified value begins with a
aedd00
 .Sq -
aedd00
 character, then the specified key types (including wildcards) will be removed
aedd00
-from the default set instead of replacing them.
aedd00
-The default for this option is:
aedd00
-.Bd -literal -offset 3n
aedd00
-ecdsa-sha2-nistp256-cert-v01@openssh.com,
aedd00
-ecdsa-sha2-nistp384-cert-v01@openssh.com,
aedd00
-ecdsa-sha2-nistp521-cert-v01@openssh.com,
aedd00
-ssh-ed25519-cert-v01@openssh.com,
aedd00
-rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,
aedd00
-ssh-rsa-cert-v01@openssh.com,
aedd00
-ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
aedd00
-ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
aedd00
-.Ed
aedd00
+from the built-in default set instead of replacing them.
aedd00
 .Pp
aedd00
 The list of available key types may also be obtained using
aedd00
 .Qq ssh -Q key .