- deraadt@cvs.openbsd.org 2001/03/05 15:56:16

[openssh.git] / ssh.1

diff --git a/ssh.1 b/ssh.1
index 53cebcfd7667fefe0dfe6531fd664a7fe1ed33d7..79b075fff3c040bf86c3bdb65d629e7c5cdbd2ec 100644 (file)
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.93 2001/03/02 18:54:31 deraadt Exp $
+.\" $OpenBSD: ssh.1,v 1.94 2001/03/05 15:56:16 deraadt Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -228,7 +228,7 @@ S/Key authentication.
 .Pp
 Protocol 2 provides additional mechanisms for confidentiality
 (the traffic is encrypted using 3DES, Blowfish, CAST128 or Arcfour)
-and integrity (hmac-sha1, hmac-md5).
+and integrity (hmac-md5, hmac-sha1).
 Note that protocol 1 lacks a strong mechanism for ensuring the
 integrity of the connection.
 .Pp
@@ -667,7 +667,7 @@ Multiple ciphers must be comma-separated.
 The default is
 .Pp
 .Bd -literal
-  ``3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes128-cbc,
+  ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,
     aes192-cbc,aes256-cbc,rijndael128-cbc,rijndael192-cbc,
     rijndael256-cbc,rijndael-cbc@lysator.liu.se''
 .Ed
@@ -831,7 +831,7 @@ Multiple algorithms must be comma-separated.
 The default is
 .Pp
 .Bd -literal
-  ``hmac-sha1,hmac-md5,hmac-ripemd160,hmac-ripemd160@openssh.com,
+  ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-ripemd160@openssh.com,
     hmac-sha1-96,hmac-md5-96''
 .Ed
 .It Cm NumberOfPasswordPrompts