removing dependency on buffer.subarray, change default return type to Uint8Array on all platforms

Author: RainaBatwing

README.md

@@ -70,10 +70,9 @@ Usage
 ------
 
 All API functions accept `Uint8Array`s, Node/Browserify Buffers, or any
-api-compatible byte array objects. Return type defaults to Buffer where
-available and Uint8Array otherwise. Return type is configurable with
-nacl.setReturnType.  If you need to encode or decode strings, use functions
-from `nacl.util` namespace.
+api-compatible byte array objects.  Return type defaults to Uint8Array, but can
+be changed to node.js or browserify Buffer using util.setReturnType.  If you
+need to encode or decode strings, use functions from `nacl.util` namespace.
 
 ### Public-key authenticated encryption (box)
 
@@ -340,8 +339,7 @@ subarray, slice, or both methods as in Uint8Array. When an element is set to a
 value outside of 0-255 inclusive, the object must truncate it in the same way
 Uint8Array and Node.js Buffers do: `(new constructor([567]))[0] == 1`
 
-Default value is Buffer when Buffer is available, as with Node or Browserify,
-and Uint8Array otherwise.
+Default is Uint8Array
 
 
 ### Utilities

nacl-fast.js

@@ -1368,8 +1368,8 @@ function crypto_scalarmult(q, n, p) {
     x[i+48]=b[i];
     x[i+64]=d[i];
   }
-  var x32 = x.subarray(32);
-  var x16 = x.subarray(16);
+  var x32 = subarray(x, 32);
+  var x16 = subarray(x, 16);
   inv25519(x32,x32);
   M(x16,x16,x32);
   pack25519(q,x16);
@@ -1983,7 +1983,7 @@ function crypto_sign(sm, m, n, sk) {
   for (i = 0; i < n; i++) sm[64 + i] = m[i];
   for (i = 0; i < 32; i++) sm[32 + i] = d[32 + i];
 
-  crypto_hash(r, sm.subarray(32), n+32);
+  crypto_hash(r, subarray(sm, 32), n+32);
   reduce(r);
   scalarbase(p, r);
   pack(sm, p);
@@ -2000,7 +2000,7 @@ function crypto_sign(sm, m, n, sk) {
     }
   }
 
-  modL(sm.subarray(32), x);
+  modL(subarray(sm, 32), x);
   return smlen;
 }
 
@@ -2059,7 +2059,7 @@ function crypto_sign_open(m, sm, n, pk) {
   reduce(h);
   scalarmult(p, q, h);
 
-  scalarbase(q, sm.subarray(32));
+  scalarbase(q, subarray(sm, 32));
   add(p, q);
   pack(t, p);
 
@@ -2434,10 +2434,6 @@ nacl.setPRNG = function(fn) {
       });
     }
   }
-
-  // Node.js and Browserify default to Buffer
-  if (typeof Buffer !== 'undefined')
-    nacl.setReturnType(Buffer);
 })();
 
 })(typeof module !== 'undefined' && module.exports ? module.exports : (window.nacl = window.nacl || {}));

nacl-fast.min.js

@@ -163,13 +163,13 @@ function crypto_stream_salsa20(c,cpos,d,n,k) {
 function crypto_stream(c,cpos,d,n,k) {
   var s = new Uint8Array(32);
   crypto_core_hsalsa20(s,n,k,sigma);
-  return crypto_stream_salsa20(c,cpos,d,n.subarray(16),s);
+  return crypto_stream_salsa20(c,cpos,d,subarray(n,16),s);
 }
 
 function crypto_stream_xor(c,cpos,m,mpos,d,n,k) {
   var s = new Uint8Array(32);
   crypto_core_hsalsa20(s,n,k,sigma);
-  return crypto_stream_salsa20_xor(c,cpos,m,mpos,d,n.subarray(16),s);
+  return crypto_stream_salsa20_xor(c,cpos,m,mpos,d,subarray(n,16),s);
 }
 
 function add1305(h, c) {
@@ -430,8 +430,8 @@ function crypto_scalarmult(q, n, p) {
     x[i+48]=b[i];
     x[i+64]=d[i];
   }
-  var x32 = x.subarray(32);
-  var x16 = x.subarray(16);
+  var x32 = subarray(x,32);
+  var x16 = subarray(x,16);
   inv25519(x32,x32);
   M(x16,x16,x32);
   pack25519(q,x16);
@@ -770,7 +770,7 @@ function crypto_sign(sm, m, n, sk) {
   for (i = 0; i < n; i++) sm[64 + i] = m[i];
   for (i = 0; i < 32; i++) sm[32 + i] = d[32 + i];
 
-  crypto_hash(r, sm.subarray(32), n+32);
+  crypto_hash(r, subarray(sm,32), n+32);
   reduce(r);
   scalarbase(p, r);
   pack(sm, p);
@@ -787,7 +787,7 @@ function crypto_sign(sm, m, n, sk) {
     }
   }
 
-  modL(sm.subarray(32), x);
+  modL(subarray(sm,32), x);
   return smlen;
 }
 
@@ -846,7 +846,7 @@ function crypto_sign_open(m, sm, n, pk) {
   reduce(h);
   scalarmult(p, q, h);
 
-  scalarbase(q, sm.subarray(32));
+  scalarbase(q, subarray(sm,32));
   add(p, q);
   pack(t, p);