[Pkg-privacy-commits] [obfs4proxy] 03/151: Change documentation/comments to reflect reality (No functional changes).

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfs4proxy.

commit f76f142340260a6537c92439d173a9b324c12bd7
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Sun May 11 21:55:34 2014 +0000

    Change documentation/comments to reflect reality (No functional changes).
---
 README.md          | 2 +-
 framing/framing.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index bf1d69c..ef38532 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ The notable differences between ScrambleSuit and obfs4:
    Ticket Handshake). (TODO: Reconsider this.)
  * The handshake uses the Tor Project's ntor handshake with public keys
    obfuscated via the Elligator mapping.
- * The link layer encryption uses NaCl secret boxes (Poly1305/Salsa20).
+ * The link layer encryption uses NaCl secret boxes (Poly1305/XSalsa20).
 
 ### Why not extend ScrambleSuit?
 
diff --git a/framing/framing.go b/framing/framing.go
index d319207..5554a6e 100644
--- a/framing/framing.go
+++ b/framing/framing.go
@@ -35,7 +35,7 @@
 //
 // The frame format is:
 //   uint16_t length (obfsucated, big endian)
-//   NaCl SecretBox (Poly1305/Salsa20) containing:
+//   NaCl SecretBox (Poly1305/XSalsa20) containing:
 //     uint8_t[16] tag (Part of the SecretBox construct)
 //     uint8_t[]   payload
 //
@@ -43,7 +43,7 @@
 // SipHash-2-4 digest of the previous SecretBox concatenated with the nonce
 // used to seal the current SecretBox.
 //
-// The NaCl SecretBox (Poly1305/Salsa20) nonce format is:
+// The NaCl SecretBox (Poly1305/XSalsa20) nonce format is:
 //     uint8_t[24] prefix (Fixed)
 //     uint64_t    counter (Big endian)
 //

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfs4proxy.git