Merge branch 'dev' into enhancement/random-supports-window.crypto

Jean-Paul Gorman · Jean-Paul Gorman · commit 6bf26d219743 · 2019-02-14T09:55:18.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,5 +49,8 @@
     "webpack": "^4.29.3",
     "webpack-stream": "^4.0.3"
   },
+  "dependencies": {
+    "jsrsasign": "^8.0.12"
+  },
   "typings": "index.d.ts"
 }
diff --git a/src/JoseUtil.js b/src/JoseUtil.js
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 import { jws, KEYUTIL as KeyUtil, X509, crypto, hextob64u, b64tohex } from '../jsrsasign/dist/jsrsasign.js';
+//import { jws, KEYUTIL as KeyUtil, X509, crypto, hextob64u, b64tohex } from 'jsrsasign';
 import { Log } from './Log.js';
 
 const AllowedSigningAlgs = ['RS256', 'RS384', 'RS512', 'PS256', 'PS384', 'PS512', 'ES256', 'ES384', 'ES512'];
