Merge branch 'master' into dev-dep-updates

.travis.yml

@@ -1,18 +1,19 @@
 sudo: false
 language: node_js
 node_js:
-- '0.12'
-- 4
-- 5
-- 6
-- 7
+  - '0.12'
+  - 4
+  - 6
+  - 8
+  - 10
 after_success: npm run report-cov
 deploy:
   provider: npm
   email: d2ltravisdeploy@d2l.com
   api_key:
-    secure: kF1WSzVCG0nSPjwud32u2l43OAnSlu9uMQo6+jAxhc6OZW/QELwhv4zes0ibZTyzBx1yGwM7fVmqNxZCsnpftDvv4daX7MKeoe+kAnz/sVaWRRii2BTz0PhBIsiyRvZ9a2di/7etO6GvjPlR7grWg779CpOPxibQKWnLXSjFxSUFbHoq86zD4WkAaKz1AQWPfBROko9wo8NuhkGciFto4s3ItQmklCv4D/zlIh9h7aXBpZRrGA89JBOcWgANWLSdW9s0PRQ+iz+m1CDXPMsu7WcAqXKz9JaL3MskyN9LP0H5JHjg5X1scG4z8u8J4/pVHPIhsTn7yMxWkdC9lH0LIBzz0w9rbccW/zKg/9EGu9WKyHajJbEjbuxP2oKDCgslPM6G0BiN8Xh0b287xRQfkW0IbNPB7t/dQ+WsXWzU69+eopZYtcjiMW5QA0PmbM3x7WIZ0r2ZDtHWGSkQjL41DMd9AHu10pklQsEZ8x0QiBihFYoc0SW9MEZylunjgH5DOVW1G8z6VTBzYgAmP39ipMxqbrHE1KLpZvgwXaE2RrCQKZgneXf3Cdm9mUscpKlHNYgznUuLHQfgsOoC/tLACz3G1MR3J896kxOaXNhG7mB0+54O9nRBM8fRjUX+JotTAxXrrsuUQDAMX9En+2uJzVvTZw66aebJC1qAqQUt57c=
+    # d2l-travis-deploy: 0655......8469
+    secure: FawA6VEKDBIS4ow4f/vKzC+W8YlzQCgHA/CnAgEmtrkWBR73ADhuEk1Gl5YSYAbMccmKCsEEpmsQqgMC3ddALRIlifu6IzQE6+KQj9uXOwST9Y9f6+STznf0XHpTje2eBn5F9Wa92tzcSIQJbrLpuD5kq/32tiH0ZyhnmKuW4ZJwou/+wG4uuOnon6HBsqvy3u9nMCGnDPwdTkuAr7Hc5KWiMOVuayFoLpIZ5PKuIbne404iMmkIQVxeoDLgFRehqo5zxLP1YPbCic0Vdz9r++nz+7EaJbspGNK/K6K6tzR4bb+BfN9TVB8x97cf49vt+ZTnvhjqXnrkSii+PCTyyZ7O/0oMrLVMOzkJ1yjUoZDqFUtN4wJFl/kNKw+ICXWan8vFFpldAxsLsyvgTU5pLuL/20NJNMZK0AV9pfuNUPs3yDni7jH14xjIaYH5zzU/DDXOgy38sQNIDRvLlV2d6GFZpmC35bLopx8iH3SZ9u9LOVYRc4GjG8hLZY0Ca/nGcrGvvGjPPl6Xu4TjI0S/lmAv7XpqGsv/Lb2J0SjEZQwjhh/BpvIDPGGoPILqn13fhrg6bc/kfI1/hHG4fHCwKQsQVkfV8pK0d/ZcPbFL+McMz3b967adD+PIpJ5cHCsTkFzp3YmW62mIHKi1kwF6yC1q2GOvVzXlk8WaSkVyrrI=
   on:
     tags: true
     repo: Brightspace/node-ecdsa-sig-formatter
-    node: 5
+    node: 10

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecdsa-sig-formatter",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Translate ECDSA signatures between ASN.1/DER and JOSE-style concatenation",
   "main": "src/ecdsa-sig-formatter.js",
   "scripts": {
@@ -9,6 +9,7 @@
     "test": "istanbul cover --root src _mocha -- spec",
     "report-cov": "cat ./coverage/lcov.info | coveralls"
   },
+  "typings": "./src/ecdsa-sig-formatter.d.ts",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/Brightspace/node-ecdsa-sig-formatter.git"
@@ -29,7 +30,6 @@
   },
   "homepage": "https://github.com/Brightspace/node-ecdsa-sig-formatter#readme",
   "dependencies": {
-    "base64url": "^2.0.0",
     "safe-buffer": "^5.0.1"
   },
   "devDependencies": {

src/ecdsa-sig-formatter.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="node" />
+
+declare module "ecdsa-sig-formatter" {
+	/**
+	 * Convert the ASN.1/DER encoded signature to a JOSE-style concatenated signature. Returns a base64 url encoded String.
+	 *    If signature is a String, it should be base64 encoded
+	 *    alg must be one of ES256, ES384 or ES512
+	 */
+	export function derToJose(signature: Buffer | string, alg: string): string;
+
+	/**
+	 * Convert the JOSE-style concatenated signature to an ASN.1/DER encoded signature. Returns a Buffer
+	 *     If signature is a String, it should be base64 url encoded
+	 *     alg must be one of ES256, ES384 or ES512
+	 */
+	export function joseToDer(signature: Buffer | string, alg: string): Buffer
+}

src/ecdsa-sig-formatter.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var base64Url = require('base64url').fromBase64;
 var Buffer = require('safe-buffer').Buffer;
 
 var getParamBytesForAlg = require('./param-bytes-for-alg');
@@ -13,6 +12,13 @@ var MAX_OCTET = 0x80,
 	ENCODED_TAG_SEQ = (TAG_SEQ | PRIMITIVE_BIT) | (CLASS_UNIVERSAL << 6),
 	ENCODED_TAG_INT = TAG_INT | (CLASS_UNIVERSAL << 6);
 
+function base64Url(base64) {
+	return base64
+		.replace(/=/g, '')
+		.replace(/\+/g, '-')
+		.replace(/\//g, '_');
+}
+
 function signatureAsBuffer(signature) {
 	if (Buffer.isBuffer(signature)) {
 		return signature;