From b8e2414420b2727144389d79e30537fc26f38a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Wed, 23 Oct 2019 12:55:43 +0200
Subject: [PATCH] fix: browser rsa enc/dec

---
 package.json            |  2 +-
 src/keys/rsa-browser.js | 35 +++++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7137d1d7..4896f833 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "keypair": "^1.0.1",
     "libp2p-crypto-secp256k1": "~0.4.0",
     "multihashing-async": "~0.7.0",
-    "node-forge": "~0.8.5",
+    "node-forge": "^0.9.1",
     "pem-jwk": "^2.0.0",
     "protons": "^1.0.1",
     "rsa-pem-to-jwk": "^1.1.3",
diff --git a/src/keys/rsa-browser.js b/src/keys/rsa-browser.js
index 244e513a..ec6bce22 100644
--- a/src/keys/rsa-browser.js
+++ b/src/keys/rsa-browser.js
@@ -121,8 +121,33 @@ function derivePublicFromPrivate (jwKey) {
   )
 }
 
+// bloody dark magic. webcrypto's why.
+
+/*
+
+Explanation:
+  - Convert JWK to PEM
+  - Load PEM with nodeForge
+  - Convert msg buffer to nodeForge buffer
+  - Convert resulting nodeForge buffer to buffer
+
+*/
+
+const forge = require('node-forge')
+const pki = forge.pki
+const jwkToPem = require('pem-jwk').jwk2pem
+function convertKey (key, pub, msg, handle) {
+  const pem = jwkToPem(key)
+  const fkey = pki[pub ? 'publicKeyFromPem' : 'privateKeyFromPem'](pem)
+  const fmsg = forge.util.hexToBytes(Buffer.from(msg).toString('hex'))
+  const fomsg = handle(fmsg, fkey)
+  return Buffer.from(forge.util.bytesToHex(fomsg), 'hex')
+}
+
 exports.encrypt = async function (key, msg) {
-  key = Object.assign({}, key)
+  return convertKey(key, true, msg, (msg, key) => key.encrypt(msg))
+
+  /* key = Object.assign({}, key)
   key.key_ops = ['encrypt']
 
   return webcrypto.subtle.importKey(
@@ -140,11 +165,13 @@ exports.encrypt = async function (key, msg) {
       publicKey,
       Uint8Array.from(msg)
     )
-  }).then((enc) => Buffer.from(enc))
+  }).then((enc) => Buffer.from(enc)) */
 }
 
 exports.decrypt = async function (key, msg) {
-  key = Object.assign({}, key)
+  return convertKey(key, false, msg, (msg, key) => key.decrypt(msg))
+
+  /* key = Object.assign({}, key)
   key.key_ops = ['decrypt']
 
   return webcrypto.subtle.importKey(
@@ -162,5 +189,5 @@ exports.decrypt = async function (key, msg) {
       privateKey,
       Uint8Array.from(msg)
     )
-  }).then((dec) => Buffer.from(dec))
+  }).then((dec) => Buffer.from(dec)) */
 }