components/openssh/patches/033-without_cast128.patch
branchs11u3-sru
changeset 7946 165bf092aa9c
parent 7320 edeb951aa980
--- a/components/openssh/patches/033-without_cast128.patch	Tue Apr 25 00:30:07 2017 -0700
+++ b/components/openssh/patches/033-without_cast128.patch	Tue Apr 25 15:08:28 2017 -0700
@@ -19,9 +19,33 @@
 #
 # This is a Solaris specific patch and it is not likely to be accepted upstream.
 #
---- orig/ssh_config.5	Mon Aug 15 17:22:20 2016
-+++ new/ssh_config.5	Mon Aug 15 17:25:28 2016
-@@ -478,8 +478,6 @@
+diff -pur old/ssh_config.5 new/ssh_config.5
+--- old/ssh_config.5
++++ new/ssh_config.5
+@@ -431,7 +431,6 @@ arcfour
+ arcfour128
+ arcfour256
+ blowfish-cbc
+-cast128-cbc
+ [email protected]
+ .Ed
+ .Pp
+diff -pur old/sshd.8 new/sshd.8
+--- old/sshd.8
++++ new/sshd.8
+@@ -255,7 +255,7 @@ host key against its own database to ver
+ Forward security is provided through a Diffie-Hellman key agreement.
+ This key agreement results in a shared session key.
+ The rest of the session is encrypted using a symmetric cipher, currently
+-128-bit AES, Blowfish, 3DES, CAST128, Arcfour, 192-bit AES, or 256-bit AES.
++128-bit AES, Blowfish, 3DES, Arcfour, 192-bit AES, or 256-bit AES.
+ The client selects the encryption algorithm
+ to use from those offered by the server.
+ Additionally, session integrity is provided
+diff -pur old/sshd_config.5 new/sshd_config.5
+--- old/sshd_config.5
++++ new/sshd_config.5
+@@ -468,8 +468,6 @@ arcfour256
  .It
  blowfish-cbc
  .It
@@ -30,25 +54,3 @@
  [email protected]
  .El
  .Pp
---- orig/sshd_config.5	Mon Aug 15 17:22:29 2016
-+++ new/sshd_config.5	Mon Aug 15 17:25:58 2016
-@@ -479,8 +479,6 @@
- .It
- blowfish-cbc
- .It
--cast128-cbc
--.It
- [email protected]
- .El
- .Pp
---- orig/sshd.8	Mon Aug 15 17:22:36 2016
-+++ new/sshd.8	Mon Aug 15 17:26:48 2016
-@@ -307,7 +307,7 @@
- forward security is provided through a Diffie-Hellman key agreement.
- This key agreement results in a shared session key.
- The rest of the session is encrypted using a symmetric cipher, currently
--128-bit AES, Blowfish, 3DES, CAST128, Arcfour, 192-bit AES, or 256-bit AES.
-+128-bit AES, Blowfish, 3DES, Arcfour, 192-bit AES, or 256-bit AES.
- The client selects the encryption algorithm
- to use from those offered by the server.
- Additionally, session integrity is provided