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.1 | |
| 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.1')
| -rw-r--r-- | usr.bin/ssh/ssh.1 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 6369fc28b7c..73e2086934d 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -33,8 +33,8 @@ .\" (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.339 2013/10/16 22:49:38 djm Exp $ -.Dd $Mdocdate: October 16 2013 $ +.\" $OpenBSD: ssh.1,v 1.340 2013/11/21 00:45:44 djm Exp $ +.Dd $Mdocdate: November 21 2013 $ .Dt SSH 1 .Os .Sh NAME @@ -504,6 +504,8 @@ for the algorithms supported for the specified version 2 The queriable features are: .Dq cipher (supported symmetric ciphers), +.Dq cipher-auth +(supported symmetric ciphers that support authenticated encryption), .Dq MAC (supported message integrity codes), .Dq KEX |