From 52dce062c47f685450eacca0893d7c8a34002e0d Mon Sep 17 00:00:00 2001
From: Kagami Hiiragi <kagami@genshiken.org>
Date: Fri, 16 Jan 2015 01:43:15 +0300
Subject: [PATCH] Fixes

---
 lib/crypto.js   |  6 +++---
 lib/messages.js | 18 +++++++++---------
 lib/structs.js  |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/crypto.js b/lib/crypto.js
index 829e064..64766eb 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -50,9 +50,9 @@ exports.getPrivate = function() {
 };
 
 /**
- * Generate public key for a given private key.
- * @param {Buffer} privateKey - Private key
- * @return {Buffer} Public key.
+ * Generate public key for the given private key.
+ * @param {Buffer} privateKey - A 32-byte private key
+ * @return {Buffer} A 65-byte (uncompressed) public key.
  * @function
  */
 exports.getPublic = eccrypto.getPublic;
diff --git a/lib/messages.js b/lib/messages.js
index 8762e60..71d06c5 100644
--- a/lib/messages.js
+++ b/lib/messages.js
@@ -27,18 +27,18 @@ exports.version = {
    * payload
    * @return {Object} Decoded `version` structure.
    */
-  decode: function(payload) {
+  decode: function(buf) {
     // 4 + 8 + 8 + 26 + 26 + 8 + (1+) + (1+)
-    assert(payload.length >= 82, "Message payload is too small");
-    var protoVersion = payload.readUInt32BE(0, true);
-    var services = structs.serviceFeatures.decode(payload.slice(4, 12));
-    var time = util.readTime64BE(payload, 12);
+    assert(buf.length >= 82, "Buffer is too small");
+    var protoVersion = buf.readUInt32BE(0, true);
+    var services = structs.serviceFeatures.decode(buf.slice(4, 12));
+    var time = util.readTime64BE(buf, 12);
     var short = {short: true};
-    var addrRecv = structs.net_addr.decode(payload.slice(20, 46), short);
-    var addrFrom = structs.net_addr.decode(payload.slice(46, 72), short);
+    var addrRecv = structs.net_addr.decode(buf.slice(20, 46), short);
+    var addrFrom = structs.net_addr.decode(buf.slice(46, 72), short);
     var nonce = new Buffer(8);
-    payload.copy(nonce, 0, 72, 80);
-    var decodedUa = UserAgent.decode(payload.slice(80));
+    buf.copy(nonce, 0, 72, 80);
+    var decodedUa = UserAgent.decode(buf.slice(80));
     var decodedStreamNumbers = structs.var_int_list.decode(decodedUa.rest);
     return {
       version: protoVersion,
diff --git a/lib/structs.js b/lib/structs.js
index 73d0a11..302b45b 100644
--- a/lib/structs.js
+++ b/lib/structs.js
@@ -205,7 +205,7 @@ exports.var_str = {
     var length = decoded.length + strLength;
     assert(buf.length >= length, "Buffer is too small");
     // XXX(Kagami): Spec doesn't mention encoding, using UTF-8.
-    var str = decoded.rest.slice(0, strLength).toString();
+    var str = decoded.rest.slice(0, strLength).toString("utf8");
     var rest = decoded.rest.slice(strLength);
     return {str: str, length: length, rest: rest};
   },
@@ -217,7 +217,7 @@ exports.var_str = {
    */
   encode: function(str) {
     // XXX(Kagami): Spec doesn't mention encoding, using UTF-8.
-    var strBuf = new Buffer(str);
+    var strBuf = new Buffer(str, "utf8");
     return Buffer.concat([var_int.encode(strBuf.length), strBuf]);
   },
 };