64-bit token fixes

chrome/browser/resources/whispernet_proxy/js/wrapper.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 /**
  * Function to convert an array of bytes to a base64 string
  * TODO(rkc): Change this to use a Uint8array instead of a string.
  * @param {string} bytes String containing the bytes we want to convert.
  * @return {string} String containing the base64 representation.
  */
 function bytesToBase64(bytes) {
   var bstr = '';
   for (var i = 0; i < bytes.length; ++i)
     bstr += String.fromCharCode(bytes[i]);
-  return btoa(bstr);
+  return btoa(bstr).replace('=', '');
 }
 
 /**
  * Function to convert a string to an array of bytes.
  * @param {string} str String to convert.
  * @return {Array} Array containing the string.
  */
 function stringToArray(str) {
   var buffer = [];
   for (var i = 0; i < str.length; ++i)
@@ skipping 19 matching lines @@
   };
 
   this.whisperNacl_.send(msg);
 }
 
 /**
  * Method to encode a token.
  * @param {Object} params Encode token parameters object.
  */
 WhisperEncoder.prototype.encode = function(params) {
+  // Pad the token before decoding it.
+  var token = params.token.token;
+  while (token.length % 4 > 0)
+    token += '=';
+
   var msg = {
     type: 'encode_token',
     // Trying to send the token in binary form to Nacl doesn't work correctly.
     // We end up with the correct string + a bunch of extra characters. This is
     // true of returning a binary string too; hence we communicate back and
     // forth by converting the bytes into an array of integers.
-    token: stringToArray(atob(params.token.token)),
+    token: stringToArray(atob(token)),
     repetitions: params.repetitions,
     use_dtmf: params.token.audible
   };
+
   this.whisperNacl_.send(msg);
 };
 
 /**
  * Method to set the callback for encoded audio data received from the encoder
  * when we finish encoding a token.
  * @param {function(string, ArrayBuffer)} callback Callback which will receive
  * the audio samples.
  */
 WhisperEncoder.prototype.setAudioDataCallback = function(callback) {
@@ skipping 115 matching lines @@
     return;
 
   var returnCandidates = [];
   for (var i = 0; i < candidates.length; ++i) {
     returnCandidates[i] = { token: bytesToBase64(candidates[i]),
                             audible: audible };
   }
   this.tokenCallback_(returnCandidates);
 };