Merge branch 'master' into nacl

This commit is contained in:
Tankred Hase 2013-04-04 18:40:14 +02:00
commit ea34d17c21
1 changed files with 2 additions and 2 deletions

View File

@ -142,7 +142,7 @@ app.crypto.Util = function(window, uuid) {
var b = new Uint8Array(buf);
var str = '';
for (var i = 0; i < b.byteLength; i++) {
for (var i = 0; i < b.length; i++) {
str += String.fromCharCode(b[i]);
}
@ -157,7 +157,7 @@ app.crypto.Util = function(window, uuid) {
this.uint8Arr2BinStr = function(buf) {
var str = '';
for (var i = 0; i < buf.byteLength; i++) {
for (var i = 0; i < buf.length; i++) {
str += String.fromCharCode(buf[i]);
}