remove jssha

Author: mymindstorm

package-lock.json

@@ -23,7 +23,6 @@
     "@types/argon2-browser": "^1.6.0",
     "@types/chrome": "^0.0.86",
     "@types/crypto-js": "^3.1.43",
-    "@types/jssha": "2.0.0",
     "@types/uuid": "^3.4.5",
     "base64-loader": "^1.0.0",
     "fork-ts-checker-webpack-plugin": "^1.3.5",
@@ -42,7 +41,6 @@
   "dependencies": {
     "argon2-browser": "^1.12.0",
     "crypto-js": "^3.1.9-1",
-    "jssha": "^2.3.1",
     "qrcode-generator": "^1.4.3",
     "qrcode-reader": "^1.0.4",
     "uuid": "^3.3.3",

package.json

@@ -1,5 +1,5 @@
-import * as jsSHA from "jssha";
 import { OTPType } from "./otp";
+import * as CryptoJS from "crypto-js";
 
 // Originally based on the JavaScript implementation as provided by Russell
 // Sayers on his Tin Isles blog:
@@ -145,16 +145,14 @@ export class KeyUtilities {
       }
     }
 
-    // external library for SHA functionality
-    const hmacObj = new jsSHA("SHA-1", "HEX");
-    hmacObj.setHMACKey(key, "HEX");
-    hmacObj.update(time);
-    const hmac = hmacObj.getHMAC("HEX");
+    const hmacObj = CryptoJS.HmacSHA1(
+      CryptoJS.enc.Hex.parse(time),
+      CryptoJS.enc.Hex.parse(key)
+    );
+    const hmac = CryptoJS.enc.Hex.stringify(hmacObj);
 
     let offset = 0;
-    if (hmac !== "KEY MUST BE IN BYTE INCREMENTS") {
-      offset = this.hex2dec(hmac.substring(hmac.length - 1));
-    }
+    offset = this.hex2dec(hmac.substring(hmac.length - 1));
 
     let otp =
       (this.hex2dec(hmac.substr(offset * 2, 8)) & this.hex2dec("7fffffff")) +

src/models/key-utilities.ts

@@ -141,9 +141,7 @@ export class OTPEntry implements IOTPEntry {
   }
 
   genUUID() {
-    // await this.delete();
     this.hash = uuid();
-    // await this.create();
   }
 
   generate() {