diff options
| author |   djm <djm@openbsd.org> | 2013-11-21 00:45:43 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2013-11-21 00:45:43 +0000 |
| commit | 1edbfe239db2487faa56c5fb5877105e3018932c (patch) | |
| tree | d5cbb0444e798f9ca43091e45c4a31f1498e401f /usr.bin/ssh/ssh.c | |
| parent | remove the #define b_cylinder b_resid from bufs. i hated the (diff) | |
| download | wireguard-openbsd-1edbfe239db2487faa56c5fb5877105e3018932c.tar.xz wireguard-openbsd-1edbfe239db2487faa56c5fb5877105e3018932c.zip | |
Add a new protocol 2 transport cipher "chacha20-poly1305@openssh.com"
that combines Daniel Bernstein's ChaCha20 stream cipher and Poly1305 MAC
to build an authenticated encryption mode.
Inspired by and similar to Adam Langley's proposal for TLS:
http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-03
but differs in layout used for the MAC calculation and the use of a
second ChaCha20 instance to separately encrypt packet lengths.
Details are in the PROTOCOL.chacha20poly1305 file.
Feedback markus@, naddy@; manpage bits Loganden Velvindron @ AfriNIC
ok markus@ naddy@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 3e06647229e..e517915b7ff 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.392 2013/11/07 11:58:27 dtucker Exp $ */ +/* $OpenBSD: ssh.c,v 1.393 2013/11/21 00:45:44 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -492,7 +492,9 @@ main(int ac, char **av) case 'Q': /* deprecated */ cp = NULL; if (strcasecmp(optarg, "cipher") == 0) - cp = cipher_alg_list('\n'); + cp = cipher_alg_list('\n', 0); + else if (strcasecmp(optarg, "cipher-auth") == 0) + cp = cipher_alg_list('\n', 1); else if (strcasecmp(optarg, "mac") == 0) cp = mac_alg_list('\n'); else if (strcasecmp(optarg, "kex") == 0) |