Merge pull request #14 from omsmith/use-safe-buffer

Use safe buffer
Brightspace · Nov 15, 2016 · 41ff0aa · 41ff0aa
2 parents 4a8e195 + ee856b9
commit 41ff0aa
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/benchmarks/der-to-jose.js b/benchmarks/der-to-jose.js
@@ -1,5 +1,7 @@
 'use strict';
 
+var Buffer = require('safe-buffer').Buffer;
+
 var derToJose = require('..').derToJose;
 
 var sigs = [
@@ -9,7 +11,7 @@ var sigs = [
 ];
 
 var sigBuffers = sigs.map(function(sig) {
-	return [new Buffer(sig[0], 'base64'), sig[1]];
+	return [Buffer.from(sig[0], 'base64'), sig[1]];
 });
 
 module.exports.compare = {

diff --git a/benchmarks/jose-to-der.js b/benchmarks/jose-to-der.js
@@ -1,5 +1,7 @@
 'use strict';
 
+var Buffer = require('safe-buffer').Buffer;
+
 var joseToDer = require('..').joseToDer;
 
 var sigs = [
@@ -9,7 +11,7 @@ var sigs = [
 ];
 
 var sigBuffers = sigs.map(function(sig) {
-	return [new Buffer(sig[0], 'base64'), sig[1]];
+	return [Buffer.from(sig[0], 'base64'), sig[1]];
 });
 
 module.exports.compare = {

diff --git a/fuzz/keygen.js b/fuzz/keygen.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var base64url = require('base64-url').escape,
+	Buffer = require('safe-buffer').Buffer,
 	EC = require('elliptic').ec,
 	jwkToPem = require('jwk-to-pem');
 
@@ -17,7 +18,7 @@ var curves = {
 
 function b64(val) {
 	val = val.toString('hex', 2);
-	val = new Buffer(val, 'hex');
+	val = Buffer.from(val, 'hex');
 	val = val.toString('base64');
 	val = base64url(val);
 	return val;

diff --git a/package.json b/package.json
@@ -29,7 +29,8 @@
   },
   "homepage": "https://github.com/Brightspace/node-ecdsa-sig-formatter#readme",
   "dependencies": {
-    "base64-url": "^1.2.1"
+    "base64-url": "^1.2.1",
+    "safe-buffer": "^5.0.1"
   },
   "devDependencies": {
     "bench": "^0.3.6",

diff --git a/spec/der-to-jose.js b/spec/der-to-jose.js
@@ -1,6 +1,7 @@
 'use strict';
 
-var expect = require('chai').expect,
+var Buffer = require('safe-buffer').Buffer,
+	expect = require('chai').expect,
 	mocha = require('mocha');
 
 var describe = mocha.describe,
@@ -43,7 +44,7 @@ describe('#derToJose', function() {
 				});
 
 				it('no seq', function() {
-					var input = new Buffer(10);
+					var input = Buffer.alloc(10);
 					input[0] = TAG_SEQ + 1; // not seq
 
 					function fn() {
@@ -54,7 +55,7 @@ describe('#derToJose', function() {
 				});
 
 				it('seq length exceeding input', function() {
-					var input = new Buffer(10);
+					var input = Buffer.alloc(10);
 					input[0] = TAG_SEQ;
 					input[1] = 10;
 
@@ -66,7 +67,7 @@ describe('#derToJose', function() {
 				});
 
 				it('r is not marked as int', function() {
-					var input = new Buffer(10);
+					var input = Buffer.alloc(10);
 					input[0] = TAG_SEQ;
 					input[1] = 8;
 					input[2] = TAG_INT + 1; // not int
@@ -79,7 +80,7 @@ describe('#derToJose', function() {
 				});
 
 				it('r length exceeds available input', function() {
-					var input = new Buffer(10);
+					var input = Buffer.alloc(10);
 					input[0] = TAG_SEQ;
 					input[1] = 8;
 					input[2] = TAG_INT;
@@ -93,7 +94,7 @@ describe('#derToJose', function() {
 				});
 
 				it('r length exceeds sensical param length', function() {
-					var input = new Buffer(getParamBytesForAlg(alg) + 2 + 6);
+					var input = Buffer.alloc(getParamBytesForAlg(alg) + 2 + 6);
 					input[0] = TAG_SEQ;
 					input[1] = getParamBytesForAlg(alg) + 2 + 4;
 					input[2] = TAG_INT;
@@ -107,7 +108,7 @@ describe('#derToJose', function() {
 				});
 
 				it('s is not marked as int', function() {
-					var input = new Buffer(10);
+					var input = Buffer.alloc(10);
 					input[0] = TAG_SEQ;
 					input[1] = 8;
 					input[2] = TAG_INT;
@@ -124,7 +125,7 @@ describe('#derToJose', function() {
 				});
 
 				it('s length exceeds available input', function() {
-					var input = new Buffer(10);
+					var input = Buffer.alloc(10);
 					input[0] = TAG_SEQ;
 					input[1] = 8;
 					input[2] = TAG_INT;
@@ -142,7 +143,7 @@ describe('#derToJose', function() {
 				});
 
 				it('s length does not consume available input', function() {
-					var input = new Buffer(10);
+					var input = Buffer.alloc(10);
 					input[0] = TAG_SEQ;
 					input[1] = 8;
 					input[2] = TAG_INT;
@@ -160,7 +161,7 @@ describe('#derToJose', function() {
 				});
 
 				it('s length exceeds sensical param length', function() {
-					var input = new Buffer(getParamBytesForAlg(alg) + 2 + 8);
+					var input = Buffer.alloc(getParamBytesForAlg(alg) + 2 + 8);
 					input[0] = TAG_SEQ;
 					input[1] = getParamBytesForAlg(alg) + 2 + 6;
 					input[2] = TAG_INT;

diff --git a/src/ecdsa-sig-formatter.js b/src/ecdsa-sig-formatter.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var base64Url = require('base64-url').escape;
+var Buffer = require('safe-buffer').Buffer;
 
 var getParamBytesForAlg = require('./param-bytes-for-alg');
 
@@ -16,7 +17,7 @@ function signatureAsBuffer(signature) {
 	if (Buffer.isBuffer(signature)) {
 		return signature;
 	} else if ('string' === typeof signature) {
-		return new Buffer(signature, 'base64');
+		return Buffer.from(signature, 'base64');
 	}
 
 	throw new TypeError('ECDSA signature must be a Base64 string or a Buffer');
@@ -87,7 +88,7 @@ function derToJose(signature, alg) {
 	var rPadding = paramBytes - rLength,
 		sPadding = paramBytes - sLength;
 
-	var dst = new Buffer(rPadding + rLength + sPadding + sLength);
+	var dst = Buffer.allocUnsafe(rPadding + rLength + sPadding + sLength);
 
 	for (offset = 0; offset < rPadding; ++offset) {
 		dst[offset] = 0;
@@ -139,7 +140,7 @@ function joseToDer(signature, alg) {
 
 	var shortLength = rsBytes < MAX_OCTET;
 
-	var dst = new Buffer((shortLength ? 2 : 3) + rsBytes);
+	var dst = Buffer.allocUnsafe((shortLength ? 2 : 3) + rsBytes);
 
 	var offset = 0;
 	dst[offset++] = ENCODED_TAG_SEQ;