refactor: make rsa key generation sync

README.md

@@ -18,11 +18,10 @@ needed for libp2p. This is based on this [go implementation](https://github.com/
 
 ## API
 
-### `generateKeyPair(type, bits, cb)`
+### `generateKeyPair(type, bits)`
 
 - `type: String`, only `'RSA'` is currently supported
 - `bits: Number`
-- `cb: Function`, with the signature `function (err, privateKey)`
 
 Generates a keypair of the given type and bitsize.
 

src/index.js

@@ -12,13 +12,13 @@ exports.keyStretcher = require('./key-stretcher')
 exports.generateEphemeralKeyPair = require('./ephemeral-keys')
 
 // Generates a keypair of the given type and bitsize
-exports.generateKeyPair = (type, bits, cb) => {
+exports.generateKeyPair = (type, bits) => {
   let key = keys[type.toLowerCase()]
   if (!key) {
     throw new Error('invalid or unsupported key type')
   }
 
-  key.generateKeyPair(bits, cb)
+  return key.generateKeyPair(bits)
 }
 
 // Converts a protobuf serialized public key into its

src/keys/rsa.js

@@ -55,7 +55,11 @@ class RsaPublicKey {
 class RsaPrivateKey {
   constructor (privKey, pubKey) {
     this._privateKey = privKey
-    this._publicKey = pubKey
+    if (pubKey) {
+      this._publicKey = pubKey
+    } else {
+      this._publicKey = forge.pki.setRsaPublicKey(privKey.n, privKey.e)
+    }
   }
 
   genSecret () {
@@ -123,15 +127,9 @@ function unmarshalRsaPublicKey (bytes) {
   return new RsaPublicKey(key)
 }
 
-function generateKeyPair (bits, cb) {
+function generateKeyPair (bits) {
-  rsa.generateKeyPair({
+  const p = rsa.generateKeyPair({bits})
-    bits,
+  return new RsaPrivateKey(p.privateKey, p.publicKey)
-    workerScript: utils.workerScript
-  }, (err, p) => {
-    if (err) return cb(err)
-
-    cb(null, new RsaPrivateKey(p.privateKey, p.publicKey))
-  })
 }
 
 module.exports = {

src/utils.js

@@ -1,40 +1,8 @@
 'use strict'
 
 const multihashing = require('multihashing')
-const path = require('path')
-const fs = require('fs')
-
-const URL = global.window && (window.URL || window.webkitURL)
 
 // Hashes a key
 exports.keyHash = (bytes) => {
   return multihashing(bytes, 'sha2-256')
 }
-
-const toBlob = (content) => {
-  try {
-    let blob
-    try {
-      // BlobBuilder = Deprecated, but widely implemented
-      const BlobBuilder = global.window &&
-              (window.BlobBuilder ||
-              window.WebKitBlobBuilder ||
-              window.MozBlobBuilder ||
-              window.MSBlobBuilder)
-
-      blob = new BlobBuilder()
-      blob.append(content)
-      blob = blob.getBlob()
-    } catch (e) {
-      // The proposed API
-      blob = new window.Blob([content])
-    }
-    return URL.createObjectURL(blob)
-  } catch (e) {
-    return 'data:application/javascript,' + encodeURIComponent(content)
-  }
-}
-
-const rawScript = fs.readFileSync(path.join(__dirname, '../vendor/prime.worker.js'))
-
-exports.workerScript = toBlob(rawScript.toString())

test/index.spec.js

@@ -8,12 +8,8 @@ const fixtures = require('./fixtures/go-key-rsa')
 
 describe('libp2p-crypto', () => {
   let key
-  before((done) => {
+  before(() => {
-    crypto.generateKeyPair('RSA', 2048, (err, _key) => {
+    key = crypto.generateKeyPair('RSA', 2048)
-      if (err) return done(err)
-      key = _key
-      done()
-    })
   })
 
   it('marshalPublicKey and unmarshalPublicKey', () => {

test/rsa.spec.js

@@ -8,12 +8,8 @@ const rsa = crypto.keys.rsa
 
 describe('RSA', () => {
   let key
-  before((done) => {
+  before(() => {
-    crypto.generateKeyPair('RSA', 2048, (err, _key) => {
+    key = crypto.generateKeyPair('RSA', 2048)
-      if (err) return done(err)
-      key = _key
-      done()
-    })
   })
 
   it('generates a valid key', () => {
@@ -80,36 +76,32 @@ describe('RSA', () => {
       )
     })
 
-    it('not equals other key', (done) => {
+    it('not equals other key', () => {
-      crypto.generateKeyPair('RSA', 2048, (err, key2) => {
+      const key2 = crypto.generateKeyPair('RSA', 2048)
-        if (err) return done(err)
 
-        expect(
+      expect(
-          key.equals(key2)
+        key.equals(key2)
-        ).to.be.eql(
+      ).to.be.eql(
-          false
+        false
-        )
+      )
 
-        expect(
+      expect(
-          key2.equals(key)
+        key2.equals(key)
-        ).to.be.eql(
+      ).to.be.eql(
-          false
+        false
-        )
+      )
 
-        expect(
+      expect(
-          key.public.equals(key2.public)
+        key.public.equals(key2.public)
-        ).to.be.eql(
+      ).to.be.eql(
-          false
+        false
-        )
+      )
 
-        expect(
+      expect(
-          key2.public.equals(key.public)
+        key2.public.equals(key.public)
-        ).to.be.eql(
+      ).to.be.eql(
-          false
+        false
-        )
+      )
-
-        done()
-      })
     })
   })