components/openssh/patches/039-sshd_config_5_defaults.patch
author Jan Parcel <jan.parcel@oracle.com>
Mon, 01 Feb 2016 06:53:50 -0800
changeset 5376 4615bc2f4a50
parent 5372 0f0d5e50998d
permissions -rw-r--r--
22631538 Patch comment incorrect/outdated for patch 039-sshd_config_5_defaults.patch
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5372
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     1
#
5376
4615bc2f4a50 22631538 Patch comment incorrect/outdated for patch 039-sshd_config_5_defaults.patch
Jan Parcel <jan.parcel@oracle.com>
parents: 5372
diff changeset
     2
# hmac-sha1 is heavily used in the world, and customers updating openssh should
4615bc2f4a50 22631538 Patch comment incorrect/outdated for patch 039-sshd_config_5_defaults.patch
Jan Parcel <jan.parcel@oracle.com>
parents: 5372
diff changeset
     3
# have up-to-date man pages
5372
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     4
#
5376
4615bc2f4a50 22631538 Patch comment incorrect/outdated for patch 039-sshd_config_5_defaults.patch
Jan Parcel <jan.parcel@oracle.com>
parents: 5372
diff changeset
     5
# Upstream has been notified of this typo and is correcting it, this patch
4615bc2f4a50 22631538 Patch comment incorrect/outdated for patch 039-sshd_config_5_defaults.patch
Jan Parcel <jan.parcel@oracle.com>
parents: 5372
diff changeset
     6
# will be removed when Solaris updates to an update including the fix.
5372
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     7
# 
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     8
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     9
diff -rupN old/sshd_config.5 new/sshd_config.5
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    10
--- old/sshd_config.5	2016-01-28 13:47:34.630632408 -0800
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    11
+++ new/sshd_config.5	2016-01-28 13:48:34.129479936 -0800
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    12
@@ -1018,7 +1018,7 @@ The default is:
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    13
 [email protected],[email protected],
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    14
 [email protected],[email protected],
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    15
 [email protected],[email protected],
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    16
-hmac-sha2-256,hmac-sha2-512
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    17
+hmac-sha2-256,hmac-sha2-512,hmac-sha1
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    18
 .Ed
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    19
 .Pp
0f0d5e50998d 22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    20
 The list of available MAC algorithms may also be obtained using the