17 # but now upstream OPENSSL_NO_CAST is used instead. This patch now just |
17 # but now upstream OPENSSL_NO_CAST is used instead. This patch now just |
18 # removes cast references from manpages. |
18 # removes cast references from manpages. |
19 # |
19 # |
20 # This is a Solaris specific patch and it is not likely to be accepted upstream. |
20 # This is a Solaris specific patch and it is not likely to be accepted upstream. |
21 # |
21 # |
22 --- orig/ssh_config.5 Mon Aug 15 17:22:20 2016 |
22 diff -pur old/ssh_config.5 new/ssh_config.5 |
23 +++ new/ssh_config.5 Mon Aug 15 17:25:28 2016 |
23 --- old/ssh_config.5 |
24 @@ -478,8 +478,6 @@ |
24 +++ new/ssh_config.5 |
|
25 @@ -431,7 +431,6 @@ arcfour |
|
26 arcfour128 |
|
27 arcfour256 |
|
28 blowfish-cbc |
|
29 -cast128-cbc |
|
30 [email protected] |
|
31 .Ed |
|
32 .Pp |
|
33 diff -pur old/sshd.8 new/sshd.8 |
|
34 --- old/sshd.8 |
|
35 +++ new/sshd.8 |
|
36 @@ -255,7 +255,7 @@ host key against its own database to ver |
|
37 Forward security is provided through a Diffie-Hellman key agreement. |
|
38 This key agreement results in a shared session key. |
|
39 The rest of the session is encrypted using a symmetric cipher, currently |
|
40 -128-bit AES, Blowfish, 3DES, CAST128, Arcfour, 192-bit AES, or 256-bit AES. |
|
41 +128-bit AES, Blowfish, 3DES, Arcfour, 192-bit AES, or 256-bit AES. |
|
42 The client selects the encryption algorithm |
|
43 to use from those offered by the server. |
|
44 Additionally, session integrity is provided |
|
45 diff -pur old/sshd_config.5 new/sshd_config.5 |
|
46 --- old/sshd_config.5 |
|
47 +++ new/sshd_config.5 |
|
48 @@ -468,8 +468,6 @@ arcfour256 |
25 .It |
49 .It |
26 blowfish-cbc |
50 blowfish-cbc |
27 .It |
51 .It |
28 -cast128-cbc |
52 -cast128-cbc |
29 -.It |
53 -.It |
30 [email protected] |
54 [email protected] |
31 .El |
55 .El |
32 .Pp |
56 .Pp |
33 --- orig/sshd_config.5 Mon Aug 15 17:22:29 2016 |
|
34 +++ new/sshd_config.5 Mon Aug 15 17:25:58 2016 |
|
35 @@ -479,8 +479,6 @@ |
|
36 .It |
|
37 blowfish-cbc |
|
38 .It |
|
39 -cast128-cbc |
|
40 -.It |
|
41 [email protected] |
|
42 .El |
|
43 .Pp |
|
44 --- orig/sshd.8 Mon Aug 15 17:22:36 2016 |
|
45 +++ new/sshd.8 Mon Aug 15 17:26:48 2016 |
|
46 @@ -307,7 +307,7 @@ |
|
47 forward security is provided through a Diffie-Hellman key agreement. |
|
48 This key agreement results in a shared session key. |
|
49 The rest of the session is encrypted using a symmetric cipher, currently |
|
50 -128-bit AES, Blowfish, 3DES, CAST128, Arcfour, 192-bit AES, or 256-bit AES. |
|
51 +128-bit AES, Blowfish, 3DES, Arcfour, 192-bit AES, or 256-bit AES. |
|
52 The client selects the encryption algorithm |
|
53 to use from those offered by the server. |
|
54 Additionally, session integrity is provided |
|