52 diff -pur old/ssh.1 new/ssh.1

    53 --- old/ssh.1

    54 +++ new/ssh.1

    55 @@ -788,7 +788,7 @@ options (see above).

    56  Both protocols support similar authentication methods,

    57  but protocol 2 is the default since

    58  it provides additional mechanisms for confidentiality

    59 -(the traffic is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour)

    60 +(the traffic is encrypted using AES, 3DES, Blowfish, or Arcfour)

    61  and integrity (hmac-md5, hmac-sha1,

    62  hmac-sha2-256, hmac-sha2-512,

    63  umac-64, umac-128, hmac-ripemd160).

    64 diff -pur old/ssh_config.5 new/ssh_config.5

    65 --- old/ssh_config.5

    66 +++ new/ssh_config.5

    67 @@ -408,8 +408,6 @@ arcfour256

    68  .It

    69  blowfish-cbc

    70  .It

    71 -cast128-cbc

    72 -.It

    73  [email protected]

    74  .El

    75  .Pp

    76 @@ -419,7 +417,7 @@ [email protected],

    77  aes128-ctr,aes192-ctr,aes256-ctr,

    78  [email protected],[email protected],

    79  arcfour256,arcfour128,

    80 -aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,

    81 +aes128-cbc,3des-cbc,blowfish-cbc,

    82  aes192-cbc,aes256-cbc,arcfour

    83  .Ed

    84  .Pp

    85 diff -pur old/sshd.8 new/sshd.8

    86 --- old/sshd.8

    87 +++ new/sshd.8

    88 @@ -307,7 +307,7 @@ For protocol 2,

    89  forward security is provided through a Diffie-Hellman key agreement.

    90  This key agreement results in a shared session key.

    91  The rest of the session is encrypted using a symmetric cipher, currently

    92 -128-bit AES, Blowfish, 3DES, CAST128, Arcfour, 192-bit AES, or 256-bit AES.

    93 +128-bit AES, Blowfish, 3DES, Arcfour, 192-bit AES, or 256-bit AES.

    94  The client selects the encryption algorithm

    95  to use from those offered by the server.

    96  Additionally, session integrity is provided

    97 diff -pur old/sshd_config.5 new/sshd_config.5

    98 --- old/sshd_config.5

    99 +++ new/sshd_config.5

   100 @@ -469,8 +469,6 @@ arcfour256

   101  .It

   102  blowfish-cbc

   103  .It

   104 -cast128-cbc

   105 -.It

   106  [email protected]

   107  .El

   108  .Pp