From e0f000b913d2c092d7744e2f4f52476ce11056b6 Mon Sep 17 00:00:00 2001
From: Matt <matt@artemisbot.uk>
Date: Mon, 6 Apr 2020 13:35:14 +0100
Subject: [PATCH] Fixed RSA generation and added digest option to verify

---
 src/core/lib/RSA.mjs                       |  9 +++++++++
 src/core/operations/GenerateRSAKeyPair.mjs |  3 ++-
 src/core/operations/RSASign.mjs            | 16 +++++++++++-----
 webpack.config.js                          |  5 +++++
 4 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 src/core/lib/RSA.mjs

diff --git a/src/core/lib/RSA.mjs b/src/core/lib/RSA.mjs
new file mode 100644
index 00000000..0dab67a3
--- /dev/null
+++ b/src/core/lib/RSA.mjs
@@ -0,0 +1,9 @@
+import forge from "node-forge/dist/forge.min.js";
+
+export const MD_ALGORITHMS = {
+    "SHA-1": forge.md.sha1,
+    "MD5": forge.md.md5,
+    "SHA-256": forge.md.sha256,
+    "SHA-384": forge.md.sha384,
+    "SHA-512": forge.md.sha512,
+};
diff --git a/src/core/operations/GenerateRSAKeyPair.mjs b/src/core/operations/GenerateRSAKeyPair.mjs
index 951c2667..a96948f2 100644
--- a/src/core/operations/GenerateRSAKeyPair.mjs
+++ b/src/core/operations/GenerateRSAKeyPair.mjs
@@ -1,4 +1,5 @@
 /**
+ * @author Matt C [me@mitt.dev]
  * @author gchq77703 []
  * @copyright Crown Copyright 2018
  * @license Apache-2.0
@@ -55,7 +56,7 @@ class GenerateRSAKeyPair extends Operation {
         const [keyLength, outputFormat] = args;
 
         return new Promise((resolve, reject) => {
-            forge.pki.rsa.generateKeyPair({ bits: Number(keyLength), workers: -1}, (err, keypair) => {
+            forge.pki.rsa.generateKeyPair({ bits: Number(keyLength), workers: -1, workerScript: "./assets/forge/prime.worker.min.js"}, (err, keypair) => {
                 if (err) return reject(err);
 
                 let result;
diff --git a/src/core/operations/RSASign.mjs b/src/core/operations/RSASign.mjs
index c0b4ccdf..980d59b3 100644
--- a/src/core/operations/RSASign.mjs
+++ b/src/core/operations/RSASign.mjs
@@ -1,11 +1,13 @@
 /**
+ * @author Matt C [me@mitt.dev]
  * @author gchq77703 []
- * @copyright Crown Copyright 2018
+ * @copyright Crown Copyright 2020
  * @license Apache-2.0
  */
 
 import Operation from "../Operation";
 import forge from "node-forge/dist/forge.min.js";
+import { MD_ALGORITHMS } from "../lib/RSA.mjs";
 
 /**
  * RSA Sign operation
@@ -31,9 +33,14 @@ class RSASign extends Operation {
                 value: "-----BEGIN RSA PRIVATE KEY-----"
             },
             {
-                name: "Password",
+                name: "Key Password",
                 type: "text",
                 value: ""
+            },
+            {
+                name: "Message Digest Algorithm",
+                type: "option",
+                value: Object.keys(MD_ALGORITHMS)
             }
         ];
     }
@@ -44,11 +51,10 @@ class RSASign extends Operation {
      * @returns {string}
      */
     run(input, args) {
-        const [key, password] = args;
+        const [key, password, mdAlgo] = args;
 
         const privateKey = forge.pki.decryptRsaPrivateKey(key, password);
-
-        const md = forge.md.sha1.create();
+        const md = MD_ALGORITHMS[mdAlgo].create();
         md.update(input, "utf8");
         const signature = privateKey.sign(md);
 
diff --git a/webpack.config.js b/webpack.config.js
index a14d8e7e..c4ba416c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -56,6 +56,11 @@ module.exports = {
                 context: "src/core/vendor/",
                 from: "tesseract/**/*",
                 to: "assets/"
+            },
+            {
+                context: "node_modules/node-forge/dist",
+                from: "prime.worker.min.js",
+                to: "assets/forge/"
             }
         ])
     ],