summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--PROTOCOL.chacha20poly13054
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 336cb2afe..1aa9e80e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
23 - djm@cvs.openbsd.org 2013/12/01 23:19:05 23 - djm@cvs.openbsd.org 2013/12/01 23:19:05
24 [PROTOCOL] 24 [PROTOCOL]
25 mention curve25519-sha256@libssh.org key exchange algorithm 25 mention curve25519-sha256@libssh.org key exchange algorithm
26 - djm@cvs.openbsd.org 2013/12/02 02:50:27
27 [PROTOCOL.chacha20poly1305]
28 typo; from Jon Cave
26 29
2720131121 3020131121
28 - (djm) OpenBSD CVS Sync 31 - (djm) OpenBSD CVS Sync
diff --git a/PROTOCOL.chacha20poly1305 b/PROTOCOL.chacha20poly1305
index c4b723aff..9cf73a926 100644
--- a/PROTOCOL.chacha20poly1305
+++ b/PROTOCOL.chacha20poly1305
@@ -47,7 +47,7 @@ cipher by decrypting and using the packet length prior to checking
47the MAC. By using an independently-keyed cipher instance to encrypt the 47the MAC. By using an independently-keyed cipher instance to encrypt the
48length, an active attacker seeking to exploit the packet input handling 48length, an active attacker seeking to exploit the packet input handling
49as a decryption oracle can learn nothing about the payload contents or 49as a decryption oracle can learn nothing about the payload contents or
50its MAC (assuming key derivation, ChaCha20 and Poly1306 are secure). 50its MAC (assuming key derivation, ChaCha20 and Poly1305 are secure).
51 51
52The AEAD is constructed as follows: for each packet, generate a Poly1305 52The AEAD is constructed as follows: for each packet, generate a Poly1305
53key by taking the first 256 bits of ChaCha20 stream output generated 53key by taking the first 256 bits of ChaCha20 stream output generated
@@ -101,5 +101,5 @@ References
101[3] "ChaCha20 and Poly1305 based Cipher Suites for TLS", Adam Langley 101[3] "ChaCha20 and Poly1305 based Cipher Suites for TLS", Adam Langley
102 http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-03 102 http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-03
103 103
104$OpenBSD: PROTOCOL.chacha20poly1305,v 1.1 2013/11/21 00:45:43 djm Exp $ 104$OpenBSD: PROTOCOL.chacha20poly1305,v 1.2 2013/12/02 02:50:27 djm Exp $
105 105