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/servconf.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/servconf.c')
| -rw-r--r-- | usr.bin/ssh/servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index fb35c86e033..79d77a39475 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.245 2013/11/07 11:58:27 dtucker Exp $ */ +/* $OpenBSD: servconf.c,v 1.246 2013/11/21 00:45:44 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -1986,7 +1986,7 @@ dump_config(ServerOptions *o) dump_cfg_string(sPidFile, o->pid_file); dump_cfg_string(sXAuthLocation, o->xauth_location); dump_cfg_string(sCiphers, o->ciphers ? o->ciphers : - cipher_alg_list(',')); + cipher_alg_list(',', 0)); dump_cfg_string(sMacs, o->macs ? o->macs : mac_alg_list(',')); dump_cfg_string(sBanner, o->banner); dump_cfg_string(sForceCommand, o->adm_forced_command); |