| author | Jan Parcel <jan.parcel@oracle.com> |
| Mon, 01 Feb 2016 14:49:35 -0800 | |
| branch | s11u3-sru |
| changeset 5381 | b8902a4f8935 |
| permissions | -rw-r--r-- |
|
5381
b8902a4f8935
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 |
# |
|
b8902a4f8935
22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
2 |
# hmac-sha1 is heavily used in the world, and customers updating openssh should |
|
b8902a4f8935
22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
3 |
# have up-to-date man pages |
|
b8902a4f8935
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 |
# |
|
b8902a4f8935
22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
5 |
# Upstream has been notified of this typo and is correcting it, this patch |
|
b8902a4f8935
22612856 man sshd_config(5) needs to call out hmac-sha1 as enabled by default
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
6 |
# will be removed when Solaris updates to an update including the fix. |
|
b8902a4f8935
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 |
# |
|
b8902a4f8935
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 |
|
|
b8902a4f8935
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 |
|
b8902a4f8935
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 |
|
b8902a4f8935
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 |
|
b8902a4f8935
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: |
|
b8902a4f8935
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], |
|
b8902a4f8935
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], |
|
b8902a4f8935
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], |
|
b8902a4f8935
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 |
|
b8902a4f8935
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 |
|
b8902a4f8935
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 |
|
b8902a4f8935
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 |
|
b8902a4f8935
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 |