summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-10-05 11:02:39 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-10-05 11:02:39 +1000
commit427e409e99d465118fbc2f7c1ca2c5d44365f5a8 (patch)
tree13b60a8b85469f596ffef7f57f086b24ec1f4551 /ssh.1
parent0dc283b13acdd4926dec1289b94badc3bbc7f321 (diff)
- markus@cvs.openbsd.org 2012/10/04 13:21:50
[myproposal.h ssh_config.5 umac.h sshd_config.5 ssh.1 sshd.8 mac.c] add umac128 variant; ok djm@ at n2k12 (note: further Makefile work is required)
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.16
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index e9bf3eaca..a5576edb6 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.329 2012/09/26 16:12:13 jmc Exp $ 36.\" $OpenBSD: ssh.1,v 1.330 2012/10/04 13:21:50 markus Exp $
37.Dd $Mdocdate: September 26 2012 $ 37.Dd $Mdocdate: October 4 2012 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -674,7 +674,7 @@ it provides additional mechanisms for confidentiality
674(the traffic is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour) 674(the traffic is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour)
675and integrity (hmac-md5, hmac-sha1, 675and integrity (hmac-md5, hmac-sha1,
676hmac-sha2-256, hmac-sha2-512, 676hmac-sha2-256, hmac-sha2-512,
677umac-64, hmac-ripemd160). 677umac-64, umac-128, hmac-ripemd160).
678Protocol 1 lacks a strong mechanism for ensuring the 678Protocol 1 lacks a strong mechanism for ensuring the
679integrity of the connection. 679integrity of the connection.
680.Pp 680.Pp