Fix: issues with latest browserify-buffer

Author: linuxwolf

gulpfile.js

@@ -182,12 +182,6 @@ var KARMA_CONFIG = {
       base: "SauceLabs",
       browserName: "firefox"
     },
-    "SL_Safari_7": {
-      base: "SauceLabs",
-      platform: "OS X 10.9",
-      browserName: "safari",
-      version: "7"
-    },
     "SL_Safari_8": {
       base: "SauceLabs",
       platform: "OS X 10.10",

lib/algorithms/aes-cbc-hmac-sha2.js

@@ -73,9 +73,7 @@ function commonCbcEncryptFN(size) {
       return helpers.subtleCrypto.encrypt(alg, key, pdata);
     });
     promise = promise.then(function(cdata) {
-      // wrap in *augmented* Uint8Array -- Buffer without copies
-      cdata = new Uint8Array(cdata);
-      cdata = Buffer._augment(cdata);
+      cdata = new Buffer(cdata);
       return cdata;
     });
 
@@ -165,9 +163,7 @@ function commonCbcDecryptFN(size) {
       return helpers.subtleCrypto.decrypt(alg, key, cdata);
     });
     promise = promise.then(function(pdata) {
-      // wrap in *augmented* Uint8Array -- Buffer without copies
-      pdata = new Uint8Array(pdata);
-      pdata = Buffer._augment(pdata);
+      pdata = new Buffer(pdata);
       return pdata;
     });
 

lib/algorithms/aes-gcm.js

@@ -108,15 +108,11 @@ function gcmEncryptFN(size) {
     promise = promise.then(function(result) {
       var tagStart = result.byteLength - 16;
 
-      // wrap in *augmented* Uint8Array -- Buffer without copies
       var tag = result.slice(tagStart);
-      tag = new Uint8Array(tag);
-      tag = Buffer._augment(tag);
+      tag = new Buffer(tag);
 
-      // wrap in *augmented* Uint8Array -- Buffer without copies
       var cdata = result.slice(0, tagStart);
-      cdata = new Uint8Array(cdata);
-      cdata = Buffer._augment(cdata);
+      cdata = new Buffer(cdata);
 
       return {
         data: cdata,
@@ -274,9 +270,7 @@ function gcmDecryptFN(size) {
       return helpers.subtleCrypto.decrypt(alg, key, cdata);
     });
     promise = promise.then(function(pdata) {
-      // wrap *augmented* Uint8Array -- Buffer without copies
-      pdata = new Uint8Array(pdata);
-      pdata = Buffer._augment(pdata);
+      pdata = new Buffer(pdata);
       return pdata;
     });
 

lib/algorithms/aes-kw.js

@@ -114,9 +114,7 @@ function kwEncryptFN(size) {
                                           alg);
     });
     promise = promise.then(function(result) {
-      // wrap in *augmented* Uint8Array -- Buffer without copies
-      result = new Uint8Array(result);
-      result = Buffer._augment(result);
+      result = new Buffer(result);
 
       return {
         data: result
@@ -196,9 +194,7 @@ function kwDecryptFN(size) {
       return helpers.subtleCrypto.exportKey("raw", result);
     });
     promise = promise.then(function(result) {
-      // wrap in *augmented* Uint8Array -- Buffer without copies
-      result = new Uint8Array(result);
-      result = Buffer._augment(result);
+      result = new Buffer(result);
       return result;
     });
     return promise;

lib/algorithms/ecdh.js

@@ -107,8 +107,7 @@ function ecdhDeriveFn() {
       return helpers.subtleCrypto.deriveBits(algParams, privKey, keyLen * 8);
     });
     promise = promise.then(function(result) {
-      result = new Uint8Array(result);
-      Buffer._augment(result);
+      result = new Buffer(result);
       return result;
     });
     return promise;

lib/algorithms/ecdsa.js

@@ -71,8 +71,7 @@ function ecdsaSignFN(hash) {
       return helpers.subtleCrypto.sign(alg, key, pdata);
     });
     promise = promise.then(function(result) {
-      result = new Uint8Array(result);
-      result = Buffer._augment(result);
+      result = new Buffer(result);
       return {
         data: pdata,
         mac: result

lib/algorithms/hmac.js

@@ -51,9 +51,7 @@ function hmacSignFN(name) {
       return helpers.subtleCrypto.sign(alg, key, pdata);
     });
     promise = promise.then(function(result) {
-      // wrap in *augmented* Uint8Array - Buffer without copies
-      var sig = new Uint8Array(result);
-      sig = Buffer._augment(sig);
+      var sig = new Buffer(result);
       return {
         data: pdata,
         mac: sig
@@ -138,9 +136,7 @@ function hmacVerifyFN(name) {
         return helpers.subtleCrypto.sign(alg, key, pdata);
       });
       promise = promise.then(function(result) {
-        // wrap in *augmented* Uint8Array - Buffer without copies
-        var sig = new Uint8Array(result);
-        sig = Buffer._augment(sig);
+        var sig = new Buffer(result);
         return compare(true, mac, sig);
       });
     } else {

lib/algorithms/rsaes.js

@@ -64,9 +64,7 @@ function rsaesEncryptFn(name) {
         return helpers.subtleCrypto.encrypt(alg, key, pdata);
       });
       promise = promise.then(function(result) {
-        // wrap in *augmented* Uint8Array - Buffer without copies
-        var cdata = new Uint8Array(result);
-        cdata = Buffer._augment(cdata);
+        var cdata = new Buffer(result);
         return {
           data: cdata
         };
@@ -130,9 +128,7 @@ function rsaesDecryptFn(name) {
         return helpers.subtleCrypto.decrypt(alg, key, pdata);
       });
       promise = promise.then(function(result) {
-        // wrap in *augmented* Uint8Array - Buffer without copies
-        var pdata = new Uint8Array(result);
-        pdata = Buffer._augment(pdata);
+        var pdata = new Buffer(result);
         return pdata;
       });
 

lib/algorithms/rsassa.js

@@ -50,9 +50,7 @@ function rsassaV15SignFn(name) {
       return helpers.subtleCrypto.sign(alg, key, pdata);
     });
     promise = promise.then(function(result) {
-      // wrap in *augmented* Uint8Array - Buffer without copies
-      var sig = new Uint8Array(result);
-      sig = Buffer._augment(sig);
+      var sig = new Buffer(result);
       return {
         data: pdata,
         mac: sig

lib/algorithms/sha.js

@@ -29,9 +29,7 @@ function hashDigestFN(hash) {
     var promise;
     promise = helpers.subtleCrypto.digest(alg, pdata);
     promise = promise.then(function(result) {
-      // wrap in *augmented* Uint8Array -- Buffer without copies
-      result = new Uint8Array(result);
-      result = Buffer._augment(result);
+      result = new Buffer(result);
       return result;
     });
     return promise;

lib/util/databuffer.js

@@ -257,12 +257,6 @@ DataBuffer.prototype.getBytes = function(count) {
   return rval;
 };
 DataBuffer.prototype.putBytes = function(bytes, encoding) {
-  function augmentIt(src) {
-    return (Buffer._augment) ?
-           Buffer._augment(src) :
-           new Buffer(src);
-  }
-
   if ("string" === typeof bytes) {
     // fixup encoding
     encoding = encoding || "binary";
@@ -303,14 +297,14 @@ DataBuffer.prototype.putBytes = function(bytes, encoding) {
     src = new Buffer(bytes);
   } else if (forge.util.isArrayBuffer(bytes)) {
     src = new Uint8Array(bytes);
-    src = augmentIt(src);
+    src = new Buffer(src);
   } else if (forge.util.isArrayBufferView(bytes)) {
     src = (bytes instanceof Uint8Array) ?
               bytes :
               new Uint8Array(bytes.buffer,
                              bytes.byteOffset,
                              bytes.byteLength);
-    src = augmentIt(src);
+    src = new Buffer(src);
   } else {
     throw new TypeError("invalid source type");
   }

test/algorithms/aes-gcm-test.js

@@ -166,7 +166,7 @@ describe("algorithms/aes-gcm", function() {
     var decryptFailer = function(){
       var runner = function() {
         var size = algSize(alg);
-        var key = new Buffer(size, "binary"),
+        var key = new Buffer(size),
             iv = new Buffer("a5a5a5a5a5a5a5a5a5a5a5a5", "hex"),
             tag,
             plaintext = new Buffer("00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff", "hex"),